github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity
8152 commits 3 branches 7 tags 206 MiB
Commit graph

1628 commits

Author SHA1 Message Date
Ersun Warncke
e4e6a0fa1b add new tag methods 2018-09-03 10:40:28 -04:00
Tim Alby
3324796086 don't regard v1 teams as paid subscriptions 
- use `userHasV1Subscription` instead of `userHasV1SubscriptionOrTeam` in `LimitationsManager.userHasSubscriptionOrIsGroupMember `
- remove `userHasV1SubscriptionOrTeam`
- rename `LimitationsManager.userHasSubscriptionOrIsGroupMember` to `LimitationsManager.hasPaidSubscription`
- rename some variables for clarity
 2018-09-03 15:09:57 +01:00
James Allen
52381c8fb7 Merge pull request #851 from sharelatex/jel-remove-a-b-test 
Remove Plans and Pricing A/B Test
 2018-08-30 15:19:56 +01:00
Paulo Jorge Reis
cb4d4145a1 Merge pull request #855 from sharelatex/pr-v2-light-theme 
v2 light theme
 2018-08-30 11:24:52 +01:00
Ersun Warncke
9feb8ef39f Revert "Merge pull request #843 from sharelatex/ew-collabratec" 
This reverts commit 223beab491d2f8dcf4c7285267fda355cfce3f05, reversing
changes made to a726537c4372641bfca0eb37fc130ca3a932d433.
 2018-08-29 12:00:53 -04:00
Ersun Warncke
afc22dc5c2 Revert "Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy" 
This reverts commit ebefc2f28c6e88bbfa632f2b22cb8b99b75e95ec, reversing
changes made to 223beab491d2f8dcf4c7285267fda355cfce3f05.
 2018-08-29 12:00:20 -04:00
Ersun Warncke
e7eefc0474 Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy 
set options and method for request, pass cookies and form body
 2018-08-29 10:17:21 -04:00
Ersun Warncke
c1859f3e80 Merge pull request #843 from sharelatex/ew-collabratec 2018-08-29 10:17:02 -04:00
Jessica Lawshe
8889f2aed2 Remove Plans and Pricing A/B Test 
Remove all layouts, analytics events, and scope related to the A/B test.

The group modal from the default layout of the A/B test should be maintained though for v2.
 2018-08-28 12:42:09 -05:00
Paulo Reis
76fcee721e Update unit tests. 2018-08-28 14:24:05 +01:00
Paulo Reis
efc926ffc5 Load theme as a user setting; allow the user to change it; update tests. 2018-08-27 15:25:00 +01:00
Tim Alby
ef37902dfc check institution confirmation status 2018-08-27 15:45:31 +02:00
Hugh O'Brien
29253c5a93 Merge branch 'master' into hb-fetch-licences-graph 2018-08-23 16:11:43 +01:00
Tim Alby
753fb02c05 always return an array when getting affiliations 2018-08-23 15:15:53 +02:00
Paulo Jorge Reis
d838f8778a Merge pull request #832 from sharelatex/pr-change-free-history-limits 
Change history limits for free users
 2018-08-23 14:02:08 +01:00
Ersun Warncke
8f21ab7f10 add overleaf method 2018-08-22 13:44:40 -04:00
hugh-obrien
8d72fc78fc send licences graph request to v1 for data instead of analytics 2018-08-22 18:31:29 +01:00
Hugh O'Brien
eeadd1e9bb Merge pull request #797 from sharelatex/hb-inform-v1-affiliation-confirms 
Tell v1 confirmation status of affiliation emails
 2018-08-22 08:34:33 +01:00
Paulo Reis
54e0a7cfd2 Merge branch 'master' into pr-change-free-history-limits 2018-08-21 11:23:28 +01:00
Alasdair Smith
d99a42e678 Merge pull request #824 from sharelatex/as-redirect-sl-login-to-v2-login 
Allow for redirection of unlinked SL account to /user/login_to_ol_v2
 2018-08-21 10:13:52 +01:00
Paulo Reis
4dee3fd5e1 Update frontend unit tests. 2018-08-20 17:02:55 +01:00
Tim Alby
8d6505b518 log institutions API errors 2018-08-17 17:48:00 +02:00
Tim Alby
f5513f36ca add param to skip affiliation creation on user create 2018-08-17 17:48:00 +02:00
Alasdair Smith
9bc3fa2df0 Pass req to preDoPassportLogin module hook 2018-08-17 12:04:05 +01:00
hugh-obrien
96ffeef73d send fixed confirmed date to v1 for affiliations 2018-08-16 13:50:34 +01:00
hugh-obrien
55597b9279 inform v1 when confirming affiliation emails 2018-08-16 13:50:34 +01:00
Paulo Reis
713a39171a Fix history frontend tests. 2018-08-16 13:44:48 +01:00
Henry Oswald
5ed95694da Merge pull request #801 from sharelatex/ho-mailchimp 
Add non checked checkbox for newsletter subscription on signup and use mailchimp as newsletter provider.
 2018-08-16 11:40:39 +01:00
