Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,068 Commits 210 Branches 500 Tags 864 MiB
Commit Graph

4068 Commits

Author SHA1 Message Date
Jeff Atwood 58b7df5480 change edit to std pencil glyph on avatars 2013-08-19 15:07:48 -07:00
Sam dca0b6b9b8 Merge pull request #1358 from chrishunt/bump-favcount 
Improve readability of count for complex favicons
 2013-08-19 14:58:57 -07:00
Sam 60c740e16e Merge pull request #1361 from ZogStriP/fix-css-on-image-in-preview 
FIX: images in the preview have rounded corners
 2013-08-19 14:58:02 -07:00
Sam df2b0b47bd Merge pull request #1360 from michaelkirk/feature/oauth2 
not recording Oauth2 user email
 2013-08-19 14:57:05 -07:00
Régis Hanol 8107170f08 FIX: images in the preview have rounded corners 2013-08-19 23:45:55 +02:00
Neil Lalonde 1d030666d8 Log site setting changes and show in admin 2013-08-19 16:58:38 -04:00
Michael Kirk 9e8d8870f5 fixed: record Oauth2 user email 2013-08-19 11:21:27 -07:00
Neil Lalonde 3cc8354fe2 Don't trust topic title in template until it has been sanitized by the server 2013-08-19 14:19:59 -04:00
Neil Lalonde 7eaedb84e1 Add notify_mods_when_user_blocked site setting to control whether moderators get a message when someone is automatically blocked 2013-08-19 12:00:48 -04:00
Chris Hunt 53f011e89e Bump to favcount v1.1.0 2013-08-19 08:55:38 -07:00
Neil Lalonde 8431a5c1f5 Merge pull request #1351 from daniely/patch-1 
Update VAGRANT.md
 2013-08-19 08:29:42 -07:00
Robin Ward 103f204e36 Merge pull request #1354 from ofgeek/patch-2 
Update client.zh_CN.yml
 2013-08-19 07:35:36 -07:00
Robin Ward d5335449dd Merge pull request #1355 from abbat/master 
Russian translation (actual version)
 2013-08-19 07:35:14 -07:00
Sam a9393e4a7a paging for flag list 
corrected reload behavior on flag list
refactored post actions ... extracted flag queries
 2013-08-19 21:14:26 +10:00
Sam 22bcb7d412 better errors ... bettered 2013-08-19 21:13:07 +10:00
Anton Batenev 35442a0c79 Russian translation (actual version) 2013-08-19 12:26:02 +04:00
ofGEEK 59a252f535 Update client.zh_CN.yml 2013-08-19 10:53:05 +08:00
Sam 9b5da77855 correct broken logic in screen track that was causing read status not to flush properly when navigating using the suggested topics list. 2013-08-19 11:35:06 +10:00
Sam 4b0a1179e9 link to first unread as opposed to last read in topic lists 2013-08-19 11:34:08 +10:00
Sam 1d74cc60a1 don't try sending emails out in profile mode 2013-08-19 11:33:38 +10:00
Sam beeb86bf91 correct user simulator 2013-08-19 11:33:24 +10:00
daniely d36034620d Update VAGRANT.md 
fix command for `vagrant box add [name] [path]`
 2013-08-18 20:41:04 +08:00
Sam b69d089d06 we need to decalre favcount to keep tests happy 2013-08-18 21:52:13 +10:00
Sam 3b34ab8cab Merge branch 'master' of github.com:discourse/discourse 2013-08-18 21:35:29 +10:00
Sam 82ca61f150 Merge pull request #1350 from michaelkirk/feature/oauth2 
Feature/oauth2
 2013-08-18 17:01:01 -07:00
Sam 1cab98bf78 Merge pull request #1336 from novemberkilo/master 
First pass at fixing rails4 deprecation warnings
 2013-08-18 16:59:07 -07:00
Sam b651758524 Merge pull request #1353 from chrishunt/favcount-ftw 
Use favcount.js v1.0.1
 2013-08-18 16:57:36 -07:00
Chris Hunt 4372fc2f2e Switch out faviconNotify for favcount.js 2013-08-18 11:26:03 -07:00
Sam 3f5b5f1581 Merge branch 'master' of github.com:discourse/discourse 2013-08-18 21:30:14 +10:00
Michael Kirk e0cb1d4086 omniauth-oauth2 should be required in plugin which uses it 2013-08-17 22:35:07 -07:00
Michael Kirk 4af8a9102e Authenticate with Discourse via OAuth2 
See https://github.com/michaelkirk/discourse_oauth2_example for an
example of how you might integrate your existing oauth2 provider's
authentication via a Discourse plugin.
 2013-08-17 21:45:20 -07:00
Michael Kirk a67b1ba32c include plugins directory 2013-08-17 21:45:20 -07:00
Sam 3735cfdadb Merge pull request #1348 from chrishunt/dynamically-png-me 
Re-write dynamic favicon javascript
 2013-08-17 03:26:14 -07:00
Sam 18d17d3db0 Merge pull request #1349 from ZogStriP/bench-script-is-not-working-on-OS-X 
FIX: bench script is not working on OS X
 2013-08-17 03:24:49 -07:00
Régis Hanol 032bdceeef FIX: bench script is not working on OS X 2013-08-17 11:36:41 +02:00
Jeff Atwood b6e66372d4 Merge pull request #1347 from ZogStriP/change-your-avatar-in-a-modal 
change your avatar in a modal
 2013-08-16 21:01:30 -07:00
Chris Hunt ef7231a66f Add 32px image to default favicons (for retina) 2013-08-16 18:37:33 -07:00
Chris Hunt fb9f1ae3e8 Totally re-write favicon notifier 
- Black on white text
- Larger font
- Works with any size favicon (16, 32, 64)
 2013-08-16 18:37:24 -07:00
Régis Hanol ea6e73076b change your avatar in a modal 2013-08-17 00:35:29 +02:00
Neil Lalonde baff59d752 Send email to contact_email when a new version of Discourse is found. Disable with the new_version_emails setting. 2013-08-16 17:28:36 -04:00
Neil Lalonde 7dd470ccc0 Oops, make highlight in topic list style-able too 2013-08-16 14:24:51 -04:00
Jeff Atwood be6ca8d118 Merge pull request #1344 from Supermathie/sysadmin-docs 
Sysadmin docs
 2013-08-16 10:36:20 -07:00
Robin Ward 40599d20e8 FIX: Footer formatting in digest emails 2013-08-16 12:19:26 -04:00
Michael Brown 95c246e257 Add section for additional MIME in nginx 2013-08-16 11:49:50 -04:00
Michael Brown 8c679f4b22 Add tip for installing on Ubuntu 12.10 2013-08-16 11:49:50 -04:00
Neil Lalonde b6285b85d2 Add reject option to pending users page 2013-08-16 11:42:43 -04:00
Robin Ward 30caa0d0b0 Merge pull request #1339 from ZogStriP/fix-custom-avatars-in-email 
FIX: custom avatars in email
 2013-08-16 07:18:34 -07:00
Robin Ward 80dbda839c Merge pull request #1340 from ZogStriP/larger-avatar-in-embedded-posts 
larger avatars in embedded posts
 2013-08-16 07:15:20 -07:00
Robin Ward fe9a34b5b5 Merge pull request #1342 from gcapizzi/remove_duplication_from_guardian 
Remove duplication from Guardian
 2013-08-16 07:13:36 -07:00
Navin 2e700dd26d Patch ActiveRecord::Relation#references and clean up 2013-08-16 14:53:40 +02:00