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

5620 Commits

Author SHA1 Message Date
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
Neil Lalonde 7bbb32bac2 Fix javascript_include_tag for browser-update so it includes MD5. Needed to add .js extension for some reason. 2013-12-02 15:57:23 -05:00
Robin Ward 0b86067be9 Merge pull request #1705 from albandiguer/tests_performance 
Test performance: define a lower post max length
 2013-12-02 12:31:32 -08:00
Robin Ward 0c259af374 FIX: Don't give weird progress numbers when there are deleted posts. 2013-12-02 15:09:25 -05:00
Robin Ward b37fae50e3 OOPS: Commented out the wrong line 2013-12-02 14:28:01 -05:00
Neil Lalonde eea7aea688 Android 2.2 and 2.3: show warning that the browser is not supported 2013-12-02 14:18:33 -05:00
Robin Ward 48bfcfadd9 Upgrade Ember.js, fix swallowing of template errors, report unresolved promises in development mode. 2013-12-02 13:15:58 -05:00
Neil Lalonde 79f1055164 Fix autoclose form in category modal 2013-12-02 11:03:35 -05:00
Robin Ward 5fd5b18c19 Missing # in email colors 2013-12-02 10:04:29 -05:00
Régis Hanol 3842097698 add lightbox extra-zoom on click 2013-12-02 11:03:47 +01:00
Régis Hanol bfd2fd8607 update magnific popup to latest (v. 0.9.9) 2013-12-02 10:38:15 +01:00
Régis Hanol 5150376e12 add wrapper class for lightboxes 2013-12-02 10:06:48 +01:00
Sam ea835b78dc Merge pull request #1710 from benjaminbrent/master 
Fix email_preview AJAX call to use Discourse.ajax
 2013-12-01 23:51:09 -08:00
Sam 70434118ce Merge pull request #1711 from kohenkatz/bug/digest_email_links_broken 
Fixed broken links in HTML version of Digest email
 2013-12-01 22:20:16 -08:00
MK 2d4e62dd64 Fixed broken links in Digest email 
Based on @eviltrout's fix from 7a60eacca9.
 2013-12-02 01:11:55 -05:00