codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-25 08:39:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
15023 commits 7 branches 179 tags 87 MiB
Commit graph

15023 commits

This branch
This branch
All branches
Author SHA1 Message Date
Régis Hanol
ac74f2a1d3 Merge pull request #3483 from techAPJ/patch-1 
FIX: show meaningful error message in case of site setting error
 2015-05-17 11:11:13 +02:00
Régis Hanol
94d8b965e9 Merge pull request #3484 from techAPJ/patch-2 
UX: do not show last post label in user card if user never posted
 2015-05-17 11:10:54 +02:00
Arpit Jalan
ac13238127 UX: do not show last post label in user card if user never posted 2015-05-17 14:37:26 +05:30
Arpit Jalan
e287046d32 FIX: show meaningful error message in case of site setting error 2015-05-17 14:15:27 +05:30
riking
d0b61ed23e Filter files to only plain-text 2015-05-16 21:19:00 -07:00
riking
30abc91a5c this just in: drag events are very broken 2015-05-16 21:04:57 -07:00
riking
fbc06d044f Use .dcstylejson instead of .dcstyle.json 2015-05-16 20:41:35 -07:00
riking
291d9fc65e FEATURE: Import customizations from a JSON file 2015-05-16 20:24:19 -07:00
riking
1e53c179a3 FEATURE: Export customizations as JSON files 2015-05-16 20:24:13 -07:00
Jeff Atwood
7ab8827c7e Merge pull request #3480 from fantasticfears/patch-13 
Also exclude JS libraries from code climate
 2015-05-16 04:17:46 -07:00
Erick Guan
ec03a8d21b Also exclude JS libraries from code climate 2015-05-16 19:12:14 +08:00
Régis Hanol
6daa02f883 Merge pull request #3479 from techAPJ/patch-2 
FIX: trim leading/trailing spaces from invite email
 2015-05-16 12:24:12 +02:00
Arpit Jalan
896ea8e177 FIX: trim leading/trailing spaces from invite email 2015-05-16 15:21:31 +05:30
Régis Hanol
cab442caf2 Merge pull request #3478 from fantasticfears/code-climate 
DEV: exclude the script folder from code climate
 2015-05-16 09:52:31 +02:00
Erick Guan
f49c71ddfa DEV: exclude the script folder from code climate 2015-05-16 10:47:37 +08:00
Ryan Fox
14d2b76354 Merge branch 'master' into fix-by-external 
Conflicts:
	app/controllers/users_controller.rb
 2015-05-15 19:54:11 -04:00
Paul Kaplan
b8a43e153c Use session controller to prevent inactive SSO users 2015-05-15 12:15:06 -05:00
Paul Kaplan
4c26c4d9bc Add a SiteSetting to not trust sso emails by default 2015-05-15 12:15:06 -05:00
Robin Ward
94ca9ed11f FIX: Rate limits weren't being showing for action summary errors 2015-05-15 12:16:05 -04:00
Robin Ward
5148c48170 FIX: Image uploading component was missing a class 2015-05-15 11:12:41 -04:00
Robin Ward
0362c50698 Remove deprecations from edit-category and add skeleton acceptance test 2015-05-15 11:12:41 -04:00
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