Brian Gough
c2828c8ca5 add unit tests 2018-08-13 10:53:43 +01:00
Tim Alby
197e7ce8ab refactor institutions getter 2018-08-10 13:40:25 +02:00
James Allen
69e8eddff0 Merge pull request #796 from sharelatex/pr-history-labels-ui 
History labels UI
 2018-08-09 10:50:28 +01:00
James Allen
9cbb51bbbc Merge pull request #793 from sharelatex/sk-sl-login-v2 
If we're creating v1 accounts, don't allow login for users already linked up
 2018-08-08 15:51:25 +01:00
Henry Oswald
687637eec7 change email address in newsletter when changing default email 
put mongo_id into mailchimp merge fields
 2018-08-08 13:50:03 +01:00
Henry Oswald
6cf1f71604 add newsletter checkbox to user register forms 2018-08-06 17:43:03 +01:00
Brian Gough
efcd3577ce avoid clobbering imported image names 2018-08-06 16:56:44 +01:00
Shane Kilkelly
05df55c89e Add a unit test for the preDoPassportLogin module hook. 2018-08-03 16:10:50 +01:00
Shane Kilkelly
d8c9a96619 If we're creating v1 accounts, don't allow login for users already linked up 2018-08-03 14:58:29 +01:00
Paulo Reis
80eeaaaaea Update web acceptance tests. 2018-08-02 17:19:16 +01:00
Hugh O'Brien
22b664da1a Merge pull request #792 from sharelatex/hb-fetch-export-zips 
Fetch export zips
 2018-08-02 13:50:11 +01:00
hugh-obrien
395406407e add test for export fetch zip 2018-07-30 19:39:35 +01:00
Ersun Warncke
426c391153 set options and method for request, pass cookies and form body 2018-07-27 10:43:03 -04:00
Michael Mazour
ddbe1a5b22 Add compiler and imageName to export API request 2018-07-27 15:42:37 +01:00
Tim Alby
66bcdbcac9 institution upgrade 2018-07-26 13:01:44 +02:00
Tim Alby
63c7f756ce refactor into InstitutionsAPI 2018-07-26 13:01:42 +02:00
James Allen
7dc82597e1 Merge pull request #765 from sharelatex/ja-update-email-in-v1 
Update email in v1 when setting as default in v2
 2018-07-26 10:58:57 +01:00
James Allen
f99b6b6f0a Merge pull request #746 from sharelatex/ta-refresh-features 
Refresh Features After Confirming Email
 2018-07-24 10:04:48 +01:00
James Allen
faf36f0265 Merge pull request #775 from sharelatex/revert-774-revert-750-hof-labels 
Add v2 history labels endpoints
 2018-07-24 10:04:13 +01:00
James Allen
5b989f0a8e Merge pull request #759 from sharelatex/sk-login-with-v1-credentials 
Login with v1 credentials
 2018-07-24 10:04:02 +01:00
Alberto Fernández-Capel
8fb9554c3f Revert "Revert "add v2 history labels endpoints"" 2018-07-20 15:36:03 +01:00
Alberto Fernández-Capel
f260f42466 Revert "add v2 history labels endpoints" 2018-07-20 12:39:01 +01:00
Alberto Fernández-Capel
da632c3117 Merge pull request #750 from sharelatex/hof-labels 
add v2 history labels endpoints
 2018-07-20 11:07:29 +01:00
Shane Kilkelly
c423672b55 Unit test for finishLogin 2018-07-18 12:08:34 +01:00
Shane Kilkelly
943bfe98aa Unit test for _loginAsyncHandlers 2018-07-18 11:13:42 +01:00
Shane Kilkelly
dae9506f84 Un-break unit tests 2018-07-18 09:57:05 +01:00
Alasdair Smith
62f69a4bcd Fix case sensitivity 2018-07-18 09:26:03 +01:00
Alasdair Smith
823e12e4a8 Fix tests to add new Features dependency 2018-07-18 09:26:03 +01:00
James Allen
c2777918fa Add some missing unit test mocks 2018-07-17 11:26:07 +01:00
James Allen
2c25cbaf25 Update error handling on backend 2018-07-17 11:12:09 +01:00
Alberto Fernández-Capel
e7738b851d Merge pull request #764 from sharelatex/afc-import-managers 
Import managers
 2018-07-17 10:10:51 +01:00
