Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,534 Commits 211 Branches 500 Tags 872 MiB
Commit Graph

5534 Commits

Author SHA1 Message Date
Régis Hanol a7eced3a06 Merge pull request #1723 from vikhyat/disable-uploads 
Don't show uploading forms if the relevant site settings are disabled
 2013-12-06 00:26:50 -08:00
Sam ee4f3323bf rails 3 gem update (note will be removed at some point) 2013-12-06 17:06:52 +11:00
Vikhyat Korrapati 483c9f9826 Don't show the upload avatar modal is allow_uploaded_avatars is false. 2013-12-06 11:31:11 +05:30
Sam f3a0633e7d update message_bus to fix permission issue 2013-12-06 16:32:17 +11:00
Vikhyat Korrapati 2850279c45 Don't show the upload option if max_attachment_size_kb is 0. 2013-12-06 10:29:15 +05:30
Sam c71d7a3c6d one less gem from github for greater good 2013-12-06 15:22:15 +11:00
Neil Lalonde 082f131b27 Add a site setting for when progress bar should only show post number. Default is 1000. 2013-12-05 17:17:44 -05:00
Robin Ward 79427732b2 Show Gaps in the post stream when filters are active 
Conflicts:
	app/assets/javascripts/discourse/templates/topic.js.handlebars
 2013-12-05 16:46:59 -05:00
Neil Lalonde 0fe5ecbb24 When there are 2000 or more posts, only show the post number on the progress bar 2013-12-05 15:50:15 -05:00
Neil Lalonde 13da653f2b Add a tool to generate a lot of posts in a topic. thor populate help posts to see usage. 2013-12-05 12:41:24 -05:00
Régis Hanol 6b618a805a FIX: do not destroy current draft when *NOT* abandoning the current reply 2013-12-05 18:08:33 +01:00
Sam 2db3cfb16b annotate models 2013-12-05 17:40:35 +11:00
Sam 46f3261025 Update: message bus, rack mini profiler and flame graph so they are sourced from ruby gems. 
MessageBus.diagnostics() in chrome dev tools
Update: annotate models to latest, no need for git sourcing
 2013-12-05 17:40:16 +11:00
Neil Lalonde 0e44b90c7b Version bump to v0.9.7.6 2013-12-04 16:55:30 -05:00
Régis Hanol 50bc23c2be Merge pull request #1718 from awesomerobot/master 
fixing the user column on the topic-list page
 2013-12-04 12:52:05 -08:00
Robin Ward 30a9d3676d Some sanity checks with event binding 2013-12-04 13:28:56 -05:00
Robin Ward 2a809d7855 Migrate over slackRatio to vendored helper 2013-12-04 13:26:00 -05:00
Robin Ward 3a2ae97668 Vendor the CloakedView stuff 2013-12-04 13:23:20 -05:00
Neil Lalonde 3a6ba907d9 FIX: enter key in login form works again 2013-12-04 11:45:07 -05:00
Robin Ward 0ece195723 Blacklist <center> 2013-12-04 11:43:20 -05:00
Kris Aubuchon 2d928a0537 local merge 
Merge remote-tracking branch 'upstream/master'
 2013-12-04 10:39:39 -05:00
Kris Aubuchon 15516f34c7 fixing the user column on the topic-list page 2013-12-04 10:38:01 -05:00
Neil Lalonde abed146cc7 FIX: Category description topics shouldn't auto-close 2013-12-04 10:31:25 -05:00
Robin Ward df7b24b14a Merge pull request #1716 from ok-harry/master 
set_locale of application_controller.rb must be called earlier
 2013-12-04 07:09:14 -08:00
Régis Hanol 28bfb34488 Merge pull request #1717 from vikhyat/fix-auto-close-form-submit 
Fix auto close topic modal when pressing enter
 2013-12-04 05:41:32 -08:00
Vikhyat Korrapati 243acb4f05 Auto close topic on form submit rather than button click. 2013-12-04 18:17:28 +05:30
Harry Seo 2d9876a6ac FIX: set_locale filter must be executed before check_xhr filter because check_xhr filter renders html in some cases 2013-12-04 20:49:54 +09:00
Régis Hanol ce64cd4205 Merge pull request #1715 from sanderdatema/dutch_translation 
Updated (and corrected) Dutch translation
 2013-12-04 01:51:57 -08:00
Sander Datema 56b9d4e380 Updated (and corrected) Dutch translation 2013-12-04 10:22:02 +01:00
murchik 8eff2f0172 Russian locale transliteration table tiny fix. 2013-12-04 04:22:29 +04:00
Sam dc8bd152f7 oops 2013-12-04 09:57:39 +11:00
Sam e6db1d9865 upgrade rails due to security fixes 2013-12-04 09:54:00 +11:00
Sam 4b64cc3666 update i18n and mime-types 2013-12-04 09:54:00 +11:00
Sam a0b1c8ed66 fix gemspec 2013-12-04 09:54:00 +11:00
Sam 6c8d1556b0 update ice cube, connection pool 2013-12-04 09:54:00 +11:00
Neil Lalonde b622edad7d FIX: edit category modal is too short 2013-12-03 17:24:25 -05:00
Neil Lalonde 3cfd2dd667 FIX: quote text twice overwrites the first quote 2013-12-03 16:39:35 -05:00
Robin Ward cb9fb2acfa FIX: A post via the message bus wasn't updating `highest_post_number` properly. 2013-12-03 16:25:51 -05:00
Neil Lalonde 915861a646 FIX: suspended users still appear suspended after their suspension expires 2013-12-03 15:53:30 -05:00
Robin Ward c4394688de FIX: CSRF token retrieval bug 2013-12-03 15:30:33 -05:00
Robin Ward 50fe117d7c FIX: Load order bug 2013-12-03 15:11:33 -05:00
Robin Ward 274743b877 Refactor: Move initialization code into separate initializers that use the API we 
developed for plugins.
 2013-12-03 14:22:32 -05:00
Robin Ward de78ee302a - Extract Browser capabilities from Discourse namespace into a Singleton. 
- Change Scrolling slack based on Android / Touch / Desktop
 2013-12-03 13:03:19 -05:00
Robin Ward 8b4c030c16 Small email fixes 2013-12-03 10:11:04 -05:00
Sam bf2663346a Merge pull request #1712 from awesomerobot/master 
making the category dropdown taller
 2013-12-02 21:34:54 -08:00
Sam bf2652f0ec Merge pull request #1713 from jithugopal/fix-gender-sensitive-pronouns 
Fixing gender sensitive pronouns
 2013-12-02 21:34:07 -08:00
Sam e16621077a semicolon for the greater good 2013-12-03 16:09:57 +11:00
Jithu Gopal 9584ecb295 fixing gender sensitive pronouns 2013-12-03 10:19:54 +05:30
Kris Aubuchon d6ddc70fea making the category dropdown taller 2013-12-02 21:09:16 -05:00
Robin Ward bdac13b636 FIX: If there are no featured topics in a category, don't fail. 2013-12-02 17:44:57 -05:00