Commit Graph

3051 Commits

Author SHA1 Message Date
Vikhyat Korrapati 483c9f9826 Don't show the upload avatar modal is allow_uploaded_avatars is false. 2013-12-06 11:31:11 +05:30
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 2db3cfb16b annotate models 2013-12-05 17:40:35 +11: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 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
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
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 e16621077a semicolon for the greater good 2013-12-03 16:09:57 +11:00
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 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
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
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
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
MK 2d4e62dd64 Fixed broken links in Digest email
Based on @eviltrout's fix from 7a60eacca9.
2013-12-02 01:11:55 -05:00
Sam 7f4697a200 bug: if status changes always attempt to update the feature topics for the category right away 2013-12-02 16:32:24 +11:00
Sam a2d5a7dbd8 auto close is messed up in category edit, remove for now 2013-12-02 16:13:32 +11:00
Sam 8d859a9f68 break cache of fonts 2013-12-02 08:19:34 +11:00
Benjamin Brent 761da7d380 Fix email_preview AJAX call to use Discourse.ajax 2013-12-01 13:30:41 +11:00
Sam f5d905c215 Merge pull request #1707 from chancancode/as_json_fix
The Rails JSON encoder API requires `as_json` to take an optional arg
2013-11-30 03:40:21 -08:00
Godfrey Chan 6bbea9de0b The Rails JSON encoder API requires `as_json` to take an optional arg 2013-11-29 21:43:44 -08:00
Kris Aubuchon a9060fac70 added KBD style back 2013-11-29 22:44:00 -05:00
Robin Ward 7a60eacca9 FIX: Broken unsubscribe link in HTML email 2013-11-29 17:13:16 -05:00
Robin Ward 769223014c FIX: Allow link redirects inside oneboxed posts 2013-11-29 14:29:49 -05:00
Régis Hanol 298b54c0e7 add download link in lightbox 2013-11-29 20:03:39 +01:00
Robin Ward 008151e90d FIX: Too much white space between posts on mobile 2013-11-29 13:06:52 -05:00
Robin Ward 781a8876d3 Show post count in digest emails. Sort by score 2013-11-29 13:00:25 -05:00
Robin Ward 3da2285ef1 FIX: Missing styles in HTML digest emails 2013-11-29 12:21:36 -05:00
Régis Hanol 9b6538832d whitelist google.com/maps iframes 2013-11-29 18:08:53 +01:00