James Allen
ca97698724 Handle v1 response when email is already in use 2018-07-16 17:27:01 +01:00
Hayden Faulds
04bb83f3de add v2 history labels endpoints 2018-07-16 16:06:17 +01:00
Alberto Fernández Capel
66b492ba5f Use id to find subscription 
It's the new method signature.
 2018-07-16 14:42:41 +01:00
Alberto Fernández Capel
ae440f2ee6 Better variable name in test 
It should be a subscription id, instead of an admin id. The test passes
anyway because the db calls are mocked, but the wrong variable name
can cause confusion.
 2018-07-16 14:40:53 +01:00
James Allen
d0f77abc70 Update email in v1 when setting default in v2 2018-07-16 13:26:52 +01:00
James Allen
b150a7b4ae Merge pull request #735 from sharelatex/pr-affiliations-ui-adjustments 
Affiliations UI, second round
 2018-07-16 10:08:47 +01:00
Alberto Fernández Capel
0bf807fa9f Remove SubscriptionLocator.getManagedSubscription 
It was used as a kind of access control check, but it's clearer
if the check is in the only controller that actually needs it.
 2018-07-13 11:47:26 +01:00
James Allen
476f4e55c3 Just generate a new token on resending confirmation email 2018-07-13 10:42:31 +01:00
Alberto Fernández Capel
46a1cdc510 Use the admin_ids array to query for subscriptions 2018-07-13 09:38:58 +01:00
James Allen
33b28db061 Add backend endpoint for resending confirmation email 2018-07-12 16:39:04 +01:00
Alberto Fernández Capel
abcfa0b0d2 Store manager ids in an array 2018-07-12 16:35:27 +01:00
Tim Alby
35cb3924e2 refresh features after confirming email 2018-07-11 14:57:35 +02:00
Alberto Fernández Capel
3586fe8406 Update var name 2018-07-11 11:50:14 +01:00
Alberto Fernández Capel
4e8185d369 Use the id in methods that modify a subscription 
This will make it easier to allow a user to manage multiple
groups.
 2018-07-11 09:56:36 +01:00
Tim Alby
791dc0df5b check institution features on features update 2018-07-10 17:53:37 +02:00
James Allen
91079f3af2 Fix unit tests 2018-07-10 11:32:19 +01:00
James Allen
cb449f4b75 Delete a subscription on expiry, rather than set personal plan code 2018-07-10 10:31:25 +01:00
James Allen
7a1bb30952 Merge pull request #699 from sharelatex/ja-fix-bonus-feature-allocation 
Don't consider current features when assigning bonus
 2018-07-06 11:06:34 +01:00
Tim Alby
b78212290a handle dynamic Proxy URLs 2018-07-06 12:03:47 +02:00
Tim Alby
cfd5c65be4 add affiliation before confirming email 2018-07-05 16:02:55 +02:00
Tim Alby
9d4df4271a try adding affiliation on user creation 2018-07-05 16:01:15 +02:00
Tim Alby
3e1d61438f add endpoint to endorse affiliation 2018-07-05 15:59:36 +02:00
Timothée Alby
958012533d Merge pull request #724 from sharelatex/ta-parse-email 
parse email in UserUpdater
 2018-07-05 15:57:20 +02:00
Hugh O'Brien
a230b5efab Merge pull request #720 from sharelatex/mm-export-v1projectid 
Include project's and user's v1 ID in export requests
 2018-07-05 12:12:35 +01:00
Shane Kilkelly
0777e44abf Merge branch 'sk-linked-files-mendeley' 2018-07-04 12:16:39 +01:00
Shane Kilkelly
b32c9be8ca Linked files from Mendeley. 2018-07-04 10:05:03 +01:00
Tim Alby
3a541307b4 parse email in UserUpdater 2018-07-03 20:59:38 +02:00
Alberto Fernández-Capel
f1ef053caf Merge pull request #705 from sharelatex/afc-import-team-from-v1 
Changes to allow importing a team from v1
 2018-07-03 13:39:19 +01:00
Alberto Fernández-Capel
d904622b05 Merge pull request #695 from sharelatex/sk-fix-validation-on-refresh-output-file 
Fix validation of project-output-file, no build_id when imported from v1
 2018-07-03 13:38:59 +01:00
