nate stemen
5aac144d5b
Merge pull request #1650 from sharelatex/ns-toggle-captchas
...
allow toggling of captchas via setting
GitOrigin-RevId: 09decba22f6b7b4e97b04a57534a2797e10940c4
2019-04-08 13:53:54 +00:00
Shane Kilkelly
a51fefae6c
Merge pull request #1630 from sharelatex/as-allow-deleted-inviter-import
...
Allow deleted v1 user when importing project invite inviter
GitOrigin-RevId: be8fc8f09452b72128592f9c00859aaa0b535c3d
2019-03-22 10:27:45 +00:00
Simon Detheridge
3553fb2d9d
Merge pull request #1581 from sharelatex/spd-wearing-middle
...
Fix spelling of "middleware"
GitOrigin-RevId: d2b2b20ad8a6871cd6366303e75b340f0f2f2dda
2019-03-11 11:05:12 +00:00
Simon Detheridge
4360a55fdc
Merge pull request #1383 from sharelatex/spd-rate-limits
...
Add rate limits to email-related endpoints
GitOrigin-RevId: 05a8b40eb65a55aba35788e2401e6988b672b389
2019-01-11 14:43:29 +00:00
Tim Alby
5438a565b9
use multiple emails when relevant
2018-06-08 17:53:45 +02:00
Timothée Alby
7cdcd725fd
Revert "Use Multiple Emails"
2018-06-07 18:44:59 +02:00
Tim Alby
813289f5de
use multiple emails when relevant
2018-06-06 11:45:01 +02:00
Tim Alby
bbaca91e57
add UserGetter#getUserByMainEmail
...
Use only that method to find users by email.
2018-05-28 14:11:09 +02:00
Hayden Faulds
304a6bc332
use ProjectGetter rather than Project directly
2018-02-16 08:55:09 +00:00
Henry Oswald
696e9d27d6
send invalid_email error type down when sharing project
2018-02-08 10:35:18 +00:00
James Allen
53dc8cddfc
Refactor captcha into middleware and angular service
2017-12-11 12:58:55 +00:00
James Allen
83086e4a79
Add recaptch to share endpoint
2017-12-11 11:57:59 +00:00
Shane Kilkelly
1cedfed1e4
Merge branch 'master' into sk-unlisted-projects
2017-11-02 10:10:09 +00:00
Shane Kilkelly
8561b69ee9
Remove tokenMembers sync to clients
2017-10-25 11:29:05 +01:00
Shane Kilkelly
74c231826d
WIP: track changes with token-access
2017-10-25 10:34:18 +01:00
Shane Kilkelly
d8717a06a2
Fix track-changes with token-access
2017-10-19 14:42:17 +01:00
Shane Kilkelly
dcf601fe80
Only show token-based projects if accessLevel is set to token-based
2017-10-12 15:47:29 +01:00
Shane Kilkelly
9a7c8c5842
Revert "Remove remaining traces of UserStub"
...
This reverts commit ab6b4c32254a20b940c489b8b5b56237433cc0f6.
2017-10-12 15:08:48 +01:00
Shane Kilkelly
16416463c6
Update removeUserFromProject to account for token-access
2017-10-12 11:49:02 +01:00
Shane Kilkelly
6e09165452
Refactor auth sources
2017-10-12 10:57:11 +01:00
Shane Kilkelly
d386f79a76
Clean up
2017-10-06 16:10:33 +01:00
Shane Kilkelly
91abb6eed6
If project is not tokenBased, don't count members of token arrays
2017-10-06 15:57:22 +01:00
James Allen
3c54419eb3
Remove commented debug code
2017-10-05 16:12:26 +01:00
James Allen
9c1faa4395
Add method to transfer projects from one user_id to another
2017-10-05 14:26:34 +01:00
Shane Kilkelly
ee32648bf4
Order privileges by highest-to-lowest
2017-09-22 15:55:38 +01:00
Shane Kilkelly
abe41b6948
Fix projection in project query
2017-09-21 13:37:10 +01:00
Shane Kilkelly
863d327743
Change logic to exclude token users
2017-09-21 11:02:55 +01:00
Shane Kilkelly
931ba56e33
Add an 'owner' source tag, for the project owner
2017-09-21 09:35:25 +01:00
Shane Kilkelly
ef7e1ceabf
Rename functions to make distinction between invited/token members
2017-09-21 09:30:38 +01:00
Shane Kilkelly
574baf386e
Alter getProjectsUserIsMemberOf to include token-access projects.
...
Also change the api to produce an object with the different project lists
attached, rather than a pair of lists.
2017-09-20 15:26:03 +01:00
Shane Kilkelly
ceb7c509d0
Rename getProjectsUserIsCollaboratorOf to ...IsMemberOf
...
This brings the naming more in line with current conventions.
2017-09-20 13:16:50 +01:00
Shane Kilkelly
069f49d5a6
Change getCollaboratorCount to getInvitedCollaboratorCount.
...
And update the one call-site in LimitationsManager. This function
is used to limit invites, so it makes sense to explicitely limit
this to Invited members of the project.
2017-09-20 10:29:47 +01:00
Shane Kilkelly
8460160076
Add a getInvitedMembersWithPrivilegeLevels function.
...
Then use it to build the loadProject view-model.
2017-09-20 10:02:43 +01:00
Shane Kilkelly
cf54989e6a
Add a getInvitedMemberIds function
...
Limited to only members who were invited to the project, not users
who have access via a token.
2017-09-20 09:36:56 +01:00
Shane Kilkelly
06966f67db
Differentiate project members by source, include token members
2017-09-20 09:35:19 +01:00
Shane Kilkelly
a06f4b6b28
Remove remaining traces of UserStub
2017-09-19 16:16:39 +01:00
Shane Kilkelly
7919d5342b
Remove obsolete add-email-to-project workflow
2017-09-19 15:57:19 +01:00
Shane Kilkelly
3d0268a486
Add other required properties for project load.
2017-09-01 11:36:23 +01:00
Shane Kilkelly
68f860b28d
Load user features alongside id and email.
...
Fixes a bug where project features were not applied properly,
and instead fell back to the free-account defaults.
2017-09-01 11:16:45 +01:00
James Allen
d5839437fd
Add in UserStub model and support in collaborators view
2017-08-24 17:48:47 +02:00
James Allen
b086d7afa2
Refactor rate limiting code around sending invites
2017-01-27 16:26:58 +01:00
Henry Oswald
74240e28c7
rate limit via ip the number of invite to project requests
2017-01-21 12:44:09 +00:00
Henry Oswald
6d35585847
limit number of invites each user can do
...
done with the number of collaborators a user can add
prevents notifications getting filled up as well
2017-01-21 12:43:15 +00:00
Shane Kilkelly
82ddeab2bd
If user tries to invite themselves to project, don't.
2017-01-16 13:45:01 +00:00
Henry Oswald
fed88504f8
rate limit emails sent sharing projects by users
2017-01-14 14:52:32 +00:00
Shane Kilkelly
259c589076
Add option to restrict invites to existing user accounts.
2016-12-20 09:54:42 +00:00
Shane Kilkelly
4c092e7ff1
Remove deprecated "projectSharedWithYou" email.
2016-10-28 10:37:10 +01:00
Shane Kilkelly
b42a3b9188
Fix logging typo
2016-10-03 15:25:18 +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
James Allen
e15976be21
Use token in URL to force its precense when invite and allow easy dynamic notifications
2016-09-22 17:24:06 +01:00
