Commit graph

13186 commits

Author SHA1 Message Date
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
Arpit Jalan
53b443c8e5 FIX: link insertion dialog should not modify the inserted links 2015-02-20 22:12:23 +05:30
Régis Hanol
82157418eb FIX: we only want to downsize emojis 2015-02-20 17:24:37 +01:00
Neil Lalonde
de167165e3 FIX: don't change default_digest_email_frequency during import 2015-02-20 10:30:30 -05:00
Régis Hanol
84156c7bde Merge pull request #3216 from techAPJ/patch-2
FIX: non-secure warning from YouTube thumbnails
2015-02-20 09:18:18 +01:00
Sam
bd61cdf21c FIX: when allow uncategorized was off we were still showing uncat for admins/mods 2015-02-20 17:40:59 +11:00
Arpit Jalan
d1bcda2d5b FIX: non-secure warning from YouTube thumbnails 2015-02-20 09:09:04 +05:30
Sam
17927b2e8b FIX: don't use flash cause we are not redirecting
(we should probably change that though)
2015-02-20 10:28:58 +11:00
Neil Lalonde
61bd9c77c3 Version bump to v1.3.0.beta1 2015-02-19 16:27:43 -05:00
Robin Ward
aef7bf8b31 FIX: It should be BadgeType::Silver 2015-02-19 15:39:49 -05:00
Robin Ward
f85f38a887 Update the header action to be ES6 2015-02-19 14:58:02 -05:00
Robin Ward
e503c3859a Allow plugins to change the header to show two rows
This allows the discourse-tagging plugin to correctly use two rows in
the header if it needs to display tags, or one row if there are no tags.
This works in tandem with the same logic for when there is a category
badge to display or not.
2015-02-19 14:56:45 -05:00
Régis Hanol
8fd69fd3cf FIX: group member pages only showing first 50 members alphabetically 2015-02-19 20:26:18 +01:00
Régis Hanol
e74b9ee5da FIX: should not count disagreed flags 2015-02-19 18:11:07 +01:00
Neil Lalonde
b2197a754f Merge pull request #3214 from techAPJ/update-translations
Update Translations
2015-02-19 11:37:32 -05:00
Arpit Jalan
5c61661b7c Update Translations 2015-02-19 21:41:24 +05:30