Commit Graph

6735 Commits

Author SHA1 Message Date
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
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
Douglas Lovell 4abbc5d569 Password change form conditioned on installation 2018-09-18 09:10:33 -03:00
hugh-obrien 277225d8de use existing left sidebar controller for affiliation cta 2018-09-18 13:06:26 +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
Timothée Alby 7981d867e8 Merge pull request #924 from sharelatex/ta-sign-in-v1
Change Links to v1 to Sign User In
2018-09-18 12:24:08 +01:00
Alasdair Smith 7e358ab318 Support passing through query params 2018-09-18 11:34:04 +01:00
hugh-obrien 2d40c3d21a Use existing notification styling 2018-09-18 11:01:10 +01:00
hugh-obrien f76ff55b6f email alert styling 2018-09-18 10:54:20 +01:00
hugh-obrien e343c04423 add notification to confirm unconfirmed emails 2018-09-18 10:54:20 +01:00
hugh-obrien 6f00d1f45a send required export fields for s1 submission 2018-09-18 10:05:35 +01:00
Jessica Lawshe 203c005f26 Merge pull request #928 from sharelatex/jel-content-updates
Link mixin paths and universities list styling
2018-09-17 13:16:52 -05:00
Jessica Lawshe 6fc7468b02 Thousands of templates 2018-09-17 10:47:57 -05:00
Jessica Lawshe 4f5c12e9ac More specific group contact controller name and email subject
This form is only used on the group contact modal.
2018-09-17 10:47:57 -05:00
Jessica Lawshe 66bfbce45f Correct link mixin paths 2018-09-17 09:46:34 -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
Chrystal Maria Griffiths 784984dd78 Merge pull request #923 from sharelatex/cmg-share-modal
Show share button for collaborators
2018-09-17 15:19:44 +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
Douglas Lovell 7d10e64840 Alter endpoint for account settings, change password form submission. 2018-09-14 16:19:02 -03:00
Tim Alby 09c92c0b69 don't encode / 2018-09-14 16:09:24 +01:00
Tim Alby 2e4d3d7aab change links to v1 to sign user in first 2018-09-14 14:26:16 +01:00
Tim Alby 41b92d4647 prevent calls to UserGetter.getUser with null query 2018-09-14 12:46:00 +01:00
Chrystal Griffiths 6334066d2d Merge branch 'master' into cmg-share-modal 2018-09-14 12:09:10 +01:00
Chrystal Griffiths 915bd18058 Read-only collaborators table 2018-09-14 11:47:18 +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
Chrystal Griffiths 3b43cf9075 Slight copy change 2018-09-13 17:57:11 +01:00
Tim Alby 0051e59309 remove unused call to UserGetter.getUser 2018-09-13 17:39:30 +01:00
Chrystal Griffiths b51fc01bde Remove temporary solution 2018-09-13 17:17:18 +01:00
James Allen ef11161ddb Revert "Record and show last modified by user for projects" 2018-09-13 14:00:30 +01:00
hugh-obrien 26defd0833 reword CTA 2018-09-13 13:54:43 +01:00
hugh-obrien 8697edc149 replace profile completion CTA with affiliationa adding CTA 2018-09-13 12:34:18 +01:00
Chrystal Griffiths 57ac858004 Style the notice 2018-09-13 12:19:44 +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 5dbebc0693 Translate 'by' 2018-09-13 10:38:52 +01:00
James Allen dd4b85b809 Combine v1 and v2 projects into item.pug 2018-09-13 10:38:52 +01:00
James Allen 225d30ffd2 Add missed lines from rebase 2018-09-13 10:38:52 +01:00