Commit Graph
25726 Commits
Author SHA1 Message Date
Brian Gough 8685b774ee fix unit tests for use of fs-extra 2017-09-25 15:28:31 +01:00
Paulo Reis e68b367f3f Common variables; refactor some Bootstrap hard-coded stuff into new variables. 2017-09-25 11:48:42 +01:00
Brian Gough 7f0e6f3eec lock compile directory 2017-09-22 16:19:33 +01:00
Shane Kilkelly ee32648bf4 Order privileges by highest-to-lowest 2017-09-22 15:55:38 +01:00
Shane Kilkelly 81170d472d Add token-access routes 2017-09-22 14:54:35 +01:00
Alasdair Smith 2d3bae2f7b Merge pull request #9 from sharelatex/as-decode-ranges
Decode comments & track changes from real-time
2017-09-22 13:50:37 +01:00
Alasdair Smith c1b5e1d04c Merge pull request #19 from sharelatex/as-fix-tests
Fix joinDoc tests & add encoding tests
2017-09-22 11:09:33 +01:00
Alasdair Smith 6470577c3f Add acceptance tests for joinDoc variadic 2017-09-22 11:01:11 +01:00
Alasdair Smith 785d6e2eea Add tests for comment & change encoding 2017-09-22 10:56:08 +01:00
Alasdair Smith b8d3f34e54 Fix joinDoc tests not passing options arg and restructure tests 2017-09-22 10:56:08 +01:00
Alasdair Smith ed252db25e Merge pull request #18 from sharelatex/as-encode-ranges
Encoding changes & comments in ranges
2017-09-22 09:48:42 +01:00
Alasdair Smith 96d13215e3 Be more defensive when checking encoded text 2017-09-22 09:36:50 +01:00
Alasdair Smith a0505afb23 Be defensive on comment text 2017-09-22 09:34:10 +01:00
Alasdair Smith c67150ea10 Ensure falsy value doesn't fail conditional 2017-09-22 09:33:29 +01:00
Alasdair Smith 937bf82a2f Return callback with guard 2017-09-22 09:25:24 +01:00
Alasdair Smith 5d8e201732 Don't return obj 2017-09-21 16:58:03 +01:00
Alasdair Smith a299d7335d Fix incorrect var 2017-09-21 16:56:18 +01:00
Alasdair Smith 90d05dc6dd Make args order consistent 2017-09-21 16:56:09 +01:00
Alasdair Smith 3966e2f85b Make variadic options more explicit 2017-09-21 16:55:49 +01:00
Alasdair Smith f8d4923547 Wrap in try/catch 2017-09-21 15:41:24 +01:00
Alasdair Smith 42b604dcda Clean up decoding from websockets 2017-09-21 15:41:24 +01:00
Alasdair Smith a022f83cce Fix order of args 2017-09-21 15:22:56 +01:00
Alasdair Smith 790b9ea8ed Switch order of args 2017-09-21 15:19:19 +01:00
Alasdair Smith 55c880e1dd DRY up a bit 2017-09-21 15:07:15 +01:00
Shane Kilkelly 95292a2e55 Add unique index to token properties 2017-09-21 15:06:42 +01:00
Shane Kilkelly 441c207953 Generate tokens by default 2017-09-21 15:04:15 +01:00
Shane Kilkelly 562b2db600 Fix unit test 2017-09-21 15:01:40 +01:00
Alasdair Smith b796879c9f Handle options not being passed 2017-09-21 14:58:49 +01:00
Alasdair Smith e2bb6dcecb Pass option to encode range
To ensure backwards compat with clients not refreshing, pass a flag to enable
encoding.  This way, old client won't receive encoded ranges, but also won't
have decoding logic. The flag can then be removed once all clients are up to
date
2017-09-21 14:23:39 +01:00
Alasdair Smith aa6e0d0d69 Only encode ranges if option passed 2017-09-21 14:23:16 +01:00
Shane Kilkelly abe41b6948 Fix projection in project query 2017-09-21 13:37:10 +01:00
Alasdair Smith b33929fa83 DRY up 2017-09-21 13:36:31 +01:00
Alasdair Smith 9f503f1e9f First pass at encoding changes & comments in ranges 2017-09-21 13:25:55 +01:00
Alasdair Smith 24f44889a7 First pass at decoding changes & comments in ranges 2017-09-21 13:25:19 +01:00
Shane Kilkelly 7dc759482c Fix how adding user to project works in acceptance tests 2017-09-21 11:43:16 +01:00
Joe Green afc51482c1 Merge pull request #17 from sharelatex/jg-realtime-acceptance-tests
realtime acceptance tests
2017-09-21 11:22:32 +01:00
Joe Green dc8f4ffc2a Update Jenkinsfile 2017-09-21 11:03:07 +01:00
Shane Kilkelly 863d327743 Change logic to exclude token users 2017-09-21 11:02:55 +01:00
Joe Green 0b41d32cbb Update Jenkinsfile 2017-09-21 10:59:41 +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 91ec0da239 Use the invitedMembers function for sending tpds updates 2017-09-20 15:48:20 +01:00
Joe Green dbef5904be use correct node version in jenkinsfile 2017-09-20 15:46:48 +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 fc202439ab Read-only privelege for anonymous access 2017-09-20 09:36:06 +01:00
Shane Kilkelly 06966f67db Differentiate project members by source, include token members 2017-09-20 09:35:19 +01:00