Commit graph

14550 commits

Author SHA1 Message Date
Régis Hanol
764f9b42fe Merge pull request #3458 from Qasem-h/Bosnian
Add Bosnian langage for discourse
2015-05-15 14:34:16 +02:00
Régis Hanol
93273cd17a Merge pull request #3451 from ossobv/sso_login_unapproved_account
Stop sso login processing after rendering error
2015-05-15 14:33:19 +02:00
Régis Hanol
d40d308e45 Merge pull request #3445 from lukegb/bug/anonymous-emails
Don't send emails to anonymous users
2015-05-15 14:28:37 +02:00
Régis Hanol
d4974b7093 FIX: anonymous mode don't work when names are required 2015-05-15 14:20:15 +02:00
Régis Hanol
48f4fe7e7a Merge pull request #3473 from binaryage/hipchat-plugin
Add missing events for discourse-hipchat-plugin
2015-05-15 14:10:05 +02:00
Régis Hanol
0d5fdd25c9 Merge pull request #3474 from Qasem-h/Css
fix emoji autocomplete in RTL
2015-05-15 14:08:45 +02:00
Régis Hanol
60906c3b23 Merge pull request #3475 from fantasticfears/vbulletin-attachment
vBulletin: ability to import attachments from filesystem
2015-05-15 14:08:17 +02:00
Erick Guan
7737cc2828 vBulletin: ability to import attachments from filesystem 2015-05-15 19:39:15 +08:00
Qasem Hajizadeh
1b7c616159 Update rtl.scss 2015-05-15 14:33:00 +04:30
Régis Hanol
42be2b431f ooops, we actually need that :fired: 2015-05-15 11:51:10 +02:00
Régis Hanol
a3fb2c002c FIX: remove dangerous support for style/background attributes in polls 2015-05-15 11:08:51 +02:00
Antonin Hildebrand
11852056a8 Add missing events for discourse-hipchat-plugin
https://github.com/binaryage/discourse-hipchat-plugin
2015-05-15 15:52:12 +08:00
Sam
fdbcc31a9c Merge pull request #3461 from fantasticfears/slug
FIX: category custom slug can't be set when generation method is none
2015-05-15 14:59:35 +10:00
Sam
36ee85f3bc Merge pull request #3462 from fantasticfears/category-badge
FIX: ensure not found page's category badge consistent with style
2015-05-15 14:58:15 +10:00
Sam
faa381781b Merge pull request #3472 from riking/patch-1
Add some documentation to fast_pluck.rb
2015-05-15 14:55:05 +10:00
riking
428ff097f1 Add some documentation to fast_pluck.rb 2015-05-14 21:15:33 -07:00
Sam
2955507a57 FEATURE: badges for inviting users
First invite = Promoter
3 TL2 = Campaigner
10 TL3 = Champion
2015-05-15 12:04:41 +10:00
Sam
cb09c0d7a5 Merge pull request #3471 from riking/style-inject
FIX: Properly whitelist li styles
2015-05-15 09:46:37 +10:00
riking
9d232dac9a FIX: Properly whitelist li styles 2015-05-14 16:43:01 -07:00
Robin Ward
8e395a94d4 FIX: Modal asking where to post was missing 2015-05-14 18:18:28 -04:00
Andrew Huling
e1d2ecef10 In the case of an expired nonce, return a 400 status code instead of a 500.
500 status codes are for unexpected server-side error scenarios. When an expired nonce is used by the client, a 4XX-level error is more appropriate because the client has submitted a bad request (by using an expired nonce). A 500 also causes Internet Explorer to show its default 500 page which does not show the error message and leads to a bad end user experience. I am choosing 400 for the new status rather than 401 or 403 because 401 requires a WWW-Authenticate header which would be difficult to generate in an SSO scenario and a 403 implies that no re-authentication will address the failure.
2015-05-14 16:03:02 -04:00
Neil Lalonde
4451c8802a FIX: post gutter links are broken when using a subfolder 2015-05-14 14:26:18 -04:00
Robin Ward
32606f82f6 FIX: replaceWith on leaf routes changed behavior in latest ember 2015-05-14 13:44:57 -04:00
Robin Ward
2e85a817b2 Merge pull request #3467 from boushley/enable-cors-logout
Enable CORS requests to pass necessary headers.
2015-05-14 13:21:05 -04:00
Robin Ward
f1b9a389d9 Merge pull request #3468 from fantasticfears/fix-dashboard
FIX: unhandle show report action
2015-05-14 13:19:40 -04:00
Erick Guan
2c09e97ca0 FIX: unhandle show report action 2015-05-15 00:59:31 +08:00
Robin Ward
6a3086843d OOPS, left debugging stuff in last push. 2015-05-14 12:48:12 -04:00
Robin Ward
cd27ba3478 FIX: Properly add no-conflict to ace editor 2015-05-14 12:46:51 -04:00
Aaron Boushley
60aa52b753 Enable CORS requests to pass necessary headers.
To fully enable session deletion over CORS we need support for passing the
`X-Requested-With` header so that these requests can pass the `check-xhr` filter.

