Commit graph

14652 commits

Author SHA1 Message Date
Robin Ward
ff842758e1 Merge pull request #3230 from jamielinux/gzip-k
Avoid gzip "-k" option for wider OS compatibility
2015-02-24 14:42:07 -05:00
Robin Ward
042031ecb0 Merge pull request #3231 from erpe/css_fixes
add line-height on page-not-found for h1
2015-02-24 14:38:19 -05:00
Robin Ward
3f729438ad ES6: Removed and renamed some admin views 2015-02-24 13:47:46 -05:00
Robin Ward
5a7ae8c63f Clicking on the date of a featured topic should show topic entrance 2015-02-24 12:56:06 -05:00
Rene Paulokat
74845948ca add line-height on page-not-found for h1 2015-02-24 17:28:32 +01:00
Robin Ward
7e2dd2463e Bump onebox version. 2015-02-24 10:50:19 -05:00
Jamie Nguyen
5d16db1c48 Avoid gzip "-k" option for wider OS compatibility
The "-k" option tells gzip to keep the original files intact and is an
alternative to `gzip -c file > file.gz`. It was implemented in 2013:
http://git.savannah.gnu.org/cgit/gzip.git/commit/?id=0192f02

There are a few popular operating systems (ie, Red Hat 7, Debian Wheezy)
whose version of gzip does not have the "-k" option. Compiling assets
breaks on these operating systems. Using "-c" instead ensures that it
works even with older versions of gzip.
2015-02-24 15:19:23 +00:00
Régis Hanol
34af7f20af Merge pull request #3228 from riking/describe
FEATURE: Use `git describe` for dashboard version
2015-02-24 11:45:57 +01:00
Sam
e9c5e17fbe PERF: disable PM stats when explicitly omitting stats 2015-02-24 13:39:31 +11:00
Sam
130dbf7358 PERF: don't run stats query in user card 2015-02-24 13:31:23 +11:00
Sam
8c7cce1bfc PERF: added missing indexes for pinned topics 2015-02-24 11:53:32 +11:00
Sam
738f2cb72c REGRESSION: pms not ordering on bumped_at descending 2015-02-24 11:28:17 +11:00
riking
f1b606bf08 FEATURE: Use git describe for dashboard version 2015-02-23 16:07:08 -08:00
Sam
0ccce7a59b Merge pull request #3227 from sigginet/patch-1
FIX: Forward to SSO login automatically
2015-02-24 10:42:30 +11:00
Robin Ward
34dc1f9e10 Spec to ensure that SSO respects blocked emails 2015-02-23 17:14:54 -05:00
Sigurður Guðbrandsson
96e6fd3449 Cleaned up the sso codefix, thanks @SamSaffron
@SamSaffron showed me a cleaner way to use the if statements in the sso redirect code.

Thanks sam ;)
2015-02-23 22:10:44 +00:00
Sigurður Guðbrandsson
334a357363 FIX: Forward to SSO login automatically
Forward to SSO login URL automatically if SSO is enabled and login is required.

Makes it simpler for users to log in automatically.
2015-02-23 21:20:36 +00:00
Robin Ward
ca5730018a FIX: SSO code should respect IP address filters 2015-02-23 16:01:46 -05:00
Robin Ward
d63aed69f7 Merge pull request #3226 from techAPJ/patch-3
FEATURE: new site setting contact_url
2015-02-23 13:28:44 -05:00
Robin Ward
8186d86f38 FIX: Enforce max length for custom user fields 2015-02-23 13:02:30 -05:00
Arpit Jalan
a25e3cca8e FEATURE: new site setting contact_url 2015-02-23 23:09:13 +05:30
Robin Ward
9264a7914f Removed a bunch of Discourse.Site globals 2015-02-23 12:36:04 -05:00
Robin Ward
e684d7689e FIX: If categories page is the default, don't add it to the title 2015-02-23 11:54:45 -05:00
Robin Ward
0f4693b7eb Merge pull request #3225 from techAPJ/patch-3
UX: unified About / Privacy / ToS / FAQ topnav
2015-02-23 11:51:55 -05:00
Arpit Jalan
b04fae2e2c UX: show real name on the about page 2015-02-23 22:14:51 +05:30
Arpit Jalan
ddb8378ab0 UX: unified About / Privacy / ToS / FAQ topnav 2015-02-23 18:26:19 +05:30
Jeff Atwood
7bb80928ac minor copy tweak 2015-02-23 02:09:48 -08:00
Sam
5266ad4539 Merge pull request #3183 from riking/json-errors-2
Consolidate custom exception handling
2015-02-23 16:58:05 +11:00
Sam
47aa8f3f97 Merge pull request #3197 from riking/rate-limiter
FIX: Don't expire ratelimits at midnight server time
2015-02-23 16:52:25 +11:00
Sam
8370b26cba PERF: optimise pinned handling on home page
Old query used to scan the full topics table, on home page

