Commit Graph

4425 Commits

Author SHA1 Message Date
Ersun Warncke 7b90fcb186 Merge pull request #969 from sharelatex/ew-check-doc-token-access
check access for doc on read only token
2018-09-25 08:35:56 -04:00
Ersun Warncke eeed857dd9 change api path 2018-09-25 06:45:27 -04:00
Ersun Warncke f0c0834b0f only do v1 access check when api config present 2018-09-25 05:42:04 -04:00
Paulo Reis b8baf1a6f4 Hide front chat widget via code. 2018-09-25 10:30:13 +01:00
James Allen 1d657e1700 Merge pull request #968 from sharelatex/ja-show-register-button
Show register button on OL v2
2018-09-25 10:25:38 +01:00
James Allen e2f90ba01a Merge pull request #966 from sharelatex/as-no-project-token-based
Redirect logged out users to v1 if project is not found from token based url
2018-09-25 10:25:30 +01:00
Alasdair Smith 298ee2dbb4 Fix v1 return to path 2018-09-25 10:06:24 +01:00
Alasdair Smith ca895ae1b1 Redirect to v1 via sign in link 2018-09-25 09:37:22 +01:00
Brian Gough 89ba3912c0 Merge pull request #964 from sharelatex/csh-issue-963-MultipleProjectDownloads
Replace ShareLaTeX with Overleaf in name of multiple project download file
2018-09-25 09:33:53 +01:00
Brian Gough 5947294016 Merge branch 'bg-support-main-file-for-templates' 2018-09-25 09:32:14 +01:00
Brian Gough 0d4143205d strip quotes from mainFile 2018-09-25 09:05:49 +01:00
James Allen 19b97e953f Show register button on OL v2 2018-09-25 08:29:34 +01:00
Ersun Warncke f89e85231a check access for doc on read only token 2018-09-24 18:03:28 -04:00
Alasdair Smith d6350c963e Remove projectExists flag from higher access check
Now that find project by read and read/write token methods check whether
the project exists, it is not neccessary to check whether the project
exists in the higher access check. Therefore it has been removed
2018-09-24 19:00:10 +01:00
Alasdair Smith 99dec02266 If no project found for read/write token, redirect to v1 2018-09-24 19:00:10 +01:00
Alasdair Smith 237810509a If no project found for read token, redirect to v1 2018-09-24 19:00:10 +01:00
Christopher Hoskin 5c35cc9593 Replace ShareLaTeX with Overleaf in name of multiple project download file (Closes: #963) 2018-09-24 16:33:54 +01:00
Brian Gough 418bc10a18 allow getting doc paths by project id 2018-09-24 16:04:23 +01:00
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
hugh-obrien 5f4a36ca26 remove debug line 2018-09-24 10:49:01 +01:00
hugh-obrien c0b32f031e force gallery items to use legacy OL v1 texlive image 2018-09-24 10:49:01 +01:00
Alasdair Smith b6c794f627 Ensure brand prefixed favicon is used 2018-09-21 15:44:36 +01:00
Alasdair Smith 945894e89e Reset showNavItem bool if fails check 2018-09-21 12:53:57 +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 bfcb91e60f Hide content page links in nav when on dash 2018-09-20 11:16:18 -05: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 8805447bb9 Revert "Add notification to confirm unconfirmed emails" 2018-09-19 12:28:39 +01: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
Hugh O'Brien 78ad6e7e5c Merge pull request #915 from sharelatex/hb-affiliation-cta
Replace profile completion CTA with affiliations CTA
2018-09-19 11:32:55 +01:00
Hugh O'Brien 18e706c4b2 Merge pull request #917 from sharelatex/hb-confirm-email-notification
Add notification to confirm unconfirmed emails
2018-09-19 11:32:44 +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 d0be98e89c Move the account-merge-finish page to the integration module 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 b0e4b12714 Finish off the copy of the account-merge-finish page 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