Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,442 Commits 244 Branches 502 Tags 914 MiB
Commit Graph

4442 Commits

Author SHA1 Message Date
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
Giuseppe Capizzi eaede108c7 Remove duplication from Guardian 2013-08-16 14:24:29 +02:00
Régis Hanol 865c882a61 larger avatars in embedded posts 2013-08-16 10:14:05 +02:00
Régis Hanol 2119774fb6 FIX: custom avatars in email 2013-08-16 09:58:20 +02:00
Sam c314a1862f add todo 2013-08-16 17:04:30 +10:00
Jeff Atwood 946b02533b better copy for password change button 2013-08-15 22:25:26 -07:00
Sam b52761c522 Merge pull request #1338 from ofgeek/patch-2 
Update client.zh_CN.yml
 2013-08-15 21:52:02 -07:00
Sam b60c8080e5 Merge pull request #1337 from ZogStriP/avatar-work 
Avatar work
 2013-08-15 21:50:37 -07:00
ofGEEK b2acf33a74 Update client.zh_CN.yml 2013-08-16 11:16:17 +08:00
ofGEEK 3a8fbdb9a8 Update client.zh_CN.yml 2013-08-16 11:13:50 +08:00
Sam b2b01fd26c Urgent Bugfix: workaround therubyracer corruption when it is run within a fiber 2013-08-16 13:08:23 +10:00
ofGEEK 490b057922 Update client.zh_CN.yml 2013-08-16 11:07:25 +08:00
Sam be4b326f46 avoid calling v8 multiple times ( makes certain testing simpler) 2013-08-16 13:03:47 +10:00
Jeff Atwood 9a2f758a00 remove unnecessary font-size on digest <a> 2013-08-15 16:52:10 -07:00
Jeff Atwood 4718929d52 "change" to edit pencil glyph on user pref buttons 2013-08-15 16:11:24 -07:00
Régis Hanol c9969738bf FIX: N+1 query for avatars when searching for users 2013-08-16 00:26:49 +02:00
Régis Hanol 9724d3bf42 FIX: avatars in discourse's topic oneboxes 2013-08-16 00:26:49 +02:00
Jeff Atwood 8303f48004 add dimmed color to digest footer 2013-08-15 15:18:11 -07:00
Robin Ward c5c29e9c4c Revert "Revert "eliminate a class of v8 initialization bugs due to concurrency in sidekiq"" 
This reverts commit f1a693c8b7.
 2013-08-15 18:12:10 -04:00
Robin Ward f1a693c8b7 Revert "eliminate a class of v8 initialization bugs due to concurrency in sidekiq" 
This reverts commit 883db5798b.
 2013-08-15 17:22:45 -04:00
Neil Lalonde 2e640baffd Fix a broken avatar when showing who deleted a post 2013-08-15 16:31:13 -04:00
Neil Lalonde 73e4d866d2 Make it possible to customize post highlight colour with css 2013-08-15 16:17:37 -04:00
Neil Lalonde 8a96c4c0f6 Fix uncategorized topics not being shown on categories page 2013-08-15 15:18:04 -04:00
Neil Lalonde 5a4b939cf7 Fix edit category modal for uncategorized when showing it the second time 2013-08-15 15:18:04 -04:00
Navin 9ab2471a92 Fix rails4 deprecation warnings 
That appear when running topic_spec.rb
 2013-08-15 17:52:18 +02:00
Robin Ward 27fbd232d4 Merge pull request #1334 from ofgeek/patch-2 
Completely update the zh_CN locale.
 2013-08-15 08:33:38 -07:00
Robin Ward 9740d70c67 Merge pull request #1335 from meglio/links 
Fix site settings link in Twitter config warning
 2013-08-15 08:32:19 -07:00