Commit graph

15055 commits

Author SHA1 Message Date
Robin Ward
c18bc59808 Increase limit on user fields 2015-05-19 11:34:54 -04:00
Neil Lalonde
e5fd50aa1e FIX: delete my own account button was always disabled 2015-05-19 11:23:04 -04:00
Robin Ward
4e0d7683ab Better error messages on admin for granting moderation
Also fixes up Ember deprecations.
2015-05-19 10:56:32 -04:00
Régis Hanol
d889f05480 changed default 'poll maximum options' to 20 2015-05-19 14:33:27 +02:00
Régis Hanol
efb992c9d9 FEATURE: t-nation importer 2015-05-19 12:40:47 +02:00
Régis Hanol
dcc4267490 FIX: base script import to handle category color/text color 2015-05-19 12:40:35 +02:00
Régis Hanol
f0b35b2fe2 FIX: file helper to download file using chunks of 512KB 2015-05-19 12:39:46 +02:00
Régis Hanol
b25f223bfc remove old vBulletin import script 2015-05-19 12:39:00 +02:00
Régis Hanol
5e527178b9 FEATURE: new 'uploads:migrate_to_new_pattern' rake task 2015-05-19 12:31:51 +02:00
Régis Hanol
9ded21e4c6 FIX: consistent and future-proof upload storage pattern 2015-05-19 12:31:12 +02:00
Régis Hanol
666b5b40a5 Merge pull request #3489 from techAPJ/patch-3
UX: fix blockquote in firefox
2015-05-19 12:25:37 +02:00
Arpit Jalan
c2510e610d UX: fix blockquote in firefox 2015-05-19 15:10:19 +05:30
Régis Hanol
01ebe9ce69 FIX: sourceMappingURL in IE10 2015-05-19 10:33:57 +02:00
Sam
dd91d5b02f FEATURE: disable invites by setting max_invites_per_day to 0 2015-05-19 16:51:21 +10:00
Sam
15a59dcde7 EXTENSIBILITY: topic-after-cooked plugin outlet 2015-05-19 15:34:54 +10:00
Sam
8002c46c21 FEATURE: g b to take you to your bookmarks 2015-05-19 15:34:16 +10:00
Sam
f26fef4340 silence ar not found 2015-05-19 09:32:27 +10:00
Régis Hanol
a69451c75d Merge pull request #3285 from fantasticfears/user-card-animation
user card animation when there is an active user card
2015-05-18 21:45:26 +02:00
Régis Hanol
72d46ee337 Merge pull request #3488 from techAPJ/patch-3
Add PunBB import script
2015-05-18 21:44:25 +02:00
Arpit Jalan
6a730a8283 Add PunBB import script 2015-05-18 23:08:05 +05:30
Erick Guan
4ac40145d8 user card animation when there is an active user card 2015-05-19 00:19:06 +08:00
Régis Hanol
3f7d693786 Merge pull request #3454 from fantasticfears/group-page
FIX: show user card on group page and fix styles
2015-05-18 14:28:43 +02:00
Régis Hanol
b2f50c154a Merge pull request #3486 from techAPJ/patch-2
FIX: handle user export failure when post is not linked to a topic
2015-05-18 09:21:58 +02:00
Régis Hanol
269074f43e Merge pull request #3487 from techAPJ/patch-1
UX: add space between location icon and text
2015-05-18 09:21:39 +02:00
Arpit Jalan
c5a57a9f94 UX: add space between location icon and text 2015-05-18 12:13:42 +05:30
Arpit Jalan
b3314ea801 FIX: handle user export failure when post is not linked to a topic 2015-05-18 09:07:12 +05:30
Sam
924dba0ed6 Merge pull request #3485 from fantasticfears/digest-category-badge
FIX: also inline category badge styles to digest email
2015-05-18 11:43:37 +10:00
Erick Guan
3be1098cc5 FIX: also inline category badge styles to digest email 2015-05-18 00:45:26 +08:00
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