Commit graph

8019 commits

Author SHA1 Message Date
Tim Alby
c00a0a435d remove console.log in tests 2018-10-05 16:24:28 +01:00
Tim Alby
7b4b75b51a fix incorrect or missing test mocks 2018-10-05 16:24:05 +01:00
Simon Detheridge
286f25529a Remove secondary CTA link from account merge confirmation email
bug: sharelatex/web-sharelatex-internal#987
Signed-off-by: Simon Detheridge <s@sd.ai>
2018-10-05 13:19:05 +01:00
Simon Detheridge
d316a76106 Revert "add plain text link to email address confirmation emails"
This reverts commit 48cd7e604dcc5f3b7ae8eb699f14b44bc073f107.
2018-10-05 13:16:42 +01:00
Simon Detheridge
a2ef0e1ae5 Add additional CTA link to emails
Some mail clients don't show the CTA button correctly, or at all. Add an additional, smaller link to the bottom of the email for people who can't see the button.

bug: sharelatex/web-sharelatex-internal#987
Signed-off-by: Simon Detheridge <s@sd.ai>
2018-10-05 12:04:00 +01:00
Chrystal Griffiths
d51549c4f0 Use ng-if to switch between pdf and editor 2018-10-05 11:19:20 +01:00
Jessica Lawshe
6692d06e5f Handle image_src in metadata layout
The CMS is already using `image`, which is an object based on data from the API.
2018-10-05 11:06:21 +01:00
Shane Kilkelly
4c2a90966a Merge pull request #918 from sharelatex/sk-enable-sudo-mode-in-v2
Enable sudo-mode for v2
2018-10-05 10:05:24 +01:00
Shane Kilkelly
453b5fbd71 Merge pull request #1001 from sharelatex/spd-v1-template-compiler
Lookup correct compiler when importing v1 templates
2018-10-05 10:05:13 +01:00
Simon Detheridge
2b8ce379f8 Lookup correct compiler when importing v1 templates
bug: overleaf/sharelatex#981
Signed-off-by: Simon Detheridge <s@sd.ai>
2018-10-04 16:42:03 +01:00
Shane Kilkelly
2c47da553b Add an error log if activating sudo-mode on login fails 2018-10-04 15:05:40 +01:00
Shane Kilkelly
778abaff6e Remove stray log 2018-10-04 15:05:40 +01:00
Shane Kilkelly
70b56d0362 Fix up acceptance tests 2018-10-04 15:05:40 +01:00
Shane Kilkelly
2ef23194df WIP: trying to get acceptance tests to pass 2018-10-04 15:05:40 +01:00
Shane Kilkelly
f9ed367148 Move the auth mechanism for sudo-mode into SudoModeHandler 2018-10-04 15:05:40 +01:00
Shane Kilkelly
254d74899b WIP: enable sudo-mode for v2 2018-10-04 15:05:40 +01:00
Chrystal Maria Griffiths
6b8eb0ac23 Merge pull request #996 from sharelatex/jel-meta-img
Update default meta images
2018-10-04 15:01:19 +01:00
Chrystal Maria Griffiths
e932eb074b Merge pull request #992 from sharelatex/as-fix-mathjax
Fix mathjax incorrectly loading config
2018-10-04 15:01:05 +01:00
Chrystal Maria Griffiths
5f5c9a1efc Merge pull request #997 from sharelatex/cmg-meta-title
Fix the meta title including 'ShareLaTeX'
2018-10-04 15:00:30 +01:00
Chrystal Griffiths
2f41e84f9a Merge branch 'cmg-meta-title' of github.com:sharelatex/web-sharelatex-internal into cmg-meta-title 2018-10-04 09:58:28 +01:00
Chrystal Griffiths
13843f82a0 Use settings appName 2018-10-04 09:57:51 +01:00
Jessica Lawshe
bbe847c16d Update default meta images
Favicons are not picked up by social sites.
2018-10-03 17:34:40 +01:00
Chrystal Griffiths
a979202a7c Use settings appName 2018-10-03 16:40:32 +01:00
Tim Alby
5ff66187a0 remove unused confirmed field from user model 2018-10-03 16:01:30 +01:00
Ersun Warncke
752658f773 Merge pull request #990 from sharelatex/ew-use-v1-doc-info-api
Use v1 Doc Info API for Token Access
2018-10-03 09:22:41 -04:00
Timothée Alby
e3cfa36b56 Merge pull request #984 from sharelatex/ta-email-cta-link
add plain text link to email address confirmation emails
2018-10-03 14:20:05 +01:00
Timothée Alby
c74c782cee Merge pull request #961 from sharelatex/ta-account-sync-affiliations
Add getInstitutionsPlan Function
2018-10-03 14:19:56 +01:00
Alasdair Smith
fb8ed890f9 Correctly load Safe mathjax extention using provided config 2018-10-03 11:52:33 +01:00
Brian Gough
ecdd00ecb9 Merge pull request #980 from sharelatex/jel-viewport-metatag
Add viewport metatag
2018-10-03 10:10:22 +01:00
Brian Gough
2b738907aa Merge pull request #989 from sharelatex/bg-clean-up-broken-project-on-error
clean up broken project on error in ProjectDuplicator
2018-10-03 10:04:30 +01:00
Ersun Warncke
642b45d0d6 use v1 doc info api 2018-10-02 11:16:46 -04:00
Douglas Lovell
4a846e4d87 Merge branch 'master' into dcl-i850 2018-10-02 16:04:39 +01:00
Alasdair Smith
10571b09f3 Merge pull request #979 from sharelatex/jel-content-links
Content pages link colors
2018-10-02 14:07:10 +01:00
Alasdair Smith
f90dd1b49a Merge pull request #986 from sharelatex/as-sign-in-from-v2-post
Remove POST /docs custom handler, now handled by redirects
2018-10-02 14:06:57 +01:00
Brian Gough
4621234220 clean up broken project on error in ProjectDuplicator 2018-10-02 12:14:22 +01:00
Jessica Lawshe
96b4f7edb3 Use viewport metatag on SL pw reset 2018-09-28 15:22:24 -05:00
Jessica Lawshe
40bc5564b6 Use viewport metatag on SL login 2018-09-28 15:14:05 -05:00
Jessica Lawshe
297f61da04 Add viewport metatag 2018-09-28 14:16:32 -05:00
Alasdair Smith
052cbda507 Merge pull request #981 from sharelatex/as-fix-intelligent-redirect-loop
Prevent redirect loop if project was imported to v2 then deleted
2018-09-28 16:41:40 +01:00
Alasdair Smith
062f26dda3 Remove POST /docs custom handler, now handled by redirects
Implementing a system for signing into v1 via v2 using POSTs so the
unauthenticated route is no longer necessary
2018-09-28 14:11:38 +01:00
Tim Alby
4e9737bf71 add plain text link to email address confirmation emails 2018-09-28 13:36:31 +01:00
Alasdair Smith
1330c8da73 Also check if v1 project exported if not found for read-only tokens 2018-09-28 11:47:14 +01:00
Alasdair Smith
435fe11115 Check if v1 project was exported if not found
This prevents a redirect loop for projects which were exported but then
deleted on v2. v2 would not find the project, redirect to v1, which
would find that it was exported and redirect back to v2.
2018-09-28 11:47:14 +01:00
Brian Gough
6d5908f2f4 Merge pull request #893 from sharelatex/ja-fix-duplicate-text-in-email
Don't include the license name twice in invite emails
2018-09-28 11:15:40 +01:00
Brian Gough
f278459393 Merge pull request #971 from sharelatex/bg-fix-opening-templates-containing-slash
fix invalid project names when opening templates
2018-09-28 11:00:39 +01:00
Brian Gough
1f6abd4e69 fix invalid project names when opening templates 2018-09-28 10:38:25 +01:00
Brian Gough
d6e0574be3 Merge pull request #938 from sharelatex/bg-fix-project-names-on-import
add support for creating unique project names
2018-09-28 10:34:57 +01:00
Brian Gough
8f8694ad94 iterate over owned projects in a more robust way 2018-09-28 09:48:15 +01:00
Brian Gough
6b80d3563d add support for creating unique project names 2018-09-28 09:48:15 +01:00
Alasdair Smith
45bd46bc01 Merge pull request #977 from sharelatex/as-encode-auth-with-v1-query-strings
Encode redirects which will auth with v1 first
2018-09-28 09:45:54 +01:00