Michael Mazour
235534d269 Also include user's v1 ID in export requests 2018-07-03 10:15:51 +01:00
Douglas Lovell
260f927980 Merge pull request #719 from sharelatex/dcl-test-fix 
Small repair to SubscriptionController Test
 2018-07-02 13:16:10 -03:00
Paulo Reis
80b7641652 Update UserEmails acceptance tests to use the new POST-based email deletion endpoint. 2018-07-02 12:31:36 +01:00
Alasdair Smith
ec1dbc47bf Merge pull request #703 from sharelatex/as-cm-pos-assertion 
Add assertion method for CodeMirror Pos objects
 2018-07-02 11:35:26 +01:00
Michael Mazour
8436b67260 Include project's v1 ID in export requests 
If a project was imported from v1, include its v1 ID when making an export request back to v1.

Use case: v1 project exported via ScholarOne and then migrated to v2 needs to be linked up to its earlier v1 export records.
 2018-07-02 11:12:42 +01:00
Douglas Lovell
1df5b0b942 Fixup mixed indentation 2018-06-29 19:36:59 -03:00
Douglas Lovell
20835a79e2 Repair not logged in subscription controller test 2018-06-29 19:36:40 -03:00
Alberto Fernández Capel
18ded60619 Fix unit tests 2018-06-28 15:28:44 +01:00
Alberto Fernández Capel
193579070c Ensure features are updated for users but not for stubs 2018-06-28 13:25:04 +01:00
Tim Alby
fe0fdd11bf call v1 affiliation deletion endpoint with POST instead of DELETE 2018-06-28 13:48:28 +02:00
Tim Alby
1d80878bf8 delete affiliations on user deletion 2018-06-28 13:47:19 +02:00
Tim Alby
837f614df4 refactor affiliation requests 2018-06-28 13:47:16 +02:00
Alberto Fernández Capel
4366a0ea2c Remove trailing whitespace 2018-06-28 11:08:20 +01:00
Tim Alby
8c70ba88b7 Add missing greater-than character in tests 2018-06-28 10:15:55 +02:00
Alberto Fernández Capel
c19fc6d245 Fetch the whole user doc 
Other attributes are needed to calculate features.
 2018-06-27 12:52:47 +01:00
Alberto Fernández Capel
8b8742d60f Fix ReferalFeatures tests 2018-06-27 12:28:22 +01:00
Alasdair Smith
3a90a2d004 Add custom assertion method to chai for comparing CM Pos objects 2018-06-27 11:28:29 +01:00
James Allen
156c417df0 Don't consider current features when assignin bonus 2018-06-26 11:26:07 +01:00
Henry Oswald
c1a8d8b31a Merge branch 'master' into ho-clsi-double-backend 2018-06-25 13:43:40 +01:00
Tim Alby
c6de896bb5 decorate emails list with affiliation data 2018-06-25 13:47:04 +02:00
Tim Alby
c81f9c24ed mock affiliations API in acceptance tests 2018-06-25 13:45:46 +02:00
Tim Alby
e41391fb4a ignore affiliations if v1 is not configured 2018-06-25 13:45:46 +02:00
Tim Alby
d3b2a2650f add/remove affiliations when adding/removing emails 2018-06-25 13:45:46 +02:00
Shane Kilkelly
04be842b30 Fix validation of project-output-file, no build_id for imported v1 projects 2018-06-25 12:27:56 +01:00
Tim Alby
b65ba388ba replace OldAssetProxy 2018-06-25 12:36:51 +02:00
Shane Kilkelly
f6424ada40 Merge pull request #655 from sharelatex/sk-linked-files-output-redux 
Linked files from project output
 2018-06-25 10:28:29 +01:00
James Allen
0a2fe7e941 Merge pull request #687 from sharelatex/ja-fix-subscription-upsell 
Fix check for hasSubscription
 2018-06-22 15:59:51 +01:00
James Allen
0edd2b5fe7 Fix check for hasSubscription 2018-06-22 14:10:20 +01:00
Shane Kilkelly
d76c6c2c22 Merge pull request #682 from sharelatex/sk-copy-linked-file-data-on-clone 
Copy linkedFileData when cloning a project
 2018-06-22 13:22:45 +01:00