I also allowed the `X-CSRF-Token` to enable the alternative CSRF passing syntax.
2015-05-14 09:46:41 -07:00
Régis Hanol
635b31af7b FIX: editing a post with a poll breaks sometimes 2015-05-14 17:18:45 +02:00
Robin Ward
c23aeddccf Merge pull request #3466 from techAPJ/patch-2
FIX: user archive export was failing in some cases
2015-05-14 11:16:51 -04:00
Robin Ward
963b08f063 Allow OPTIONS requests when CORS is enabled 2015-05-14 11:14:47 -04:00
Arpit Jalan
750a275dcb FIX: user archive export was failing in some cases 2015-05-14 20:35:25 +05:30
Régis Hanol
0b62730382 Merge pull request #3465 from riking/patch-2
FEATURE: Multiple notifications at once (1/topic)
2015-05-14 10:05:48 +02:00
Sam
4a48f983fd PERF: hit all index conditions to speed up anon ip tracking 2015-05-14 17:21:02 +10:00
Sam
2b2d0e803f PERF: missing index on useractions making user page slow 2015-05-14 14:39:04 +10:00
Sam
e074651fdc PERF: refactor user search so works more efficiently
Stop scanning entire user table
2015-05-14 14:38:47 +10:00
Sam
1eeed5fed2 PERF: speed up counting of unread notifications 2015-05-14 12:33:43 +10:00
Sam
e6f73a1c80 PERF: optimise front page category security lookup query 2015-05-14 12:19:22 +10:00
Sam
b0306fd613 DEV: make autospec compatible with rspec 3 2015-05-14 11:24:48 +10:00
riking
28f32aff66 FEATURE: Multiple notifications at once (1/topic) 2015-05-13 18:23:42 -07:00
Régis Hanol
82cc467d93 FIX: move to new/another topic 2015-05-13 23:42:45 +02:00
Régis Hanol
7c545537a6 FIX: prevent pollception 2015-05-13 23:12:53 +02:00
Robin Ward
8fa109638b FIX: Double load if left a topic and came back into it. 2015-05-13 16:54:06 -04:00
Robin Ward
b0695a2fc6 Merge pull request #3459 from arturtr/patch-1
Add http-ip param for mailcatcher
2015-05-13 16:34:01 -04:00
Régis Hanol
43755a6fab keep closed status when migrating poll to new style 2015-05-13 22:30:27 +02:00
Robin Ward
d90063fc59 FIX: Error with ace editor and new ember.
Fix upgrades ace editor, which was a huge headache due to AMD.
2015-05-13 16:25:33 -04:00
Régis Hanol
06643fb625 add support for all types of unordered lists in migrate_old_polls 2015-05-13 22:10:02 +02:00
Robin Ward
01d4085125 Removed bad JS tests, upgrade QUnit + ember-qunit 2015-05-13 14:13:37 -04:00
Régis Hanol
4df868a420 FIX: update 'migrate_old_polls' rake task to support more cases
FIX: support list that uses double newlines
FIX: support list that uses spaces before the '-'
FIX: don't break lamentably when a poll wasn't created
2015-05-13 19:56:09 +02:00