Paulo Reis
b92dc98b99
Merge branch 'master' into pr-user-affilitations
2018-06-25 14:13:26 +01:00
Tim Alby
7a3fcf6d2c
change error message on email update failure
2018-06-25 13:47:22 +02:00
Tim Alby
c6de896bb5
decorate emails list with affiliation data
2018-06-25 13:47:04 +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
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
096d3f28a1
Move the handleError
function into the LinkedFilesController
2018-06-22 13:09:18 +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
dfb4898be5
Move getFileById
to the LinkedFilesHandler
module
2018-06-22 13:09:18 +01:00
Shane Kilkelly
c8012f2968
Cleaner import of errors
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
d93eb448e3
Move Clsi logic to ClsiManager
2018-06-22 13:09:18 +01:00
Shane Kilkelly
708e809df6
Use errors from ProjectFileAgent
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
a313184c71
Handle linked-output-files from v1 imports
2018-06-22 13:09:18 +01:00
Shane Kilkelly
48a4f6c4c4
Fix error handling for failing to get output file
2018-06-22 13:08:13 +01:00
Shane Kilkelly
87474ce060
Remove commentary
2018-06-22 13:08:13 +01:00
Shane Kilkelly
d4beba24b6
Backend for project output file agent
2018-06-22 13:08:13 +01:00
Shane Kilkelly
e916d96792
WIP: basic backend for project-output-file agent
2018-06-22 13:08:13 +01:00
Shane Kilkelly
5abb745e05
Copy linkedFileData when cloning a project
2018-06-22 10:00:39 +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
Paulo Reis
b16ebc1843
Read user email from the URL in DELETE requests.
2018-06-21 17:16:42 +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
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
James Allen
74ca0c4220
Refactor email template system
2018-06-21 10:19:12 +01:00
Tim Alby
bbed5fca9a
simplify proxy
2018-06-20 10:58:19 +02:00
Alasdair Smith
8de9e9fae4
Use error type instead of error message to check v1 connection error
2018-06-19 16:25:56 +01:00
Alasdair Smith
82a8e37071
Handle V1 connection refused when getting v1 subscription
2018-06-19 16:25:31 +01:00
Alasdair Smith
8492373a14
Add V1ConnectionError
2018-06-19 16:24:27 +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
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
hugh-obrien
fb9ca430de
export status endpoint
2018-06-14 09:44:05 +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
Henry Oswald
b24b110037
Merge pull request #647 from sharelatex/ho-clsi-domain
...
PDF download takes optional domain paramater
2018-06-13 11:30:17 +01:00
Henry Oswald
02110064f7
Merge branch 'master' into ho-clsi-domain
2018-06-13 10:32:51 +01:00
Shane Kilkelly
3baf0836bc
Support project-linked-files originating from imported v1 projects
2018-06-13 10:02:54 +01:00
James Allen
b00a79ff1c
Redirect to v1 plans page from v2
2018-06-12 13:52:47 +01:00
James Allen
a417dc8ff4
v1Subscription -> v1Subscriptions
2018-06-12 13:52:47 +01:00
James Allen
034e50760e
Add flag that can disable plans page
2018-06-12 13:52:47 +01:00