Shane Kilkelly
a8222f2e31 Fix tests after sync with master 2018-06-22 13:20:13 +01:00
Shane Kilkelly
ebe828aa62 Refactor, and remove the source_project_display_name prop from linkedFileData 2018-06-22 13:09:18 +01:00
Shane Kilkelly
6058f3ef9b Refactor the LinkedFiles/Agent system, and track build_id for output files 2018-06-22 13:09:18 +01:00
Shane Kilkelly
2ade78783b Add acceptance test for refreshing output file from v1 project 2018-06-22 13:09:18 +01:00
Shane Kilkelly
28257462ae Acceptance tests for project-output-file 2018-06-22 13:09:18 +01:00
Shane Kilkelly
fadbd72837 Add unit test for copying project with linked files 2018-06-22 10:52:49 +01:00
Alberto Fernández-Capel
d36dbfda07 Merge pull request #665 from sharelatex/afc-import-team-invites 
Add method to import invites
 2018-06-22 09:55:19 +01:00
Timothée Alby
caee25d85d Revert "Replace OldAssetsProxy" 2018-06-21 15:52:20 +02:00
Timothée Alby
c30cdf955b Merge pull request #666 from sharelatex/ta-smart-proxy 
Replace OldAssetsProxy
 2018-06-21 14:35:16 +02:00
James Allen
de45c08585 Restrict token look ups by id to not conflict with other tests 2018-06-21 11:00:25 +01:00
James Allen
46fbf0c641 Merge pull request #672 from sharelatex/ja-refactor-email-templating 
Refactor email templating
 2018-06-21 10:28:26 +01:00
James Allen
4608a59e3d Store OneTimeTokens in mongo rather than redis 2018-06-21 10:22:08 +01:00
James Allen
0dcbc5facb Send out confirmation emails on register and record confirmedAt date 2018-06-21 10:21:15 +01:00
Henry Oswald
5a7b8f4887 fix broken test for compile controller 2018-06-20 13:44:07 +01:00
Alasdair Smith
6c1994e25b Stub errors in tests to cache 2018-06-20 11:19:23 +01:00
Henry Oswald
e60157094b improve logging for 2 compile backends 2018-06-20 11:07:34 +01:00
Tim Alby
bbed5fca9a simplify proxy 2018-06-20 10:58:19 +02:00
Henry Oswald
b5581c4d40 Merge branch 'master' into ho-clsi-double-backend 2018-06-19 14:55:18 +01:00
Henry Oswald
ab0f258c03 don't make request to google cloud clsi if there is no url 2018-06-19 14:22:34 +01:00
Michael Mazour
0246631443 Add public API endpoints to reach CLSIs 
- `/api/clsi/compile/:submission_id`
- `/api/clsi/compile/:submission_id/build/:build_id/output/:file`

Also per review:
- DRY up ClsiManager.sendRequestOnce and ClsiManager.sendExternalRequest
- Include submission_id in a log message
- Don't include timeout in limits when getting file
 2018-06-19 12:04:02 +01:00
Tim Alby
3d272ca297 replace OldAssetProxy 2018-06-18 18:37:58 +02:00
Alberto Fernández Capel
81c102b501 Add method to import invites 2018-06-18 14:48:27 +01:00
Henry Oswald
5f8985811d mvp to send requests to 2 backends 2018-06-14 17:41:30 +01:00
Timothée Alby
55112dc7dc Merge pull request #648 from sharelatex/hb-export-status 
Export status endpoint
 2018-06-14 13:59:11 +02:00
Timothée Alby
984d81f5b8 Merge pull request #649 from sharelatex/ta-emails-endpoints 
Add Emails Endpoints
 2018-06-14 13:59:00 +02:00
hugh-obrien
0321780eba adding tests for exports status checker 2018-06-14 09:44:05 +01:00
James Allen
c60b74a2b1 Merge pull request #652 from sharelatex/ja-fix-front-end-test 
Fix frontend HistoryV2ManagerTests
 2018-06-14 09:11:32 +01:00
James Allen
82c6d9b293 Merge pull request #629 from sharelatex/ja-display-subscriptions 
Link subscriptions to v1
 2018-06-13 13:55:57 +01:00
Shane Kilkelly
3baf0836bc Support project-linked-files originating from imported v1 projects 2018-06-13 10:02:54 +01:00
James Allen
6e2ec2f982 Update remaining unit tests 2018-06-12 13:52:47 +01:00
James Allen
28f51cd4b4 Update SubscriptionController unit tests 2018-06-12 13:52:47 +01:00
James Allen
606419476f Update LimitationsManager unit tests 2018-06-12 13:52:47 +01:00
James Allen
f7532e5854 Merge pull request #619 from sharelatex/afc-email-tokens 
Use emails with tokens for team invites
 2018-06-12 08:30:23 +01:00
