Commit graph

12087 commits

Author SHA1 Message Date
Régis Hanol
64b06b360a Merge pull request #3008 from oblakeerickson/log_out_return_success
Have log_out method return json
2014-12-01 14:26:06 +01:00
Blake Erickson
bdc92eec70 Have log_out method return json.
This commit helps improve the discourse_api experience so that we can
check the json response if it was a success or not. This commit also
checks that a 404 is sent instead of a 500 if a bad user_id is passed
in.
2014-12-01 06:03:25 -07:00
Jeff Atwood
c00c5e1024 our previous mobile avatar tap fix was incorrect 2014-12-01 03:36:25 -08:00
Régis Hanol
a3a04e06b6 fix images in readme 2014-12-01 11:38:33 +01:00
Régis Hanol
a6074af711 Merge pull request #3010 from techAPJ/patch-1
FEATURE: switch to GitHub email_reply_parser library and parse plain tex...
2014-12-01 11:18:24 +01:00
Régis Hanol
5f445826c5 Merge pull request #3011 from chancancode/dont_use_route
Don't `use_route`
2014-12-01 11:16:01 +01:00
Godfrey Chan
5352a7f53c Don't use_route
See https://github.com/rails/rails/pull/17453 and https://github.com/rails/rails/pull/17725
2014-11-30 21:25:54 -08:00
Sam
9defb6879b upgrade to rails master 2014-12-01 15:34:50 +11:00
Arpit Jalan
529014d56e FEATURE: switch to GitHub email_reply_parser library and parse plain text email content 2014-12-01 09:00:35 +05:30
Jeff Atwood
003d32babe decrease size of cat color stripe in digests a bit 2014-11-29 03:58:44 -08:00
Jeff Atwood
cb9507d292 tighten up title line height in digest email 2014-11-28 11:45:03 -08:00
Robin Ward
cb0e7a5724 For performance reasons, use delete_all when removing a user's email logs 2014-11-28 14:20:43 -05:00
Robin Ward
37a3e956b6 UX: Link categories in digest emails 2014-11-28 13:44:40 -05:00
Jeff Atwood
a85a3da167 move digest email featured post category underneath 2014-11-28 00:38:08 -08:00
Neil Lalonde
781807191e Version bump to v1.2.0.beta3 2014-11-27 16:48:08 -05:00
Régis Hanol
07211489f0 FIX: hide restricted profile info from TL0 users to anonymous in 'JS-off' page 2014-11-27 19:51:13 +01:00
Régis Hanol
65c106325c remove old & useless import script 2014-11-27 19:30:19 +01:00
Régis Hanol
5b90ceb71d FEATURE: rolls up 1.2.*.* IP ranges when number of entries > 10 2014-11-27 19:29:30 +01:00
Neil Lalonde
062e954122 Merge pull request #3007 from techAPJ/update-translations
Update Translations
2014-11-27 12:00:53 -05:00
Arpit Jalan
cd8ab37507 Update Translations 2014-11-27 20:28:52 +05:30
Jeff Atwood
31b769d4fa remove unneeded mobile footer left margin 2014-11-27 03:35:05 -08:00
Jeff Atwood
4589f28676 remove unwanted global text input font sizing 2014-11-27 02:13:15 -08:00
Jeff Atwood
c3a47aee70 use shorter Export button copy 2014-11-26 23:57:18 -08:00
Sam
013f1a6dd0 FEATURE: allow creating admin and moderator accounts via SSO 2014-11-27 12:39:00 +11:00
Sam
800ae5265f Add admin and moderator state to sso provider 2014-11-27 12:24:37 +11:00
Jeff Atwood
f918d3e89b FEATURE: add Message-ID header to emails
when topic present for email of course
2014-11-26 16:36:02 -08:00
Régis Hanol
4e735e8aab FIX: roll up staff action wasn't working 2014-11-27 01:12:56 +01:00
Sam
3fd4fc679e a few missing spots 2014-11-27 11:02:54 +11:00
Sam
5c965dcb0b FEATURE: show card when clicking on avatar in admin user list 2014-11-27 10:46:32 +11:00
Robin Ward
8366fcd78f FIX: Don't lose focus on site settings text field (was changing routes
during filtering)
2014-11-26 18:01:45 -05:00
Robin Ward
c7bda41dda FIX: Use OR query instead of AND, also check that the profile is
blank
2014-11-26 16:29:58 -05:00
Robin Ward
257bde8e2b FEATURE: "Suspect" users list in admin. 2014-11-26 13:58:16 -05:00
Régis Hanol
10b5032188 FIX: auto-closing attribution when a TL4 user auto-closes a topic 2014-11-26 19:51:07 +01:00
Régis Hanol
27d78332c4 FEATURE: restrict some user fields for TL0 users when viewed by anonymous users 2014-11-26 19:20:03 +01:00
Robin Ward
cb124d5836 UX: Consolidate "Admins" and "Moderators" into "Staff" on admin users
list
2014-11-26 13:10:12 -05:00
Robin Ward
a3e53e0d28 Use far fewer admin user list routes, instead pass the query as a
parameter.
2014-11-26 13:05:49 -05:00
Régis Hanol
41deea6892 Merge pull request #3006 from awesomerobot/master
fixing reply-tab bug and user profile background adjustment
2014-11-26 16:53:57 +01:00
Kris Aubuchon
1524612719 fixing reply-tab bug and user profile background adjustment 2014-11-26 10:49:50 -05:00
Régis Hanol
d7ef4f1edd remove useless 'puts' 2014-11-26 16:40:03 +01:00
Régis Hanol
37a9164fa0 FIX: click counter for attachments 2014-11-26 13:05:43 +01:00
Sam
c10e3df012 FEATURE: implement SSO provider on Discourse so Auth can be farmed to it
FEATURE: pass return_sso_url to SSO endpoints, for easier return
2014-11-26 17:26:27 +11:00
Sam
12e587c9b3 update rails master 2014-11-26 17:26:27 +11:00
Robin Ward
81eedf3a12 No need to call it Discourse.TopicRoute -- that is done automatically
by the compatibility layer. cc @ZogStrIP
2014-11-25 18:21:21 -05:00
Robin Ward
220f2424b5 FIX: Load order issue / header category badge when not surpressed 2014-11-25 18:13:38 -05:00
Sam
d171d6db19 FEATURE: export sso data if sso is enabled 2014-11-26 09:43:28 +11:00
Robin Ward
4c9f55d1e1 FIX: Suspended users should have links stripped from their profiles. 2014-11-25 16:14:39 -05:00
Régis Hanol
183c93904d FIX: don't show the banner topic on error page 2014-11-25 19:09:17 +01:00
Régis Hanol
515b616d30 ooops. forgot the args :fired: 2014-11-25 18:45:45 +01:00
Régis Hanol
05727e89e0 Merge pull request #3003 from techAPJ/patch-2
upload bulk invite csv file to /public/uploads/csv
2014-11-25 18:10:09 +01:00
Arpit Jalan
c5229a0268 upload bulk invite csv file to /public/uploads/csv 2014-11-25 22:25:09 +05:30