Commit Graph
835 Commits
Author SHA1 Message Date
Shane Kilkelly f5ced03074 Set redirect when sending user to login page.
Allows smart redirecting to work when public access is turned off.
2017-01-10 15:42:36 +00:00
James Allen d03aa7056e Rename /ranges/users end point to /changes/users 2017-01-10 13:43:53 +01:00
James Allen 4e128b6ab7 Send user data in /threads dat 2017-01-09 17:25:06 +01:00
James Allen 9379cff89d Add end point for accepting change in doc updater 2017-01-09 15:25:27 +01:00
James Allen 3a5d45fa32 Get user info via web, not chat 2017-01-06 13:41:58 +01:00
Shane Kilkelly 259c589076 Add option to restrict invites to existing user accounts. 2016-12-20 09:54:42 +00:00
Shane Kilkelly 822f76a883 Add unit tests for RedisWrapper 2016-12-19 15:12:22 +00:00
Shane Kilkelly d428f9adbc Make LoginRateLimiter a thin wrapper around RateLimiter 2016-12-19 14:10:51 +00:00
Shane Kilkelly ef0a5801d5 Create a RedisWrapper, and use it for rate limiting. 2016-12-19 12:17:02 +00:00
James Allen 988005e929 Send and get comments via the chat api 2016-12-16 16:42:41 +00:00
James Allen 293ba1fc4c Fetch all ranges from docstore when viewing overview panel 2016-12-09 15:43:08 +00:00
James Allen 1830d41eba Proxy ranges between doc updater and docstore 2016-12-08 14:09:06 +00:00
Henry Oswald e6eeb86046 add read property to announcments 2016-12-07 11:39:22 +00:00
Shane Kilkelly 58280bf6ee Merge branch 'master' into sk-user-delete-with-cancelled-sub 2016-12-06 09:31:42 +00:00
James Allen 48cc5a992f Merge branch 'master' into ja-set-version-in-docstore 2016-12-01 09:30:53 +00:00
Shane Kilkelly e03d16e0cd Deleting user: if subscription is already cancelled, ignore and proceed. 2016-11-30 16:03:18 +00:00
James Allen eb648b9bc8 Proxy version number to and from docstore 2016-11-29 17:16:56 +00:00
Shane Kilkelly a03ac8fe72 More robust session destruction after deleting user account. 2016-11-28 12:37:53 +00:00
Shane Kilkelly 52462d7020 Merge branch 'sk-sync-details-from-sso' 2016-11-28 10:11:59 +00:00
Shane Kilkelly 2ab5ad4230 If we're updating details from a SSO source, don't allow editing on settings page. 2016-11-25 14:38:00 +00:00
Shane Kilkelly 22101d0305 If user is sent to login page with explicit redirect, obey 2016-11-24 11:38:13 +00:00
Shane Kilkelly 8a4352fff2 Set redirect when redirecting from restricted 2016-11-22 16:54:03 +00:00
Shane Kilkelly 8089bb55a4 use session for the post-login redirect, remove redir query string. 2016-11-22 14:24:36 +00:00
Shane Kilkelly da1be67aff Merge branch 'sk-ext-auth-show-email' 2016-11-18 09:34:05 +00:00
Shane Kilkelly 6606375cd7 Remove dead code: SessionInvalidator 2016-11-17 15:27:58 +00:00
Shane Kilkelly 3b8fbe8249 If using external auth, show non-editable email field.
Also defend server-side against setting email when using external auth.
2016-11-17 14:34:02 +00:00
Henry Oswald d87067bc2f Merge branch 'announcments' 2016-11-15 10:38:01 +00:00
Henry Oswald 5a13ee1077 use anlaytis api
- don’t talk to postgres
- show recent blog post announcments
- proxy all events to analytics api
2016-11-11 17:03:09 +00:00
James Allen 593e59450b Use different UserSessions keys for cluster vs normal redis session store 2016-11-10 14:31:48 +00:00
Shane Kilkelly 5f3098df38 Replace multi-ops with Async.series, tests passing 2016-11-09 11:03:03 +00:00
Shane Kilkelly a373868862 Fix unit tests 2016-11-08 16:00:18 +00:00
Shane Kilkelly e7b09a81a7 Merge branch 'sk-passport-ldap' 2016-11-02 15:39:32 +00:00
Paulo Reis c5e793125e Update unit tests. 2016-11-01 16:55:26 +00:00
Shane Kilkelly 9cb3d8c4b8 Enable hook from module into passport init. 2016-11-01 14:06:54 +00:00
Shane Kilkelly 5c8cdd22cc Merge branch 'sk-account-delete-pass' 2016-10-28 11:02:41 +01:00
Shane Kilkelly 4c092e7ff1 Remove deprecated "projectSharedWithYou" email. 2016-10-28 10:37:10 +01:00
Shane Kilkelly 751a116921 add plainTextTemplate to all emails 2016-10-27 14:41:13 +01:00
Shane Kilkelly dc62b1a86e Remove deprecated endpoint for old delete-user 2016-10-26 11:18:36 +01:00
Shane Kilkelly a4167fcccd Unit tests for tryDeleteUser 2016-10-26 11:01:35 +01:00
Shane Kilkelly 6069d4dba3 Merge branch 'master' into sk-plans-tidy 2016-10-25 13:14:44 +01:00
Henry Oswald 1c3edcd627 added some debug lines 2016-10-24 23:36:49 +01:00
Shane Kilkelly d5a7514923 Add AB test for plans (+15 squashed commits)
Squashed commits:
[45c2237] Add a `subscription-form-switch-to-student` event
[1ad9b8f] change experiment name, and re-enable switch-to-student workflow
[f7cdb78] Remove debug
[4b9778a] Incorporate collaborator alternative plans
[701e80b] Add collaborator plans for heron and ibis
[287aa0f] AB test plans from editor page
[c74052e] Fix change-plan view for default plans
[1a947d6] Use correct plan codes
[1eecda7] Adjust prices
[69c4c7b] Introduce two plans
[8b8d5f8] Rename sixpack experiment
[c332002] Fix up the change-plan page
[c7af52d] Overhaul change-plan page, show only plans from current generation
[33d86bf] update plan
[5bbd946] Add a basic plans AB test
2016-10-21 16:17:37 +01:00
Henry Oswald adc6b429e6 record when a subscription is canceled 2016-10-10 15:29:54 +01:00
Shane Kilkelly 25dd998107 clear-sessions page (+4 squashed commits)
Squashed commits:
[3a56af0] Remove cruft
[c5a1f6c] Finalise alignment
[82f741a] Working sessions page
[d40f069] WIP: display sessions
2016-10-07 16:47:00 +01:00
Shane KilkellyandGitHub 95a66bbf00 Merge pull request #328 from sharelatex/sk-plain-text-email
Sk plain text email
2016-10-05 10:04:08 +01:00
Henry OswaldandGitHub 3141f91b59 Merge pull request #322 from sharelatex/ho-password-limits
Ho password limits
2016-10-05 10:03:54 +01:00
Shane Kilkelly e699fcb1fa Add plain-text component to the project-invite email 2016-10-03 15:25:38 +01:00
Shane Kilkelly dd14e51713 Handle null, undefined and false in isUserLoggedIn 2016-09-23 16:53:07 +01:00
Henry Oswald 8a2b7d0461 server side protect passwords which are too long 2016-09-23 16:51:46 +01:00
Shane Kilkelly 72ca1d6316 Merge branch 'master' into sk-passport
# Conflicts:
#	app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee
2016-09-23 10:01:11 +01:00