James Allen
d4efdb3ede Fix frontend HistoryV2ManagerTests 2018-06-11 15:47:23 +01:00
James Allen
155102df64 Use Error classes, and ensure invited_emails is cleared on new invite 2018-06-11 14:20:35 +01:00
Tim Alby
97c145433e use EmailHelper.parseEmail on registration 
Also changed EmailHelper to use the regexp already used in
UserRegistrationHandler rather than the `mimelib` package as it is
deprecated.
 2018-06-11 12:31:18 +02:00
Tim Alby
e614ed9248 add emails endpoints 2018-06-11 10:35:23 +02:00
Tim Alby
5438a565b9 use multiple emails when relevant 2018-06-08 17:53:45 +02:00
Tim Alby
31827ae6b5 add emails attribute on user creation 2018-06-08 17:53:45 +02:00
Jessica Lawshe
d57660aeb5 Merge pull request #632 from sharelatex/jel-plans-pricing-fix 
Plans and Pricing fixes
 2018-06-08 07:17:28 -05:00
Alberto Fernández Capel
59688efb56 Merge remote-tracking branch 'origin/master' into afc-email-tokens 2018-06-08 12:21:17 +01:00
Alberto Fernández Capel
57775e60b1 Merge remote-tracking branch 'origin/master' into afc-update-user-references 2018-06-08 11:28:58 +01:00
Alberto Fernández Capel
c45b4463bb Fix unit test 2018-06-08 10:05:26 +01:00
Alberto Fernández Capel
5159f6f33d Check the subscription is in a group plan before adding new members 2018-06-08 09:58:51 +01:00
Timothée Alby
7cdcd725fd Revert "Use Multiple Emails" 2018-06-07 18:44:59 +02:00
Jessica Lawshe
484ee9ad61 Should not AB test when signed up before 2018-06-06 2018-06-07 10:30:21 -05:00
Alberto Fernández Capel
a3bb99d755 Honour invited_emails for the team being 
We'll remove them soon, but we want to keep them for a while so
recent invites can join their teams.
 2018-06-07 16:22:38 +01:00
Alberto Fernández Capel
670f24ef6f Simplify method name 2018-06-07 16:12:02 +01:00
Hugh O'Brien
6f5c777163 Merge pull request #622 from sharelatex/hb-take-emis-names-as-input 
Take user entered first and last names for EMIS
 2018-06-07 15:52:33 +01:00
Timothée Alby
f422b7242d Merge pull request #603 from sharelatex/ta-use-multi-emails 
Use Multiple Emails
 2018-06-07 15:40:43 +02:00
James Allen
c2ef93b212 Merge pull request #610 from sharelatex/ja-sync-from-v2 
Tell v1 when refreshing features in v2
 2018-06-07 13:30:34 +01:00
Alberto Fernández Capel
959db80177 Check all emails to prevent invite duplicates 2018-06-07 12:49:46 +01:00
Alberto Fernández Capel
566c41cafd Merge remote-tracking branch 'origin/master' into afc-email-tokens 2018-06-07 11:40:03 +01:00
Alberto Fernández Capel
1fc047d08e Fix invitation resend 2018-06-06 17:11:25 +01:00
Alberto Fernández Capel
553878064b Resend email if the user has already been invited 2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
e753ef3af5 Invite users in the invited_emails array 
We'll remove that attribute soon, but for the time being we want
users to still be able to join the team.
 2018-06-06 15:36:53 +01:00
Tim Alby
7726314e7c add test to explicitely check filter 2018-06-06 15:45:12 +02:00
Tim Alby
e4da748257 add filter to query on emails attribute 2018-06-06 14:52:09 +02:00
Tim Alby
813289f5de use multiple emails when relevant 2018-06-06 11:45:01 +02:00
Tim Alby
c5530163f5 add emails attribute on user creation 2018-06-06 11:45:01 +02:00
Alberto Fernández Capel
6fb6119ca8 Merge remote-tracking branch 'origin' into afc-email-tokens 2018-06-05 15:42:17 +01:00
Tim Alby
613c9193e3 implement multi emails logic 2018-06-05 16:42:12 +02:00
Jessica Lawshe
b63384cbf1 Merge pull request #537 from sharelatex/jel-pricing-plans 
Plans and pricing variant
 2018-06-05 09:30:43 -05:00
