Commit graph

6006 commits

Author SHA1 Message Date
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
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
5e0b22365a skip validations for Spam Rules when needed 2013-12-02 16:13:47 +11:00
Sam
a2d5a7dbd8 auto close is messed up in category edit, remove for now 2013-12-02 16:13:32 +11:00
Sam
ed76c1f72a message bus and vestal versions update 2013-12-02 08:19:34 +11:00
Sam
8d859a9f68 break cache of fonts 2013-12-02 08:19:34 +11:00
Sam
051fb5bb5b cors for fonts, so firefox stays happy 2013-12-01 15:18:59 +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
Sam
7ece395e5a Merge pull request #1708 from chancancode/dont_abuse_as_json
Don't abuse as_json, it's not meant for consumption
2013-11-30 03:39:27 -08:00
Sam
4698ad8876 Merge pull request #1706 from awesomerobot/master
added KBD style back
2013-11-30 03:34:37 -08:00
Godfrey Chan
1a2114d87d Don't abuse as_json, it's not meant for consumption
The `as_json` API is a hook for JSON encoders to call, not meant for
consumption like this, and the result is not guarenteed to be stable
across Rails versions.

There might be other cases like this that we should revisit later, but
this one in particular is causing a test to fail on Rails master.
2013-11-29 21:58:09 -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
Alban Diguer
70bd5832a9 Performance: reduce max length post model for testing purpose 2013-11-30 15:13:41 +13:00
Robin Ward
7a60eacca9 FIX: Broken unsubscribe link in HTML email 2013-11-29 17:13:16 -05:00
Wojciech Zawistowski
66de19790e cleans up site map integration tests 2013-11-29 21:01:46 +01:00
Robin Ward
769223014c FIX: Allow link redirects inside oneboxed posts 2013-11-29 14:29:49 -05:00