Commit graph

6575 commits

Author SHA1 Message Date
Shane Kilkelly
4552f3be67 Move the getPublicAccessLevel helper to top-level of module 2017-09-28 10:53:35 +01:00
Shane Kilkelly
27dcf6c4c5 Fix a typo causing double-callbacks 2017-09-28 10:37:57 +01:00
Shane Kilkelly
574b115022 Working token-based access 2017-09-27 14:01:52 +01:00
Brian Gough
13628f82ec Merge pull request #17 from sharelatex/bg-lock-compiles
show error for compile in progress
2017-09-27 13:54:16 +01:00
Hayden Faulds
96a129a860 show user.name in history if available 2017-09-27 10:54:06 +01:00
James Allen
63097aaf73 Merge pull request #24 from sharelatex/ja-dockerize-acceptance-tests
Set up acceptance tests to run in docker container; Fixes overleaf/sharelatex#138
2017-09-27 11:01:49 +02:00
James Allen
23bd840796 Fix MockDocStoreApi name 2017-09-27 10:53:00 +02:00
James Allen
ffc35d9d65 Include docker command directly because node isn't available in Jenkins 2017-09-27 10:50:34 +02:00
James Allen
1502da85cf Set up acceptance tests to run in docker container 2017-09-27 10:37:20 +02:00
Hayden Faulds
02d54d815f Merge pull request #16 from sharelatex/as-prevent-hidden-autocompile
Prevent autocompile if PDF preview hidden
2017-09-26 15:38:31 +01:00
Hayden Faulds
a9b18e4435 Merge pull request #10 from sharelatex/hof-history-apis
Add User and Project endpoints by overleaf ids
2017-09-26 15:37:32 +01:00
Paulo Reis
1b6829eed6 Style the project list table. 2017-09-26 13:49:46 +01:00
Hayden Faulds
4adf88ca01 handle OL or SL ids in UserInfoController.getPersonalInfo 2017-09-26 11:40:05 +01:00
Hayden Faulds
2c0e9bb89a return overleaf details from ProejctsDetailsHandler.getdetails 2017-09-26 10:19:30 +01:00
Brian Gough
0f855689a7 show error for compile in progress 2017-09-26 08:07:35 +01:00
Paulo Reis
f6e236afa6 Link typography. 2017-09-25 17:12:31 +01:00
Paulo Reis
465de8701b Use a different strategy to achieve rounded buttons (less impact on other elements). 2017-09-25 16:56:22 +01:00
Paulo Reis
08e0865870 Customize dashboard sidebar. 2017-09-25 16:41:09 +01:00
Alasdair Smith
5b3c9f4033 Prevent autocompile if pdf preview is hidden 2017-09-25 15:46:43 +01:00
Alasdair Smith
e31464b47d Keep track of pdf layout hidden state 2017-09-25 15:46:29 +01:00
Paulo Reis
66654e4a14 Customize buttons; make button borders configurable. 2017-09-25 15:40:44 +01:00
Paulo Reis
e68b367f3f Common variables; refactor some Bootstrap hard-coded stuff into new variables. 2017-09-25 11:48:42 +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
96d13215e3 Be more defensive when checking encoded text 2017-09-22 09:36:50 +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
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