Hayden Faulds
0bb37d4991 move tk call to before sandboxed module call 2018-06-05 13:42:26 +01:00
Jessica Lawshe
8b672dea0d Add unit tests 2018-06-04 14:42:26 -05:00
hugh-obrien
54ce196500 test custom first and last name for exports 2018-06-04 13:16:21 +01:00
hugh-obrien
b02eea1e7e update tests for exports name options 2018-06-04 13:16:21 +01:00
Alberto Fernández Capel
58c4e72b2a Update references to UserLocator 
UserLocator was refactored in another branch: UserLocator -> UserGetter
 2018-06-01 16:53:16 +01:00
Alberto Fernández Capel
25d7196570 Merge remote-tracking branch 'origin/master' into afc-email-tokens 2018-06-01 16:49:47 +01:00
Alberto Fernández Capel
7fcdf68296 Remove dead code 2018-06-01 16:05:44 +01:00
Alberto Fernández Capel
3bd18715db Add some tests 2018-06-01 15:37:09 +01:00
Hugh O'Brien
a79c9b94a8 Merge pull request #613 from sharelatex/hb-extract-v1-templates-to-web 
Extract v1 templates code to web
 2018-06-01 11:29:36 +01:00
Alberto Fernández Capel
9b18e58b68 Choose a better method name 
This method is now only notifying users about a potential domain
licence
 2018-06-01 11:28:06 +01:00
Alberto Fernández Capel
385fec1914 Clean up code that uses invited_emails 2018-06-01 11:23:25 +01:00
hugh-obrien
d47e845367 add v1 template tests 2018-05-31 13:26:54 +01:00
Shane Kilkelly
d3ae276091 Merge pull request #579 from sharelatex/sk-linked-files-from-project 
Linked Files from Project
 2018-05-31 11:08:08 +01:00
James Allen
c5b553d4a6 Notify v1 by default 2018-05-29 17:31:15 +01:00
James Allen
301ae80f99 Allow refreshFeatures to notify v1 to update its features 2018-05-29 17:21:42 +01:00
Alberto Fernández Capel
b52fbdbfa4 Unit test SubscriptionGroupHandler.replaceUserReferencesInGroups 2018-05-29 15:37:04 +01:00
Shane Kilkelly
14898acd7f Update linked-file acceptance tests 2018-05-29 10:40:38 +01:00
Tim Alby
5fbe5c5537 remove UserLocator 
Use UserGetter instead
 2018-05-28 14:11:13 +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
Tim Alby
5a590aa021 remove getUserOrCreateHoldingAccount function 
The function is deprecated
 2018-05-28 14:09:13 +02:00
Shane Kilkelly
0cb5beb689 Merge branch 'master' into sk-linked-files-from-project 2018-05-24 13:47:28 +01:00
Alasdair Smith
81fdca91c1 Fix failing test 2018-05-24 10:27:36 +01:00
Shane Kilkelly
3181f624a7 Remove obsolete auth check 2018-05-24 10:22:17 +01:00
Shane Kilkelly
78f87c0ecf Add acceptance test for the project-list and project-entities endpoints 2018-05-23 15:02:45 +01:00
Shane Kilkelly
4daf062be9 Add unit test for ProjectController.projectEntitiesJson 2018-05-22 16:40:39 +01:00
Shane Kilkelly
b1c1cdecef Add unit test for ProjectController.userProjectsJson 2018-05-22 16:17:59 +01:00
Shane Kilkelly
bc5769cd73 Stub out the ProjectEntityHandler in ProjectController tests 2018-05-22 15:56:01 +01:00
Shane Kilkelly
691eec48ba Merge branch 'master' into sk-linked-files-from-project 2018-05-22 15:39:09 +01:00
Shane Kilkelly
e34131ed45 Add acceptance test for project linked files 2018-05-22 15:01:51 +01:00
James Allen
701a803da7 Fix ProjectInvite tests since the user no longer had the features 2018-05-22 10:19:47 +01:00
James Allen
1d0be569a6 Fix SubscriptionUpdater -> FeaturesUpdater miscall 2018-05-22 10:05:08 +01:00
James Allen
50bd60dd51 Split FeaturesUpdater out of SubscriptionUpdater 2018-05-22 10:05:08 +01:00
James Allen
0830c473ad Update unit tests and refactor to make more testable 2018-05-22 10:05:08 +01:00
James Allen
b1f378208d Properly merge subscriptions from different places 2018-05-22 10:05:08 +01:00
Alasdair Smith
5b3fbe47db Merge pull request #528 from sharelatex/as-cm-spelling 
Rich text spelling
 2018-05-21 11:50:30 +01:00
Hugh O'Brien
346f37011f Merge pull request #546 from sharelatex/ns-allow-latexmkrc 
Allow for latexmkrc files in project zip upload
 2018-05-21 09:03:40 +01:00
