Commit graph

5399 commits

Author SHA1 Message Date
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
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
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
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
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
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
91ec0da239 Use the invitedMembers function for sending tpds updates 2017-09-20 15:48:20 +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
Shane Kilkelly
a06f4b6b28 Remove remaining traces of UserStub 2017-09-19 16:16:39 +01:00
Alasdair Smith
e2547e0051 Merge pull request #6 from sharelatex/as-fix-autocompile-setting
Send JSON in autocompile setting event payload
2017-09-19 15:57:33 +01:00
Shane Kilkelly
7919d5342b Remove obsolete add-email-to-project workflow 2017-09-19 15:57:19 +01:00
Alasdair Smith
4007fc682b Send JSON in autocompile setting event payload 2017-09-19 15:55:00 +01:00
Alasdair Smith
66bed67270 Merge pull request #4 from sharelatex/as-client-auto-compile
Client-side auto compile
2017-09-19 15:20:07 +01:00
Alasdair Smith
963a14b33c Fix incorrectly named var and remove unneccessary semicolon 2017-09-19 14:25:30 +01:00
Shane Kilkelly
c87df7be79 Add token-access user refs to Project 2017-09-19 09:27:22 +01:00
James Allen
8852e09274 Merge pull request #1 from sharelatex/jpallen-patch-1
Delete cleanup.js
2017-09-18 14:30:04 +02:00
James Allen
5a7e4f9fb0 Merge pull request #3 from sharelatex/ja-oss-sync
Push master branch to public repo after successful build
2017-09-18 14:15:33 +02:00
Shane Kilkelly
8fece2d5f0 Add tokenBased access level 2017-09-18 10:58:13 +01:00
James Allen
d0ce22b0f8 Add in overleaf-integration module to build 2017-09-18 11:30:43 +02:00
Shane Kilkelly
2011432120 Add tokens property to Project model 2017-09-18 10:27:28 +01:00
James Allen
ece7a4cbb7 Merge pull request #601 from sharelatex/ns-raise-safari-regex-count
Raising the limit on safari regex count
2017-09-18 11:16:49 +02:00
James Allen
1bafba8992 Merge pull request #586 from sharelatex/ns-add-SL-command-data
adding commands that appear in top 100 from SL-CLSI analysis
2017-09-18 11:16:41 +02:00
James Allen
fa13e1051a Merge pull request #585 from sharelatex/sk-ac-refactor-autocompletemanager
Refactor out common code in AutocompleteManager.
2017-09-18 11:16:29 +02:00
James Allen
a0ac11eb0d Actually push to master branch 2017-09-18 11:11:33 +02:00
James Allen
f0092bc85a Push master branch to public repo after successful build
Note that this has to happen outside of the docker container to
work around issues with git and user ids, so we've had to
modify the pipeline to explicitly run the steps inside docker
as needed.
2017-09-18 11:10:22 +02:00
Henry Oswald
a7217f1d37 Merge branch 'ho-csrf-acceptence-tests' 2017-09-15 13:50:17 +01:00
James Allen
adf211a226 Merge pull request #594 from sharelatex/ja-include-token-in-project-schema
Include OL tokens in project schema
2017-09-15 11:41:24 +02:00
Brian Gough
1bca1e11a9 fix broken unit test 2017-09-15 09:20:53 +01:00
Brian Gough
9f9c15f6f5 Merge pull request #599 from sharelatex/bg-reset-project-state
clear docupdater project state in deleteAuxFiles
2017-09-15 09:09:29 +01:00
James Allen
a0e25386fc Delete cleanup.js 2017-09-14 17:00:44 +02:00
Brian Gough
28a80cf23d Merge pull request #604 from sharelatex/bg-fix-root-doc-in-incremental-compile
fix root doc in incremental compile
2017-09-13 13:47:22 +01:00
Brian Gough
046c0b856d Merge pull request #605 from sharelatex/ta-remove-extra-headers
Remove extra security headers
2017-09-13 11:07:36 +01:00
Tim Alby
a04adbf132 remove extra security headers 2017-09-13 11:53:11 +02:00
Brian Gough
51eb94a493 handle incremental compile without root doc 2017-09-13 10:10:44 +01:00
Shane Kilkelly
c623fa9f3f Merge pull request #603 from sharelatex/sk-pin-chai-dependency
Pin chai version
2017-09-12 11:40:12 +01:00
Brian Gough
0e87b8950e update clearProjectState endpoint 2017-09-12 11:40:00 +01:00