Brian Gough
586e3814fe
add missing require
2018-09-24 15:27:16 +01:00
Brian Gough
2692090f3f
support a mainFile parameter for templates
2018-09-24 15:27:16 +01:00
James Allen
772ac42005
Fix messed up rebase
2018-09-21 10:42:20 +01:00
Alasdair Smith
3462b8042e
Add /chrome redirect to match v1 behaviour
2018-09-21 10:35:43 +01:00
James Allen
2d9cadb487
Merge pull request #935 from sharelatex/as-teams-redirect
...
Add route to handle /teams similar to v1
2018-09-21 08:37:10 +01:00
Jessica Lawshe
488886c1d2
Merge pull request #929 from sharelatex/jel-homepage
...
Add Homepage
2018-09-20 09:01:13 -05:00
Jessica Lawshe
d2af2fb630
Merge pull request #927 from sharelatex/jel-plans-updates
...
Plans page updates
2018-09-20 09:00:58 -05:00
Jessica Lawshe
d023150b0f
Add v2 homepage
...
Specific homepage filenames and redirect to login when not found
Move variables to shared file
Move circle image styling to shared file
Leaving float on plans page because of some layout differences
2018-09-20 08:57:07 -05:00
Hugh O'Brien
b377b89447
Merge pull request #933 from sharelatex/bg-avoid-exception-for-no-emails
...
fix exception when user has no emails field
2018-09-19 11:33:03 +01:00
Shane Kilkelly
e1c3689aec
Update the email-merge email template
2018-09-19 09:28:59 +01:00
Shane Kilkelly
2ec7747b60
Add a help link to the account-merge email in case of error
2018-09-19 09:28:59 +01:00
Shane Kilkelly
c95d925d56
When regenerating session, don't copy the __tmp key
2018-09-19 09:28:59 +01:00
Shane Kilkelly
c9e3418049
Working overleaf-side of account-merge
2018-09-19 09:28:59 +01:00
Shane Kilkelly
fcfcbdb4c5
Remove dead code
2018-09-19 09:28:59 +01:00
Shane Kilkelly
677b3c759d
Remove old controller
2018-09-19 09:28:59 +01:00
Shane Kilkelly
843f1c6b35
Move AccountMergeEmailController to integration module
2018-09-19 09:28:59 +01:00
Shane Kilkelly
54a5c563fb
Address feedback
2018-09-19 09:28:59 +01:00
Shane Kilkelly
5e17dfd1cb
Also add the final email to the array of emails on the account
2018-09-19 09:28:59 +01:00
Shane Kilkelly
efb6018246
Add a rate-limit to the email-confirm endpoint
2018-09-19 09:28:59 +01:00
Shane Kilkelly
6cfe68db26
Roughly working account-merge-by-email callback endpoint
2018-09-19 09:28:59 +01:00
Shane Kilkelly
958c7a19b6
Add a skeleton of a callback endpoint for merging accounts via email
2018-09-19 09:28:59 +01:00
Shane Kilkelly
ba221a1135
WIP: add email-based account merge flow to ShareLaTeX
2018-09-19 09:28:59 +01:00
Alasdair Smith
bdcc25805e
Add route to handle /teams similar to v1
2018-09-18 17:14:37 +01:00
Brian Gough
02854274a7
2018-09-18 14:09:05 +01:00
Timothée Alby
b16cffe587
Merge pull request #932 from sharelatex/as-redirect-query-string
...
Support passing through query params in redirects
2018-09-18 12:35:21 +01:00
Timothée Alby
b6925647ef
Merge pull request #922 from sharelatex/ta-forbid-null-query
...
Prevent Calls to UserGetter.getUser with Null Query
2018-09-18 12:24:19 +01:00
Alasdair Smith
7e358ab318
Support passing through query params
2018-09-18 11:34:04 +01:00
hugh-obrien
6f00d1f45a
send required export fields for s1 submission
2018-09-18 10:05:35 +01:00
Jessica Lawshe
6fc7468b02
Thousands of templates
2018-09-17 10:47:57 -05:00
James Allen
15103ac894
Support the same URL with multiple methods in redirects
2018-09-17 15:38:58 +01:00
James Allen
40f08d1592
Add additional functionality to RedirectManager
2018-09-17 15:38:45 +01:00
Alasdair Smith
42cef8e393
Merge pull request #920 from sharelatex/mm-gallery-exports
...
Add gallery fields to export controller and handler
2018-09-17 09:42:26 +01:00
Alasdair Smith
e1e7091f30
Merge pull request #905 from sharelatex/as-project-intelligent-redirect
...
Intelligently redirect to v1 if no v2 project found
2018-09-17 09:40:52 +01:00
Tim Alby
41b92d4647
prevent calls to UserGetter.getUser with null query
2018-09-14 12:46:00 +01:00
Michael Mazour
79dc415064
Slightly refactor exports controller body handling
...
1. Move all body parsing together
2. Remove `firstName && lastName` condition, which duplicates one present in the Handler.
2018-09-14 11:02:51 +01:00
Michael Mazour
10fcdd6daf
Add optional gallery fields to export request
...
Support the optional (well, gallery-only) fields `title`, `description`, `author`, `license`, and `show_source` in export requests.
2018-09-14 11:02:51 +01:00
Tim Alby
0051e59309
remove unused call to UserGetter.getUser
2018-09-13 17:39:30 +01:00
James Allen
ef11161ddb
Revert "Record and show last modified by user for projects"
2018-09-13 14:00:30 +01:00
Alasdair Smith
f37040e4a4
Only redirect if has overleaf setting
2018-09-13 12:09:19 +01:00
Alasdair Smith
8a969d1c25
Redirect directly from controller instead of via handler
2018-09-13 12:09:19 +01:00
Alasdair Smith
9d600afdf8
Fix failing tests for token access
...
If project was changed from token access to private, then we want to
404 on v2 (not redirect to v1). So the logic was changed to check if the
project exists and if it does then a 404 is returned. If it does not
then it redirects to v1.
2018-09-13 12:09:19 +01:00
Alasdair Smith
24495f3340
Also redirect not found read tokens to v1
2018-09-13 12:09:19 +01:00
Alasdair Smith
e0ce988d32
Intelligently redirect to v1 if no v2 project found for token
2018-09-13 12:09:19 +01:00
James Allen
ab10336110
Record last update time and user from project-history
2018-09-13 10:38:52 +01:00
Hugh O'Brien
24c479e984
Merge pull request #885 from sharelatex/hb-ip-matcher-notifications
...
IP matcher affiliation CTA notifications
2018-09-13 08:59:25 +01:00
Brian Gough
6d54e843e8
fix typo in Errors, only two underscores in __proto__
2018-09-12 10:45:50 +01:00
Ersun Warncke
7d3e17651f
set options and method for request, pass cookies and form body
2018-09-10 06:10:36 -04:00
hugh-obrien
1e04a09ec6
remove unnecessary error returns and ip fetching
2018-09-07 18:15:32 +01:00
hugh-obrien
8ef90a0dcb
move call for creating ip matched notifcation to project controller
2018-09-05 15:40:59 +01:00
Jessica Lawshe
a4956294c1
Remove plans redirect
2018-09-05 08:14:05 -05:00