Instead we now perform 2 queries, one for pinned and one for unpinned and merge
results in a 10x improvement on a 1 million topic DB
2015-02-23 16:51:21 +11:00
riking
ecb911285d Fix the render_json_error api 2015-02-22 21:28:50 -08:00
Sam
a55a6fb703 Merge pull request #3166 from fantasticfears/bbpress
add table prefix constant to bbpress import script & fix user imports
2015-02-23 14:23:15 +11:00
Sam
6960639c58 Merge pull request #3190 from riking/thrown_logging
Delete old ErrorLog, use Logster for 500 errors
2015-02-23 14:19:16 +11:00
Sam
4d3fc3a724 Merge pull request #3223 from bjfish/patch-1
Add Rubinius to Build Matrix with Allowed Failure
2015-02-23 13:07:55 +11:00
Sam
72606a776e Merge pull request #3224 from edgibbs/double_escaped_quotes_mobile_view
FIX: Don't escape test in topic excerpt for mobile.
2015-02-23 13:07:04 +11:00
Ed Gibbs
2dbfeb71a8 FIX: Don't escape test in topic excerpt for mobile.
Stopped escaping topic excerpt in the mobile handlebars template to
ensure things like quotes don't get escaped.
2015-02-22 16:57:30 -08:00
Sam
363fc03ab3 FEATURE: raise min body size to 10m 2015-02-23 10:50:09 +11:00
Brandon Fish
53f35cc4fd Add Rubinius to Build Matrix with Allowed Failure
Please add Rubinius to the build matrix with failure allowed.
2015-02-22 13:51:40 -06:00
Régis Hanol
20c9a312c7 FIX: clicks counter on attachments wasn't always working 2015-02-22 20:47:18 +01:00
Jeff Atwood
a2d9e4cf97 Merge pull request #3221 from dandv/patch-1
Typo fix
2015-02-21 22:59:31 -08:00
Jeff Atwood
2617426eae Merge pull request #3220 from NomNuggetNom/master
Fix misaligned dropdown categories
2015-02-21 22:59:11 -08:00
Dan Dascalescu
03a9850d09 Typo fix 2015-02-21 20:44:23 -08:00
NomNuggetNom
44e8087e20 Fix misaligned dropdown categories 2015-02-21 22:02:08 -05:00
Régis Hanol
92e6446f0f FEATURE: new site setting 2015-02-21 18:37:37 +01:00
Robin Ward
3aa165d3b6 Provides the ability to skip minification of some JS assets. 2015-02-20 15:51:38 -05:00
Régis Hanol
3bcaaf6960 also update changed attributes 2015-02-20 18:33:55 +01:00
Robin Ward
ef2cad76ef Merge pull request #3217 from techAPJ/patch-3
FIX: link insertion dialog should not modify the inserted links
2015-02-20 12:32:14 -05:00
Régis Hanol
cd423f4a43 use the view instead 2015-02-20 18:21:19 +01:00
Robin Ward
043e522f39 Wire up admin view properly 2015-02-20 12:18:42 -05:00
Régis Hanol
7e1651a36e FIX: disable custom stylesheets in /admin 2015-02-20 17:43:29 +01:00