Commit Graph

171 Commits

Author SHA1 Message Date
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
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
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
James Allen d0f77abc70 Update email in v1 when setting default in v2 2018-07-16 13:26:52 +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
Tim Alby 791dc0df5b check institution features on features update 2018-07-10 17:53:37 +02: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
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
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
Paulo Reis 80b7641652 Update UserEmails acceptance tests to use the new POST-based email deletion endpoint. 2018-07-02 12:31:36 +01:00
James Allen 156c417df0 Don't consider current features when assignin bonus 2018-06-26 11:26:07 +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
Shane Kilkelly 04be842b30 Fix validation of project-output-file, no build_id for imported v1 projects 2018-06-25 12:27:56 +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
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
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
Shane Kilkelly 3baf0836bc Support project-linked-files originating from imported v1 projects 2018-06-13 10:02:54 +01:00
Tim Alby 31827ae6b5 add emails attribute on user creation 2018-06-08 17:53:45 +02:00
Timothée Alby 7cdcd725fd Revert "Use Multiple Emails" 2018-06-07 18:44:59 +02: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
Tim Alby c5530163f5 add emails attribute on user creation 2018-06-06 11:45:01 +02:00
Tim Alby 613c9193e3 implement multi emails logic 2018-06-05 16:42:12 +02: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
Shane Kilkelly 14898acd7f Update linked-file acceptance tests 2018-05-29 10:40:38 +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 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 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