Alasdair Smith
681e67ecea Be more consistent with naming 2018-05-18 11:29:27 +01:00
Alasdair Smith
9c56f6c2fc Add init test for SpellCheckManager 2018-05-18 11:29:27 +01:00
Michael Mazour
3922b8b916 Add project export acceptance tests 
- Add acceptance tests
- Add `MockV1Api` helper
- Add flush endpoint to `MockProjectHistoryApi` helper
 2018-05-16 14:58:34 +01:00
Michael Mazour
e34dd90a1f Add project export route and controller 2018-05-16 14:58:34 +01:00
Michael Mazour
a661084485 Add ExportsHander for project exports performed via v1 2018-05-16 14:58:34 +01:00
Shane Kilkelly
06c0b45ef7 Merge branch 'master' into sk-fix-references-full-index 2018-05-14 13:45:12 +01:00
Shane Kilkelly
43d00a2e5f Account for the new referencesSearch flag when deciding to do fullIndex 2018-05-14 11:31:59 +01:00
Nate Stemen
d108b11bc0 Add latexmkrc in FileTypeManager 2018-05-10 16:59:58 -04:00
Hayden Faulds
9ccdf073c4 accept attributes rather than projectHistoryId to ProjectCreationHandler 2018-05-10 11:39:23 +01:00
Brian Gough
1278e2da45 fix project structure version when deleting folder 2018-05-08 13:37:33 +01:00
Brian Gough
afd4a10a19 retry lock with exponential backoff 2018-05-04 15:02:36 +01:00
Brian Gough
e414100c41 add support for unique lock values 2018-05-04 13:22:33 +01:00
James Allen
40da785363 Fix test for sampling front users 2018-05-01 09:02:43 +01:00
James Allen
6399621d1f Show front widget for paid and sampled free users 2018-04-30 17:13:57 +01:00
Jessica Lawshe
820f9c7acc Merge pull request #506 from sharelatex/as-document-event-emitter 
Add documentation and tests of EventEmitter implementation
 2018-04-23 11:33:40 -05:00
Alasdair Smith
152c816b5c Add documentation and tests of EventEmitter implementation 2018-04-23 11:01:19 +01:00
Alasdair Smith
ad1df3532f Merge pull request #490 from sharelatex/hof-deleted-project-history 
Pass project history id with updates
 2018-04-23 10:05:07 +01:00
Alasdair Smith
61648e1f19 Merge pull request #497 from sharelatex/as-naming-consistency 
Include snake_case named file in frontend tests
 2018-04-23 10:03:54 +01:00
Alasdair Smith
d524249fc8 Include snake_case named tests 2018-04-17 15:03:52 +01:00
James Allen
37f009c3cd Remove blank test causing race condition 2018-04-17 10:00:06 +01:00
James Allen
d6605610f5 Fix HistoryV2Manager front end tests 2018-04-16 16:31:49 +01:00
James Allen
d1b68ddf7c Fix RestoreManager unit tests 2018-04-16 16:27:24 +01:00
James Allen
9e525702c1 Merge branch 'master' into ja-restore-files 2018-04-16 16:14:31 +01:00
Hayden Faulds
7755a7cc1f add overleaf to projections for project structure updates 2018-04-13 13:45:07 +01:00
Hayden Faulds
3006d018d9 send projectHistoryId with project structure updates 2018-04-13 13:45:03 +01:00
Hayden Faulds
e5f3c472e3 return projectHistoryId in DocumentController.getDoc 2018-04-13 13:45:02 +01:00
Alberto Fernández Capel
1b8f4bff2f Ensure dump folder exists before running LinkedFiles tests 
The folder is also created in another test, so it will work the second
time the tests are executed, but it fails the first time.
 2018-04-12 10:29:24 -05:00
Hayden Faulds
50686090c8 push doc pathname logic into DocController 2018-04-12 16:16:44 +01:00
Brian Gough
882b555433 create new file on replace 2018-04-09 12:05:08 +01:00
Brian Gough
baec4eb195 move uploads outside the lock 2018-04-09 12:05:07 +01:00
James Allen
2c0bd94fa7 Use mkdirp when restoring a file if the folder doesn't exist 2018-04-06 15:20:51 +01:00
James Allen
1e8439a2c6 Fix restore of docs from old deleted docs 2018-04-06 10:30:13 +01:00
James Allen
b4fa47d664 Add unit tests for RestoreManager 2018-04-06 10:30:13 +01:00
James Allen
0a1c543841 Hook up front end to restore documents 2018-04-06 10:30:13 +01:00