Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,830 Commits 226 Branches 500 Tags 910 MiB
Commit Graph

7830 Commits

Author SHA1 Message Date
Robin Ward 617b4bed41 FIX: Rather than using `singleton: false` for avoiding caching in the 
container, just unregister it afterwards.
 2014-04-17 10:45:06 -04:00
Robin Ward c9c95a9ac2 FIX: Ember doesn't allow one route name, `basic`, and Discourse used it! 2014-04-17 10:45:06 -04:00
Robin Ward c820747ea3 FIX: Malformed HTML in templates 2014-04-17 10:45:06 -04:00
Robin Ward fc65bc28be FIX: Use the container to register Discourse's custom location handler 2014-04-17 10:45:06 -04:00
Robin Ward 2f9bb6b88f FIX: Deprecation warnings on Ember.js for render without quotes. 2014-04-17 10:45:06 -04:00
Robin Ward 73cc722ed5 Update Ember.js, Handlebars and jQuery to latest 2014-04-17 10:45:06 -04:00
paully21 84d100be85 Add blurb of post to search results via API 2014-04-17 07:58:51 -05:00
Régis Hanol a8011a5b63 Merge pull request #2272 from Onaldanm/upstream 
Add badges class
 2014-04-17 11:58:40 +02:00
Onaldanm bf8d727a91 Add badges class 
Add badges class to the container to custom this new page differently.
 2014-04-17 11:40:06 +02:00
Sam 22b33871d5 Revert "update sidekiq" 
This reverts commit d012906883.
 2014-04-17 17:05:05 +10:00
Sam d012906883 update sidekiq 2014-04-17 16:48:42 +10:00
Sam 30e73104e4 Bump up to 200 for now, UI perf needs lots of work 2014-04-17 16:25:06 +10:00
Sam 87f37b3ee9 Merge pull request #2271 from vikhyat/badge-system 
Badge system updates
 2014-04-17 16:22:41 +10:00
Sam a92f839aaf Merge pull request #2267 from Supermathie/emailtest 
Ghetto script to test if email settings work
 2014-04-17 16:16:04 +10:00
Sam 087f78f8f0 Merge pull request #2265 from techAPJ/update-docker-guide 
Add digital ocean guide link
 2014-04-17 16:15:04 +10:00
Sam 50d65fc876 Merge pull request #2269 from vikhyat/username-on-top 
Add username on top to CSS directory so it can be imported
 2014-04-17 16:13:27 +10:00
Sam ead7c52a06 Refactor demonizer in prep for unicorn forking 
Upgrade sidekiq
 2014-04-17 15:58:00 +10:00
Vikhyat Korrapati b62606e7f1 Remove color_hexcode column from badge_types. 2014-04-17 05:36:29 +05:30
Robin Ward a7c41e6512 Merge pull request #2270 from vikhyat/serialize-array-detection 
Detect arrays for serialization using respond_to?(:to_ary)
 2014-04-16 17:25:14 -04:00
Robin Ward d4502070ed Merge pull request #2268 from vikhyat/poll-plugin 
Get rid of unnecessary controller reference in poll template
 2014-04-16 17:24:35 -04:00
Vikhyat Korrapati 89f45901bc Create notification when badge is granted. 2014-04-17 01:58:01 +05:30
Vikhyat Korrapati b55734da91 Add badges tab to user profile. 2014-04-17 01:58:01 +05:30
Vikhyat Korrapati 3136217fc1 Add badge page. 2014-04-17 01:57:57 +05:30
Vikhyat Korrapati 8f53b7a65b Detect arrays for serialization using respond_to?(:to_ary). 
This is the way AMS detects arrays, and is more robust than checking
is_a? for whitelisted classes. For example, this works for
ActiveRecord::AssociationRelation which the current logic does not
handle.
 2014-04-16 20:48:09 +05:30
Neil Lalonde 1b4e11dec5 Version bump to v0.9.9.2 2014-04-16 11:14:38 -04:00
Neil Lalonde abdfc2c7c1 Update translations 2014-04-16 10:42:21 -04:00
Neil Lalonde 1cddfd64c9 Add a flag to pull_translations.rb to force pull of all translations 2014-04-16 10:35:27 -04:00
Vikhyat Korrapati acfcf0b64e Add /badges route that lists all defined badges. 2014-04-16 18:42:06 +05:30
Vikhyat Korrapati de23caa871 Slightly faster badge system specs. (Shaves off ~100ms) 2014-04-16 18:08:10 +05:30
Vikhyat Korrapati 4c0f85650e Display badge count in the user admin page. 2014-04-16 18:08:10 +05:30
Vikhyat Korrapati e0a4959dc9 Sort featured badges by badge type first, followed by grant count. 2014-04-16 18:08:10 +05:30
Vikhyat Korrapati 057c56ef9b Add user-badge component. 2014-04-16 18:08:00 +05:30
Jeff Atwood ae2e1af123 Update README.md 2014-04-16 03:00:29 -07:00
Jeff Atwood 87e4541795 Update INSTALL.md 2014-04-16 02:54:12 -07:00
Jeff Atwood 1ff66421e7 Update INSTALL.md 2014-04-16 02:50:04 -07:00
Vikhyat Korrapati a1333989f4 Add username on top to CSS directory so it can be imported. 2014-04-16 14:44:55 +05:30
Jeff Atwood 3b02257edb better admin quick start guide 2014-04-16 00:13:52 -07:00
Vikhyat Korrapati 11297efed5 Get rid of unnecessary controller reference in poll template. 2014-04-16 12:11:41 +05:30
Jeff Atwood cba7d3fc82 copyedits on Welcome to Discourse 2014-04-15 22:17:05 -07:00
Jeff Atwood aca35f805e missed some other languages on assets topic 2014-04-15 22:12:28 -07:00
Jeff Atwood fad31b6d9e More helpful assets topic explanation 2014-04-15 22:07:19 -07:00
Jeff Atwood 8114588c06 minor copyedit on auto image downloading 2014-04-15 21:52:40 -07:00
Jeff Atwood 664c6a8eb0 add multsite link 2014-04-15 21:38:07 -07:00
Michael Brown 313130a7fc Ghetto script to test if email settings work 2014-04-15 23:50:15 -04:00
Neil Lalonde 91bfd47419 FIX: don't show contents of hidden posts when quoting the post and when replying as new topic. Also don't allow public to view edit history of hidden posts. 2014-04-15 12:49:08 -04:00
Neil Lalonde f0e8423445 FIX: don't show hidden posts to crawlers, disabled javascript, and in rss feeds 2014-04-15 12:49:08 -04:00
Régis Hanol 9cd8476453 REFACTOR: use an options hash instead of multiple nil-able parameters 2014-04-15 17:17:10 +02:00
Neil Lalonde 8b79debde2 Merge pull request #2266 from fantasticfears/locale 
add pluralization rules in ember for Chinese
 2014-04-15 11:08:22 -04:00
Neil Lalonde 3b53c1814b FIX: don't reload page when creating account with external auth and must_approve_users is enabled. 2014-04-15 10:13:57 -04:00
Erick Guan 2c6b7d8bed add pluralization rules in ember for Chinese 2014-04-15 19:59:20 +08:00