Commit graph

6871 commits

Author SHA1 Message Date
Tim Alby
bbed5fca9a simplify proxy 2018-06-20 10:58:19 +02:00
Tim Alby
3d272ca297 replace OldAssetProxy 2018-06-18 18:37:58 +02: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
Timothée Alby
3374aa6c9d Merge pull request #660 from sharelatex/ja-no-legacy-nodemon
Don't use the legacy watch option in nodemon
2018-06-14 13:58:38 +02:00
James Allen
dc3fea74f9 Don't use the legacy watch option in nodemon 2018-06-14 10:41:18 +01: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
45fbcfecb3 Merge pull request #659 from sharelatex/ja-fix-subscription-dash
Add null check to subscription dash
2018-06-14 09:11:45 +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
e162ff6256 Merge pull request #654 from sharelatex/ja-explain-error-on-crash
Explain error if web crashes in acceptance tests
2018-06-14 09:09:26 +01:00
James Allen
1e7601d647 Add null check to subscription dash 2018-06-14 09:03:14 +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
406bf1f5fc Don't set pdfDownloadDomain by default 2018-06-13 11:23:33 +01:00
James Allen
76d10e6402 Improve error message readability 2018-06-13 10:40:36 +01:00
Shane Kilkelly
f21e14e658 Merge pull request #623 from sharelatex/sk-support-ext-files-in-v1-import
Support ext files in v1 import
2018-06-13 10:35:28 +01:00
Henry Oswald
02110064f7 Merge branch 'master' into ho-clsi-domain 2018-06-13 10:32:51 +01:00
James Allen
f57290382d Explain error if web crashes in acceptance tests 2018-06-13 10:11:38 +01:00
Shane Kilkelly
3baf0836bc Support project-linked-files originating from imported v1 projects 2018-06-13 10:02:54 +01:00
Jessica Lawshe
baa321fa1a Merge pull request #628 from sharelatex/ns-only-one-doc-env
only suggest one document environment per project
2018-06-12 08:44:14 -05: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
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
034e50760e Add flag that can disable plans page 2018-06-12 13:52:47 +01:00
James Allen
ce60e6941c Check with v1 before allowing a new subscription 2018-06-12 13:52:47 +01:00
James Allen
9d84263463 Fetch subscription details from v1 and display to user 2018-06-12 13:52:46 +01:00
James Allen
ea8f2fc7a3 Merge pull request #653 from sharelatex/ja-group-notification
Update group notification for new group invite URL
2018-06-12 10:06:26 +01:00
James Allen
1d7accabdd Update group notification for new group invite URL 2018-06-12 09:54:54 +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
dbd6ea30e9 Improve robustness of email validation 2018-06-11 15:22:42 +01:00
James Allen
ed5bc70350 Tweak front-end layout 2018-06-11 14:20:46 +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
James Allen
b716f59442 Remove deprecated removeEmailInviteFromGroup 2018-06-11 14:19:47 +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
Timothée Alby
bc6a38a4f1 Merge pull request #644 from sharelatex/ta-use-multi-emails-2
Use Multiple Emails Take 2
2018-06-11 10:31:25 +02:00
Henry Oswald
75c9489c06 PDF Downloads work, not tested on large pdf's yet 2018-06-08 17:17:00 +01: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
07aedaa92b Merge pull request #645 from sharelatex/jel-add-cms
Existence check for data from CMS
2018-06-08 10:14:23 -05:00
Jessica Lawshe
43da34098e Existence check 2018-06-08 10:07:44 -05:00
Jessica Lawshe
ba5b3bb06a Merge pull request #581 from sharelatex/jel-add-cms
Add CMS
2018-06-08 07:18:03 -05: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
e7e429a963 Merge pull request #605 from sharelatex/afc-update-user-references
Add method to update user references
2018-06-08 11:29:25 +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