alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,658 Commits 8 Branches 11 Tags
6576d95e27f9babe8c4e487b70f8f66324112d74
Commit Graph
7337 Commits
Author SHA1 Message Date
Chrystal GriffithsandAlasdair Smith 6576d95e27 Don't stretch images 2018-09-20 15:41:41 +01:00
Chrystal GriffithsandAlasdair Smith 82cd857e83 Set fixed height for portal titles 2018-09-20 15:41:41 +01:00
Jessica LawsheandGitHub 488886c1d2 Merge pull request #929 from sharelatex/jel-homepage 
Add Homepage
 2018-09-20 09:01:13 -05:00
Jessica LawsheandGitHub d2af2fb630 Merge pull request #927 from sharelatex/jel-plans-updates 
Plans page updates
 2018-09-20 09:00:58 -05:00
Jessica Lawshe 50e53a57a3 Add advocate image 2018-09-20 08:57:07 -05:00
Jessica Lawshe c408b14bc5 Homepage images 2018-09-20 08:57:07 -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
Jessica Lawshe 4640756fb8 Add .btn-xl styling 2018-09-20 08:57:06 -05:00
Jessica Lawshe f60f48e396 Add .alert-alt styling 2018-09-20 08:57:06 -05:00
Ersun Warncke 256e374af0 update shrinkwrap 2018-09-19 12:13:14 -04:00
Ersun Warncke 48eb49a763 add sso passport modules 2018-09-19 10:20:27 -04:00
Shane KilkellyandGitHub 7781181ab9 Merge pull request #941 from sharelatex/sk-fix-removed-js-module 
This module has been removed. Remove from the main frontend bundle too
 2018-09-19 14:11:23 +01:00
Shane Kilkelly eb128e6d1b This module has been removed. Remove from the main frontend bundle too 2018-09-19 14:01:06 +01:00
Hugh O'BrienandGitHub 8805447bb9 Revert "Add notification to confirm unconfirmed emails" 2018-09-19 12:28:39 +01:00
Hugh O'BrienandGitHub 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'BrienandGitHub 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'BrienandGitHub 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 fc0a4298f1 Move scripts related to account-merge checker to relevant modules 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
Brian Gough 02854274a7 2018-09-18 14:09:05 +01:00
hugh-obrien 277225d8de use existing left sidebar controller for affiliation cta 2018-09-18 13:06:26 +01:00
Timothée AlbyandGitHub 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 AlbyandGitHub 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 AlbyandGitHub 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 39f580d6ba fixing broken exports test 2018-09-18 10:13:33 +01:00
hugh-obrien 6f00d1f45a send required export fields for s1 submission 2018-09-18 10:05:35 +01:00
Jessica LawsheandGitHub 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 08a9534f8c Vertically align universities list items 2018-09-17 10:45:59 -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