github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-31 21:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity
19181 commits 3 branches 7 tags 199 MiB
Commit graph

2901 commits

Author SHA1 Message Date
Timothée Alby
7fc0f88996 Merge pull request #3111 from overleaf/pr-file-outline-out-of-beta 
File outline out of beta

GitOrigin-RevId: 64fa6554813b1d0ceff2b567922651509badecc7
 2020-08-19 02:06:20 +00:00
Jakob Ackermann
7232fd28ef Merge pull request #3103 from overleaf/pr-fix-messaging-hidden-files 
Change hidden files notice messaging.

GitOrigin-RevId: 67dfaddd8e1879aae77840f4f68c5c6598fbe294
 2020-08-18 02:06:37 +00:00
Jessica Lawshe
09146e8f0b Merge pull request #3082 from overleaf/pr-limit-file-tree-depth 
Limit file tree depth

GitOrigin-RevId: 48dd3cec0f7540e99f07aadfcf2c8b06d126410a
 2020-08-13 15:46:16 +00:00
Jessica Lawshe
552fb56b74 Merge pull request #3078 from overleaf/jel-log-password-reset-by-token 
Update audit log when password reset by token

GitOrigin-RevId: 2ae7f59c5cdf2723e541a99c58c36564cc82adbf
 2020-08-13 15:46:10 +00:00
Timothée Alby
0cec198a08 Merge pull request #3095 from overleaf/hb-last-login-date-groups-csv 
Last login date for groups csv

GitOrigin-RevId: c615db3086ec84f2a33710fc0117d711862b6f6c
 2020-08-13 02:06:35 +00:00
Timothée Alby
459904c0ef Merge pull request #2975 from overleaf/cmg-sk-restricted-users-names 
Hide data from restricted users in history, setting history label usernames on server side

GitOrigin-RevId: 820d92064d2c0bc99ba756cca4be1adab0da5753
 2020-08-13 02:06:25 +00:00
Timothée Alby
8cd6e7ccfc Merge pull request #3064 from overleaf/ta-manage-multiple-groups 
Allow Users to Manage Multiple Groups

GitOrigin-RevId: c918da0114cdd1d679223f69d81159b4c2608874
 2020-08-13 02:06:20 +00:00
Shane Kilkelly
86655aa4e6 Merge pull request #3065 from overleaf/sk-sp-fix-toggle-bar 
Show blank toolbar when rich-text is missing

GitOrigin-RevId: 86033df701b7a7af76400397cc895c66143a2cbe
 2020-08-10 15:54:28 +00:00
Timothée Alby
558854f51b Merge pull request #3030 from overleaf/ta-outline-highlight 
Outline Highlight

GitOrigin-RevId: f51eec6f1714403d749e454b55be363819930b98
 2020-08-10 15:54:08 +00:00
Jakob Ackermann
7847209eaa Merge pull request #3049 from overleaf/jlm-fix-referral-projection 
Fix referral projection

GitOrigin-RevId: 37c68bf6bfa81a694e2f919b262634a9a1b63f8b
 2020-07-28 02:06:20 +00:00
Jakob Ackermann
d1b8d49355 Merge pull request #3045 from overleaf/ns-delete-cannot-import-pug 
remove unused "cannot import project" pug file

GitOrigin-RevId: b2f685af1c91d5eadcce2b4b46f362862356e109
 2020-07-25 02:06:43 +00:00
Jakob Ackermann
d5472b8743 Merge pull request #3038 from overleaf/jpa-cmg-hide-chat-container 
[frontend] hide container for the chat component for token-access users

GitOrigin-RevId: f181d72bdffbc84485d796dac7c0f7edfcf6729a
 2020-07-25 02:06:31 +00:00
Paulo Jorge Reis
307e9345bb Merge pull request #3028 from overleaf/ta-outline-beta 
Outline in Beta

GitOrigin-RevId: 351372bb35f2719ad26a6e7c8725a6f777472d88
 2020-07-24 02:06:31 +00:00
Paulo Jorge Reis
f3ad611090 Merge pull request #3041 from overleaf/pr-more-outline-polish 
More outline polish

GitOrigin-RevId: 6bb69e7af0d62f2107fc9b57c621e0dcb46d0a8d
 2020-07-24 02:06:24 +00:00
Jessica Lawshe
10ef38fe76 Merge pull request #3029 from overleaf/jel-optimize-anti-flicker 
Revert Use of ExposedSettings for Zotero experimentId

GitOrigin-RevId: 40ff3b2b4409f287c0e4630a30c0b72f70031f62
 2020-07-22 02:06:06 +00:00
Jessica Lawshe
88057c4caa Merge pull request #3003 from overleaf/jel-zotero-event 
Add Google Analytics event for Zotero A/B test

GitOrigin-RevId: 2b97a6070828fb97ea741a6e355c20314f59faad
 2020-07-17 02:07:35 +00:00
Paulo Jorge Reis
4b90b09365 Merge pull request #2987 from overleaf/ta-outline-tracking 
Add Event Tracking to Outline

GitOrigin-RevId: 239430ef0ff6ff67bf7c90291969cd28efde0d4a
 2020-07-17 02:07:06 +00:00
Paulo Jorge Reis
0e9771ac09 Merge pull request #3007 from overleaf/pr-file-outline-extras 
File outline extras

GitOrigin-RevId: c35c4f35dce280c9f44c02b567df9734943d0cb0
 2020-07-17 02:06:42 +00:00
Jakob Ackermann
53927bca95 [misc] move /user/activate into a module (#2962) 
* [misc] move /user/activate into a module

Co-Authored-By: Nate Stemen <nate.stemen@overleaf.com>

* [misc] setup copybara for the new user-activate module

* [misc] move the /user/activate route behind a feature flag

...which is by default enabled.

Co-authored-by: Nate Stemen <nate.stemen@overleaf.com>
GitOrigin-RevId: 87fc5ae869a7e282ffdbeea0ff7b7c55b8b9b31b
 2020-07-16 02:06:51 +00:00
Alasdair Smith
2556fded1e Merge pull request #2998 from overleaf/as-beta-page-updates 
Update beta program page to include feedback survey link

GitOrigin-RevId: 549cd2be01b8f64d952d0347c8c102d0d2efae24
 2020-07-15 02:06:35 +00:00
Miguel Serrano
1cac5227d6 Merge pull request #2958 from overleaf/jel-optimize-zotero 
Add Optimize variant on Zotero paywall prompt

GitOrigin-RevId: 005cf27d40a367e4617c399023204dacb80af8de
 2020-07-11 02:04:26 +00:00
Chrystal Maria Griffiths
0da739fdc4 Merge pull request #2967 from overleaf/cmg-covid-july-copy 
Change copy for WFH group user notifications

GitOrigin-RevId: 4b163a807e8c3b00b922d90e3fb7c57c5989c495
 2020-07-02 02:10:10 +00:00
Timothée Alby
1012dbc3c4 Merge pull request #2961 from overleaf/ta-spike-outline 
Document Outline Spike

GitOrigin-RevId: adc315a3546147eb10c7a40ae70f9cab1cbf7b8d
 2020-06-30 02:10:19 +00:00
Chrystal Maria Griffiths
05abdd18d7 Merge pull request #2935 from overleaf/cmg-covid-upgrades 
Add script for WFH offer ending

GitOrigin-RevId: b9291824a0712740d5d40439f759eb8a7d11d9ca
 2020-06-30 02:10:14 +00:00
Jessica Lawshe
176c0f3742 Merge pull request #2942 from overleaf/jel-css-is-overleaf 
Start removing is-overleaf from CSS

GitOrigin-RevId: fa37bedd857fc492f8d2e1df1758e2e5f924f000
 2020-06-26 02:10:02 +00:00
Jessica Lawshe
cc46e33681 Merge pull request #2920 from overleaf/ta-custom-subscription-contact 
Update Custom Subscription Wording

GitOrigin-RevId: a4582aadcae0689022ec0c74d4be4853c8cebf34
 2020-06-19 02:10:27 +00:00
Jessica Lawshe
bfe06015c8 Merge pull request #2913 from overleaf/jel-cms-fields-check 
Add fields check for CMS images

GitOrigin-RevId: 53d525ea9861cb8d025920c535054ced6886ca72
 2020-06-19 02:10:15 +00:00
Chrystal Maria Griffiths
d946ac2a99 Merge pull request #2918 from overleaf/cmg-covid-upgrades 
Update copy for WFH notifications for free users

GitOrigin-RevId: 420951266e431d490e05da736f9d167934364df3
 2020-06-19 02:10:10 +00:00
Jessica Lawshe
9c2a6fc371 Merge pull request #2907 from overleaf/jel-events-on-optimize-pages 
Send Google Analytics event for Optimize pages

GitOrigin-RevId: b43b0a1fa1565b5a75384e7c3335ed5595e3253f
 2020-06-17 02:10:36 +00:00
Jessica Lawshe
a64f9304ab Merge pull request #2903 from overleaf/jel-cards-list-location 
Include plans cards list location in itm_content

GitOrigin-RevId: 6919349a7812891e986dbe41af728169c5a36a0a
 2020-06-17 02:10:30 +00:00
Brian Gough
a078a34e75 Merge pull request #2902 from overleaf/bg-handle-clsi-503 
handle 503 unavailable from clsi with retry

GitOrigin-RevId: 2b90aadbe93af5007a5a64ff3d2330b2fffbf56f
 2020-06-13 02:11:10 +00:00
Hugh O'Brien
cedb075b34 Merge pull request #2893 from overleaf/jel-plans-test 
Add hidden plans cards at bottom of page for A/B test

GitOrigin-RevId: a44ca8f3ee60a583187126af32dcdfedba4ee41d
 2020-06-10 02:12:41 +00:00
Chrystal Maria Griffiths
50585a22b3 Merge pull request #2881 from overleaf/jpa-socket-io-retry-handshake 
[misc] socket.io: retry the initial connection attempt

GitOrigin-RevId: e7f7e8eb233015f41b2b8c67e46c4661b8fad3c9
 2020-06-06 02:09:55 +00:00
Chrystal Maria Griffiths
d536e57ed8 Merge pull request #2884 from overleaf/as-remove-dead-code 
Remove some dead code

GitOrigin-RevId: f861b0a4071f5f66a1f1052caa681799bad17153
 2020-06-06 02:09:50 +00:00
Chrystal Maria Griffiths
1e4b7aeace Merge pull request #2887 from overleaf/cmg-plans-covid-notification 
Add WFH notification to plans page

GitOrigin-RevId: 49597e4fdaa8fb047639105cb83e9aed8c30a260
 2020-06-06 02:09:45 +00:00
Chrystal Maria Griffiths
9aa0ca1131 Merge pull request #2875 from overleaf/cmg-covid-upgrades-script 
Create notifications for current WFH 2020 users

GitOrigin-RevId: f40ae373815d834cfa4c81bb96a61a799385b8d9
 2020-06-03 10:31:15 +00:00
Chrystal Maria Griffiths
a4dca01fb5 Merge pull request #2871 from overleaf/cmg-upgrades-and-plans-copy 
Change copy and links for updated WFH notification

GitOrigin-RevId: 5b11afad06ad1469ff3727b78a1a5ab0ec710a96
 2020-05-29 03:15:53 +00:00
Paulo Jorge Reis
f2b9036e34 Merge pull request #2865 from overleaf/pr-handle-single-use-coupons 
Handle single-use coupons

GitOrigin-RevId: 13af3c6a360adf67e5b0bc70764558ddcc3efd9c
 2020-05-29 03:15:48 +00:00
nate stemen
8ba78bd559 Merge pull request #2848 from overleaf/ns-account-deletion-v1-references 
remove references to v1 projects on account deletion

GitOrigin-RevId: 1e886d6b693f98ee81efc704d2a3688de43981ef
 2020-05-22 03:24:48 +00:00
Eric Mc Sween
63c155b1e8 Merge pull request #2831 from overleaf/ew-delete-unused-templates 
Delete unused external pages

GitOrigin-RevId: 02d179b613815f3aad3e189a4f57db8e42bdf2a3
 2020-05-21 03:22:40 +00:00
Eric Mc Sween
69e1aba86f Merge pull request #2836 from overleaf/em-as-ns-fix-ng-repeat 
Fix ng-repeat error when uploading two files with the same name

GitOrigin-RevId: 6de85f54c1f497dfb980f4ed4c41efc2d9942277
 2020-05-21 03:22:24 +00:00
nate stemen
2479cb485a Merge pull request #2826 from overleaf/ns-project-import-flow-deletion 
Project import flow deletion

GitOrigin-RevId: 08ffc156eb158235d4ccacba2b3ed504cd9978f0
 2020-05-21 03:21:56 +00:00
nate stemen
5fca56d4e6 Merge pull request #2807 from overleaf/ns-project-import-deletion-dashboard 
Clean up references to v1 projects on project dashboard

GitOrigin-RevId: e574382fb1747da7a701808148434f4d689cbe33
 2020-05-20 03:21:44 +00:00
Hugh O'Brien
87c83b96db rotate chat arrow to top 
GitOrigin-RevId: 755e7de8b9b2c11614faec79baac61618fd30006
 2020-05-19 03:20:20 +00:00
Hugh O'Brien
b5814f0a3a remove gravatars 
GitOrigin-RevId: e90bddcc560160cdf7397acc311f7f31f9861f81
 2020-05-19 03:20:09 +00:00
Paulo Reis
d536ea8a24 Remove "Pay by invoice or VAT invoice" option from group account modal 
GitOrigin-RevId: bbcadc98c71a14a97e5c31c3877e83bb8f8bfce2
 2020-05-19 03:20:04 +00:00
Jessica Lawshe
43a88a0939 Merge pull request #2806 from overleaf/jel-add-space-change-plan 
Add a space before "Change plan"

GitOrigin-RevId: 99e39a65c251d5a09964891b3355b919b06df877
 2020-05-07 03:28:23 +00:00
Jessica Lawshe
b0b7e56770 Merge pull request #2803 from overleaf/jel-og-video 
Include og:video in metadata

GitOrigin-RevId: ce49aad16eb29d22447f3206b7a1dc6accdf2933
 2020-05-07 03:28:17 +00:00
Miguel Serrano
7658a515ba Merge pull request #2790 from overleaf/ta-sso-notifications-no-dismiss 
Don't Display Dismiss Button on SSO Notifications

GitOrigin-RevId: f578f57ac348fba4375abee9d842dce34b0c4271
 2020-05-07 03:28:02 +00:00
Chrystal Maria Griffiths
f0bdd34823 Merge pull request #2796 from overleaf/cmg-covid-top-notification 
Top notification for Coronavirus upgrade offer

GitOrigin-RevId: bdad53ebbcbec93034df5c652fe82d309f73f22d
 2020-05-02 03:19:41 +00:00
Hugh O'Brien
7a315bfa4d Merge pull request #2759 from overleaf/hb-read-only-on-connection-lost 
Read only mode on lost connection and local file contents on Out of Sync error

GitOrigin-RevId: e31a259be122ad162e98746cd06a7794a95e78fa
 2020-05-02 03:19:31 +00:00
Paulo Jorge Reis
7f13e258bb Merge pull request #2697 from overleaf/pr-add-vat-number 
Add VAT number and company name to the payment form

GitOrigin-RevId: 9ba2d7345f6f3cef1f7372e17c04243ab285e0bd
 2020-04-30 03:19:59 +00:00
Chrystal Maria Griffiths
1c68d70929 Merge pull request #2782 from overleaf/cmg-wfh-dashboard 
Change free trial offer in sidebar to WFH offer

GitOrigin-RevId: 770273c9cb85c03d0c80ca7b1a66572fe5683e6c
 2020-04-29 03:22:19 +00:00
Eric Mc Sween
1dc325d1c7 Merge pull request #2750 from overleaf/ta-activate-finish-login 
Don't Bypass FinishLogin on Password Reset

GitOrigin-RevId: 92567c893afb4aa64fa045151678d33c877d8f71
 2020-04-24 03:30:45 +00:00
Miguel Serrano
533b395210 Merge pull request #2753 from overleaf/ta-password-reset-inflight 
Add Inflight UI To Password Reset Form

GitOrigin-RevId: 414e00d30e23d6964c8a6782d2bac52a239f868d
 2020-04-23 03:29:07 +00:00
Miguel Serrano
e2bf647b81 Merge pull request #2763 from overleaf/ta-dot-dot-dot 
Replace Triple-Dots with Ellipsis in Pug Files

GitOrigin-RevId: 408cea0772d8751acd8939e199e49e2cf9685b8f
 2020-04-23 03:29:02 +00:00
Eric Mc Sween
5c6ddfd53a Merge pull request #2744 from overleaf/pr-add-visa-notice-tos 
Add ToS link for new Visa free trial rules in the subscription form.

GitOrigin-RevId: 607f1057cee40b61b7910cb2afc1648dacfe49b6
 2020-04-17 03:23:35 +00:00
Timothée Alby
ffe46658f6 Merge pull request #2734 from overleaf/ta-texlive-version-select 
Make TeX Live Version Select Available To All Users

GitOrigin-RevId: 8209f2c3590f56296e916f104c7443f8ada3fc71
 2020-04-15 03:15:12 +00:00
Simon Detheridge
0d442af07d Merge pull request #2733 from overleaf/ta-affiliations-space 
Add Missing Space in Affiliation UI

GitOrigin-RevId: 8a9db0b410836ebd67dc3a48cdb06ba4924824b1
 2020-04-09 03:21:15 +00:00
Ersun Warncke
9057703531 Revert "Revert "only include recaptcha v2 on pages that use it"" 
This reverts commit a56afbdbbb749975b7e7f9cd47e0a7b2b784e75b.

GitOrigin-RevId: 9f3c029d9c4d9c3811e525ec1b6d8bf39ced4945
 2020-04-07 03:18:51 +00:00
Jakob Ackermann
155b22caf9 Merge pull request #2713 from overleaf/jpa-custom-wsurl-for-beta-users 
[misc] custom wsUrl for beta users

GitOrigin-RevId: e731ae7245e9c5586ae82cbc4c6716a74e56f2c9
 2020-04-03 03:20:47 +00:00
Timothée Alby
1d7b454c96 Merge pull request #2691 from overleaf/ta-4xx-error-page 
Enhance 4xx HTML Response Page

GitOrigin-RevId: 620f84cd6cdc0571bd68bbd2c3164b08f7fe5598
 2020-04-02 03:19:35 +00:00
Ersun Warncke
6808262783 Revert "only include recaptcha v2 on pages that use it" 
GitOrigin-RevId: a56afbdbbb749975b7e7f9cd47e0a7b2b784e75b
 2020-04-01 03:21:21 +00:00
nate stemen
3bb0851f15 Merge pull request #2704 from overleaf/jel-ip-matcher-notification 
Add space before institution name in IP notification

GitOrigin-RevId: 00d72b96ab88dfc0e7a3f827647db961ce008a65
 2020-03-31 03:19:03 +00:00
nate stemen
344b2b2395 Merge pull request #2702 from overleaf/ta-subscription-links 
Fix Language Change Links

GitOrigin-RevId: e47f59dfd53102d4569c3ffeb950d3259c65215b
 2020-03-31 03:18:45 +00:00
nate stemen
78561cb393 Merge pull request #2703 from overleaf/ew-only-include-recaptcha-on-pages-that-use-it 
only include recaptcha v2 on pages that use it

GitOrigin-RevId: 98b4e3add8e0a5a0b74530bf4155ebb47f69ba96
 2020-03-31 03:18:41 +00:00
Eric Mc Sween
5cf06bbb4d Merge pull request #2696 from overleaf/ns-default-font-family-line-height 
Set default options for font family and line height

GitOrigin-RevId: 7c5a29134e75e3545e508021c305fa6d6e0d04c1
 2020-03-25 04:16:58 +00:00
Eric Mc Sween
d68ebe7b41 Merge pull request #2684 from overleaf/sk-fix-subscription-track-changes-example 
Fix the "added and removed" part of new-sub page

GitOrigin-RevId: d78c0f913531d521e9538a17b48b409cf0f2cc00
 2020-03-25 04:16:49 +00:00
Jessica Lawshe
30763043d1 Merge pull request #2663 from overleaf/jel-sso-missing-email-error 
Institution SSO error handling when missing session data

GitOrigin-RevId: c455ef97eb17b98ffbd03eb5f623ceb27678deed
 2020-03-12 04:18:52 +00:00
Timothée Alby
620b95fbe8 Merge pull request #2656 from overleaf/jpa-import-709 
[misc] fileOperationI18nNames: drop blocking DOM access

GitOrigin-RevId: e6aab686fc8d4fe3b5515033b88548278c7bf7c0
 2020-03-10 04:14:42 +00:00
Timothée Alby
a53174a4d6 Merge pull request #2660 from overleaf/jlm-fix-div-in-p 
Remove div from inside p tag

GitOrigin-RevId: 2feea3786d7d737e2f8c8aa8d817f8e7cd1868ae
 2020-03-10 04:14:33 +00:00
Eric Mc Sween
34a40296f4 Merge pull request #2652 from overleaf/jel-new-file-scope 
Maintain scope in new file modal

GitOrigin-RevId: f4a39dfefbbcb75f5a3fb8fe23cb71a186b575dd
 2020-03-05 04:17:05 +00:00
Hugh O'Brien
d20518fdd4 Merge pull request #2624 from overleaf/hb-warning-nearing-file-limit 
Show warning near or above file limit in upload modal

GitOrigin-RevId: 75e7c41e526ccde9516f7caf6ef1b9cbc59c2439
 2020-03-04 04:21:48 +00:00
Hugh O'Brien
bb958492a9 Merge pull request #2623 from overleaf/hb-third-party-too-many-files 
Third party too many files errors

GitOrigin-RevId: 0a44931b14dd349d9cc4d25a3b51c68f221b8195
 2020-03-04 04:21:43 +00:00
Eric Mc Sween
506bc44336 Merge pull request #2621 from overleaf/jpa-ns-empty-history 
Add messaging to projects with empty history

GitOrigin-RevId: 3fab0b115d35ec3d7f7d1ffa5603b7c7d3423c94
 2020-03-03 04:21:48 +00:00
Eric Mc Sween
e80870f453 Merge pull request #2629 from overleaf/cmg-updateon-typo 
Fix typo in user settings

GitOrigin-RevId: 066ee8047d807e9ac077eb687a93f12d9db6bf55
 2020-02-28 04:18:21 +00:00
Brian Gough
509c23def7 Merge pull request #2631 from overleaf/bg-maintenance-messages-in-editor 
display maintenance messages in editor

GitOrigin-RevId: 7d4fda60c5e2bd12d2cead2a9bff326b75e9c4e7
 2020-02-27 04:17:59 +00:00
Shane Kilkelly
7cbb00f207 Merge branch 'sk-token-csrf-protection' 
GitOrigin-RevId: e71f7264be45b665502150e9ffbb85b3fc94665e
 2020-02-26 04:24:01 +00:00
Timothée Alby
f5e2983a6b Merge pull request #2609 from overleaf/ta-cmg-recurly-email-update 
Add UI to Update Recurly Email

GitOrigin-RevId: 920a741fd9b4312f031bdd40e3d6bec48f1bd579
 2020-02-21 04:21:12 +00:00
Timothée Alby
b94e1791e0 Merge pull request #2617 from overleaf/ho-open-site-for-admins 
allow site to be accessible to admins when closed

GitOrigin-RevId: 71bdf329ce2a4e41533b2a65f45190277ea72dbb
 2020-02-21 04:21:03 +00:00
Timothée Alby
98f031e9aa Merge pull request #2619 from overleaf/ta-licence-attribute-fix 
Read Licence Attribute from Affiliation Instead of Institution

GitOrigin-RevId: 2294222e2bd0da473a303d3ffdc5ddb7d856f7f7
 2020-02-21 04:20:59 +00:00
Simon Detheridge
ab80c72565 Merge pull request #2602 from overleaf/hb-too-many-files-errors 
Too many files errors for new files modal

GitOrigin-RevId: a9e2db2e4d8624de4e062161781067ee0c68c4e0
 2020-02-19 04:20:47 +00:00
Simon Detheridge
72c5286622 Merge pull request #2587 from overleaf/msm-ns-disable-comment-button 
disable "add comment" button if feature is not available

GitOrigin-RevId: e054f138a84ec634cc777d76e8a288ba2c1b2ee3
 2020-02-13 04:20:40 +00:00
Chrystal Maria Griffiths
3785be1fec Merge pull request #2566 from overleaf/cmg-invalid-filename 
Suppress error for empty filename when still editing

GitOrigin-RevId: 42d7fa9af9b183603577effb5d1daaafa21ce065
 2020-02-13 04:20:22 +00:00
Jessica Lawshe
0a5f7c05a3 Merge pull request #2559 from overleaf/jel-optimize-anti-flicker 
Add Google Optimize anti-flicker snippet

GitOrigin-RevId: b3414a03e76ca699923a55221613c07fa7044fb3
 2020-02-06 04:19:57 +00:00
nate stemen
dda4ce18d3 Merge pull request #2556 from overleaf/cmg-missing-analytics 
Add missing Google Analytics events

GitOrigin-RevId: 37f8ca52829ea00bd73b2cd1e0045c48839ea970
 2020-02-04 04:18:59 +00:00
nate stemen
44f7053e87 Merge pull request #2564 from overleaf/revert-2497-pr-add-dropbox-survey-link 
Revert "Add dropbox survey link."

GitOrigin-RevId: c2c67843ed9d311193ccc526142d97c1730034c0
 2020-02-04 04:18:50 +00:00
Simon Detheridge
cd8693db40 Merge pull request #2540 from overleaf/spd-saml-post-gateway 
Add generic POST gateway to handle samesite=lax session cookies

GitOrigin-RevId: e50a0fde63659a77a047e545a22fba5339f16427
 2020-01-30 04:16:26 +00:00
Alasdair Smith
0d6cd8fca6 Merge pull request #2523 from overleaf/revert-2520-revert-2488-as-import-pr-708 
Bring back reverted Vendor web fonts PR

GitOrigin-RevId: 7430df7cefca120def048f8bbe2799b30772c686
 2020-01-29 12:07:22 +00:00
Simon Detheridge
08a35b8998 Merge pull request #2541 from overleaf/revert-2382-msm-remove-recaptcha-default-config 
Revert "Remove Recaptcha default config"

GitOrigin-RevId: 70e5b7b1f52e89a676fc0cea3654fbe5f59739ce
 2020-01-28 04:18:49 +00:00
Simon Detheridge
c35ae7024f Merge pull request #2524 from overleaf/sk-add-aria-attribs-on-close-buttons 
Add aria labels to close buttons ("X" on modal)

GitOrigin-RevId: 4255844e29d4b0eedb0acb36bb2356337c543bcd
 2020-01-28 04:18:45 +00:00
Simon Detheridge
2f1d6c0338 Merge pull request #2532 from overleaf/hb-fix-bonus-overflow 
Set a min width for the perks on the bonus page

GitOrigin-RevId: c767787c14c38790e5250c1647f392ec7d8a8861
 2020-01-22 04:23:13 +00:00
Simon Detheridge
3e8aeda5d3 Merge pull request #2497 from overleaf/pr-add-dropbox-survey-link 
Add dropbox survey link.

GitOrigin-RevId: cfb23c88a38833ff56170c35fea1c78b1172edd3
 2020-01-17 04:20:12 +00:00
Simon Detheridge
db27215760 Merge pull request #2521 from overleaf/ta-announcement-remove 
Remove Announcements

GitOrigin-RevId: 3fed602e89992ad5f4260134b87ade1e6e088cf7
 2020-01-17 04:19:59 +00:00
Alasdair Smith
9e36de9da0 Merge pull request #2520 from overleaf/revert-2488-as-import-pr-708 
Revert "[Imported] Vendor web fonts, (#708)"

GitOrigin-RevId: a9276168b880326fda51ba3d172d6cbfbdf74f6a
 2020-01-15 04:20:50 +00:00
Alasdair Smith
a084d620ae Merge pull request #2488 from overleaf/as-import-pr-708 
[Imported] Vendor web fonts, (#708)

GitOrigin-RevId: b286a0d4bac9d84f70bf9d4ff99220f67ce67425
 2020-01-15 04:20:37 +00:00
nate stemen
587c4ba129 Merge pull request #2471 from overleaf/cmg-ns-existing-item-modal 
display modal if file exists in drop location

GitOrigin-RevId: 2dbcbce26c32903f1acfdfbf7fdddb676c130098
 2020-01-03 04:21:47 +00:00
Alasdair Smith
f2ad7ebfc3 Merge pull request #2429 from overleaf/as-move-deps-to-bundle 
Move jQuery and Angular dependencies to bundle

GitOrigin-RevId: cee1507044438c8c435d934476f6ea6281215ccd
 2019-12-17 04:22:53 +00:00
Timothée Alby
5575281dec Merge pull request #2416 from overleaf/ta-sk-multi-select-fix 
Better UI feedback for multi-select, and "no file selected" case

GitOrigin-RevId: f415a19a0dc93a18a7f00e5854e2181c51f826b1
 2019-12-17 04:22:47 +00:00
Timothée Alby
0125a1f384 Merge pull request #2451 from overleaf/jel-fix-google-optimize 
Move Google Optimize snippet to after analytics create snippet

GitOrigin-RevId: 5a7e8dea738c44d30def7d8cd1ee0e4577db80ec
 2019-12-17 04:22:42 +00:00
Alasdair Smith
40d274092a Merge pull request #2437 from overleaf/revert-2436-revert-2408-as-dynamic-public-path 
Undo revert of Fetch dynamically fetched scripts from CDN

GitOrigin-RevId: e317f0e32bbf5da4badf74440622637a54ef5477
 2019-12-12 04:15:06 +00:00
Jessica Lawshe
827fb7119c Merge pull request #2444 from overleaf/jel-beta-test-saml 
Refactor account setttings SSO UI checks and allow beta testing

GitOrigin-RevId: 882c6aed107a2facfb0941bc49ef6cbd86473efb
 2019-12-09 15:24:15 +00:00
Jessica Lawshe
bf1d112d78 Merge pull request #2431 from overleaf/jel-sso-info-link 
Add wiki link to dash notification and remove unused notifications

GitOrigin-RevId: e766fcd27632b3d6b2c06c37c98849cde2718c6e
 2019-12-09 15:24:06 +00:00
Jessica Lawshe
609fe21402 Merge pull request #2438 from overleaf/jel-gallery-pagination 
Gallery pagination

GitOrigin-RevId: 0592f60bcc094360bd3d5eddd9251630a4a892b6
 2019-12-09 15:24:01 +00:00
Copybot
05800f0143 Merge pull request #700 from das7pad:perf-move-system-message-query 
GitOrigin-RevId: b39d6afeef14b868f4b5bc4784663ab5bcd8f84d
 2019-12-09 11:36:43 +00:00
Timothée Alby
2705aea54c Merge pull request #2435 from overleaf/ta-group-invite-form-fix 
Add UI Feedback To Group Invite Form

GitOrigin-RevId: aec05d586c4ccfc7739b6b94d1f49763ea229c6e
 2019-12-06 04:19:17 +00:00
Hugh O'Brien
d1a668ffda Merge pull request #2436 from overleaf/revert-2408-as-dynamic-public-path 
Revert "Fetch dynamically fetched scripts from CDN"

GitOrigin-RevId: c443fb278b7e53890d0e83cd02307fad939f5f8c
 2019-12-04 13:48:37 +00:00
Hugh O'Brien
687d3c1b22 Merge pull request #2408 from overleaf/as-dynamic-public-path 
Fetch dynamically fetched scripts from CDN

GitOrigin-RevId: b480f261a6b4ba2d6a8819fd0e7a354605ed9a82
 2019-12-04 12:22:43 +00:00
Jakob Ackermann
b17f29e695 [perf] lookup system messages from the project-list route only 
The messages are displayed above the project list only.
There is no need to query the system messages from ALL the other routes.

Note: the admin view uses the same variable, but injects an uncached
 value into the template.

Additional context at https://github.com/overleaf/web/pull/699

Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
 2019-12-03 20:43:42 +01:00
Tim Alby
eb13ceafd5 only show editor support buttons if support enabled 
GitOrigin-RevId: 8b5cb3c08eefa89673e5f1f16ba98ab57cad4788
 2019-12-03 14:20:56 +00:00
Tim Alby
154f1c9235 add help section in editor menu 
GitOrigin-RevId: 45347dec29d35a601ec967efeb918302aef395d1
 2019-12-03 14:20:51 +00:00
Jessica Lawshe
cbe22f5cc7 Add Google Optimize 
GitOrigin-RevId: 4c485be83456bf632d1b5f6790f2757d2b3aad54
 2019-12-03 14:20:41 +00:00
Alasdair Smith
26190da566 Merge pull request #2349 from overleaf/as-webpack-css 
Compile CSS using webpack

GitOrigin-RevId: 489834038667dde572ea5d9b4b9392b362259a09
 2019-11-28 10:39:09 +00:00
Miguel Serrano
debb82960c Added settings.salesEmail to web config (#2392) 
GitOrigin-RevId: 67b215e4141063fe00b29917324197923824ab8e
 2019-11-27 10:26:17 +00:00
Eric Mc Sween
d53373635d Merge pull request #2405 from overleaf/cmg-target-blank 
Add target _blank to blog post modal link

GitOrigin-RevId: d1407b628eba6cf4f95540371db7c4e108a16d3c
 2019-11-26 13:31:14 +00:00
Chrystal Maria Griffiths
0abe99d98f Merge pull request #2150 from overleaf/cmg-archiving-frontend 
Frontend for new archiving and trashing

GitOrigin-RevId: be8676ab6c2fea7f8fb23655772a008d067b2a78
 2019-11-25 15:59:10 +00:00
Jessica Lawshe
1882d7af7a Merge pull request #2362 from overleaf/jel-account-linking-default-redirect 
Change default redirect after linking to institution

GitOrigin-RevId: a80bd375e5b208c78944257cd31a9bd4b509c3c1
 2019-11-21 16:15:44 +00:00
Eric Mc Sween
1c0dc0a13f Merge pull request #2376 from overleaf/cmg-no-comment-blur 
Stop cancelling a comment on Safari from still creating it

GitOrigin-RevId: b2e6ca77caa9ba318d330f23dd88e04972c7c829
 2019-11-21 13:00:22 +00:00
Hugh O'Brien
bf9473fb41 Merge pull request #2320 from overleaf/as-unify-webpack-output 
Unify webpack output

GitOrigin-RevId: 5f5ae88f0698236fdce17cf87b4b524078dba4dd
 2019-11-18 11:21:42 +00:00
Eric Mc Sween
b5d7887dfb Merge pull request #2337 from overleaf/jel-saml-already-linked 
Institution linking and unlinking

GitOrigin-RevId: 1c3665fc66513c3e88a62ed477800c17759459ff
 2019-11-12 14:18:13 +00:00
Timothée Alby
e3c8de035a Merge pull request #2338 from overleaf/fix-scroll-overflow 
[misc] do not force a scrollbar on the project list view

GitOrigin-RevId: e6bed4566afd9b0bca38506028b1133376f90826
 2019-11-12 09:15:14 +00:00
Timothée Alby
4f7c2deca5 Merge pull request #2345 from overleaf/ta-itm-campaign-improvements 
ITM Fields Improvements

GitOrigin-RevId: 7e9a46dc2b935e2cad8cb8d2e21dfa3c81291c2d
 2019-11-12 09:15:05 +00:00
Miguel Serrano
35632da051 Added flag to disable URL file linking (#2316) 
GitOrigin-RevId: c178d2d629b361534d1b96bf80de015a72ab2047
 2019-11-06 10:12:38 +00:00
Timothée Alby
5112bd3696 Merge pull request #2314 from overleaf/cmg-remove-rt-toggle 
Remove Rich Text test control in left menu

GitOrigin-RevId: 9f6c554b955b75d28dd0f376d7fa5e3d6b3dc8a9
 2019-11-04 10:07:20 +00:00
Shane Kilkelly
365bd08425 Merge pull request #2306 from overleaf/sk-fix-restricted-users-redux 
Hide review panel UI and data for restricted users

GitOrigin-RevId: c2211b71860f2d7e8b54c40a7a89a1dd2e6a5d5a
 2019-10-31 10:37:19 +00:00
Alasdair Smith
78c30015f4 Merge pull request #2265 from overleaf/as-move-vendored-deps 
Move vendored dependencies out of output directory

GitOrigin-RevId: bad086bdc2a80f9df5d3f934098cb7b05e8f6db5
 2019-10-30 11:35:56 +00:00
Jessica Lawshe
4f637f14b5 Merge pull request #2299 from overleaf/as-cleanup-express-locals 
Clean up express locals

GitOrigin-RevId: f57e7c57913cbf894a365c5ae9dd2810245a01ae
 2019-10-29 15:58:53 +00:00
Jessica Lawshe
42589f39a8 Merge pull request #2279 from overleaf/jel-empty-dash 
Dashboard notifications when empty

GitOrigin-RevId: da27828b44798a63a32049708eaebb98bcb07f3b
 2019-10-29 15:58:48 +00:00
Eric Mc Sween
bf5df0f235 Merge pull request #2285 from overleaf/jel-institution-information-link 
Add institution information link

GitOrigin-RevId: 72116311dfaddae145b4cbdbadbf039b30857890
 2019-10-28 14:29:23 +00:00
Eric Mc Sween
44ba0895fe Merge pull request #2286 from overleaf/jel-institution-email-primary-tooltip 
Tooltip for "Make Primary" for SSO emails

GitOrigin-RevId: 443cd032d4275ba486a632e92104299997c71bbc
 2019-10-28 14:28:59 +00:00
Timothée Alby
4d564d5cf1 Merge pull request #2258 from overleaf/ta-recurly-custom-fields 
Recurly Custom Fields Tracking

GitOrigin-RevId: f29f56cf7d0dfa91a8f4152897ba6bd897cb6238
 2019-10-25 08:38:57 +00:00
Timothée Alby
61243338be Merge pull request #2284 from overleaf/jel-user-settings 
Add type="button" to prevent form submission

GitOrigin-RevId: 747d389ea52f5f32762f98bab3e647b14572c50d
 2019-10-25 08:38:50 +00:00
Eric Mc Sween
dad0b56813 Merge pull request #2244 from overleaf/em-ownership-transfer-frontend 
Project ownership transfer for regular users

GitOrigin-RevId: 70782be0b1c59980dce0ad61ff2a7fbc1dbf0566
 2019-10-23 12:58:52 +00:00
Eric Mc Sween
03bbd4f698 Merge pull request #2256 from overleaf/ta-event-tracking-cleanup 
Event Tracking Cleanup

GitOrigin-RevId: 9c857b5d92f9f40a87c2aec2e76c99a3744fddad
 2019-10-23 12:58:44 +00:00
Alasdair Smith
0def0eaa41 Merge pull request #2261 from overleaf/as-remove-unused-deps 
Remove unused vendored dependencies

GitOrigin-RevId: aa4cb3e95f9b19f69adf4eefca06bbcb5e222154
 2019-10-22 11:01:49 +00:00
Jessica Lawshe
28a4be296f Merge pull request #2251 from overleaf/jel-dashboard-institution-notifications 
Institution SSO dashboard notifications

GitOrigin-RevId: c80117c2732fafdc9d09eed69db06a26ad28a663
 2019-10-21 16:23:19 +00:00
Simon Detheridge
123f74da72 Merge pull request #2227 from overleaf/ns-title-rename-overlap 
fix title rename overlap with online collaborators

GitOrigin-RevId: ccb5065a73e3e8e4079d14e029d57c302f9fc0cb
 2019-10-18 16:41:29 +00:00
Simon Detheridge
8a46a385f7 Merge pull request #2241 from overleaf/ta-file-preview-footer 
Move File Preview Footer to Header

GitOrigin-RevId: b6c8d09f82520ceaebf0c6ee414445e4487e8894
 2019-10-18 16:41:19 +00:00
Jessica Lawshe
34c04660a6 Merge pull request #2250 from overleaf/jel-saml-session-email 
Non canonical institution email in session

GitOrigin-RevId: b70971f6f42391391a42ba6ff214c14a275461d3
 2019-10-17 16:29:13 +00:00
Alasdair Smith
6a2b3a39a9 Merge pull request #2248 from overleaf/as-fix-cjk-prod 
Disable CDN for PDFjs cmaps path

GitOrigin-RevId: 52658564f22f94b7bd9893c499c5c58429a360d0
 2019-10-16 16:29:04 +00:00
Alasdair Smith
9cf73f965c Merge pull request #1440 from overleaf/as-amd-webpack 
Bundle all frontend code with webpack

GitOrigin-RevId: 1bd93dad516c456fe1649193868e841e20459b0b
 2019-10-16 10:36:21 +00:00
Eric Mc Sween
6f966ceb3d Merge pull request #2239 from overleaf/em-collabs-frontend 
Change collaborator permissions

GitOrigin-RevId: 3627181d201e6d96734f89a380703953424f0fdf
 2019-10-15 13:30:00 +00:00
Eric Mc Sween
2011189dc4 Merge pull request #2200 from overleaf/ho-add-noindex-option 
adds settings.robotsNoindex setting to stop robots indexing site

GitOrigin-RevId: 0c2c3aee215dd3ef1cca8cde4e0693a4bd39c6ef
 2019-10-15 13:29:47 +00:00
Eric Mc Sween
750a4879e7 Merge pull request #2228 from overleaf/ns-title-overflow 
allow line breaks to happen

GitOrigin-RevId: d4255739d17969dbfa514e841bf21c738dbf9020
 2019-10-14 18:01:53 +00:00
Eric Mc Sween
9a492257af Merge pull request #2220 from overleaf/jel-email-confirmation 
Email confirmation only for non-institution SSO emails

GitOrigin-RevId: 95bd0ce077031c11b9d60d2f736a1abe7431a265
 2019-10-14 13:37:57 +00:00
Jessica Lawshe
625b4c9339 Merge pull request #2216 from overleaf/jel-saml-beta-account-settings 
Allow SAML beta testing on Account Settings

GitOrigin-RevId: 6a2c60a3cbab3d9d0cdcc72e23f5d75f7702f89c
 2019-10-09 13:13:40 +00:00
Jessica Lawshe
5c918bed94 Adding an institution email that must be linked 
GitOrigin-RevId: 9ba42a07fb386275cf6d81a7d4b91a7f974faf15
 2019-10-08 13:29:17 +00:00
Jessica Lawshe
ae423b5800 SAML feature by special link 
Allows for testing SAML linking before release

GitOrigin-RevId: 8a8c01aa15f04ba1749e93f4feadb7bf1643c783
 2019-10-08 10:52:30 +00:00
Jessica Lawshe
ea0270dbdd Merge pull request #2168 from overleaf/pr-restrict-main-file-options 
Restrict main file options based on extension.

GitOrigin-RevId: f7d7a61c0454621dd8bc6ab5edce8a89721018ea
 2019-10-03 14:34:41 +00:00
Jessica Lawshe
86d844baf2 Merge pull request #2193 from overleaf/jel-account-settings-processing 
Add processing message to affiliation UI

GitOrigin-RevId: 2ceb9c7815da778f832715cac5c00bac3a32c127
 2019-10-02 14:22:20 +00:00
Simon Detheridge
c1f43ad60e Merge pull request #2183 from overleaf/em-plans-faq 
Allow linking inside plans FAQ invoice answer

GitOrigin-RevId: 20fb07f0f8fafee65efaa1f4467013cccc7a154d
 2019-10-01 12:10:06 +00:00
Jessica Lawshe
962c5cc273 Merge pull request #2192 from overleaf/jel-account-settings-ui 
Remove processing message in account settings UI

GitOrigin-RevId: 6938e386819ca0d2923f56c8a1ea50e2faa20121
 2019-09-30 16:48:39 +00:00
Eric Mc Sween
039b5eaba0 Merge pull request #2167 from overleaf/jel-saml-account-settings-layout 
Account settings layout for institution SSO

GitOrigin-RevId: d9c9e5eeb3b4a215456b0f5294139c1b8d4968c3
 2019-09-30 13:36:41 +00:00
Simon Detheridge
deaf76be39 Merge pull request #2135 from overleaf/sk-hide-info-readonly-token-access 
Restrict information and features for token-read-only users of a project

GitOrigin-RevId: 98512fb9a916f430fd635fd5634c37799476010d
 2019-09-18 10:14:39 +00:00
Timothée Alby
561d14bbb6 Merge pull request #2125 from overleaf/spd-editor-reconnect-improvements 
Track connection state in ConnectionManager and improve retry logic

GitOrigin-RevId: b81b8376f7210e89e0dc102e68bdf2092c1ae8ad
 2019-09-10 14:44:24 +00:00
Hugh O'Brien
911a2ded4d Merge pull request #2133 from overleaf/hb-fix-lost-connection-typo 
Adding space in reconnection error

GitOrigin-RevId: 76ec0e999fafcddc47301e1f39a2d63db1a12eae
 2019-09-10 10:09:06 +00:00
Timothée Alby
294ce1a13c remove dead code around syncUserToSubscription (#2122) 
GitOrigin-RevId: d489365a4bceb9d675e6a75b25be61baa3aa010e
 2019-09-04 11:45:24 +00:00
Eric Mc Sween
869fcf7952 Merge pull request #2089 from overleaf/em-mailchimp-unsubscribe 
Handle error on Mailchimp unsubscribe when deleting users

GitOrigin-RevId: 8923480e6d50de45003fd7741610f995753a412b
 2019-09-03 15:25:01 +00:00
Timothée Alby
03460ba229 Merge pull request #2020 from overleaf/ta-recurly-sca 
SCA Integration

GitOrigin-RevId: d7935584f87ec7c7339d050430efc87420a39de1
 2019-08-22 12:10:46 +00:00
Eric Mc Sween
358cd22f54 Merge pull request #2087 from overleaf/subscription-invoices-link 
Add Link to Invoices for Recurly Subscriptions

GitOrigin-RevId: dd3aa999c26988f2bd42b0db83dbfb0ce586a0a7
 2019-08-20 12:59:58 +00:00
Eric Mc Sween
25970e94da Merge pull request #2078 from overleaf/update-closed-message 
Reference status page from maintenance page

GitOrigin-RevId: 6ddda6e479d78d38be3c23ff7e82cd23e07059cb
 2019-08-20 12:59:52 +00:00
Eric Mc Sween
1fc64fc4e2 Merge pull request #2084 from overleaf/ta-new-subscription-country 
Fix Country Auto-Selection on New Subscription Form

GitOrigin-RevId: fdf7b197017ee9ce527dd7737240756ff16d206a
 2019-08-20 12:59:47 +00:00
Eric Mc Sween
1bb9d2f944 Merge pull request #2049 from overleaf/jel-cms-decaf-cleanup 
CMS eslint and post decaf cleanup

GitOrigin-RevId: 67d98668f0b9c1d8f973116dc689486ef418a3fd
 2019-08-13 12:49:46 +00:00
Eric Mc Sween
72ea7eb5f0 Merge pull request #1992 from overleaf/pr-history-file-selection-improvements 
History file selection and scrolling improvements

GitOrigin-RevId: e5f31eca07a72b25245f8883aec1664c320c0788
 2019-08-13 12:49:32 +00:00
Eric Mc Sween
83495f4559 Merge pull request #2037 from overleaf/hb-detect-changes-pre-export 
Detect for uncompiled changes before export

GitOrigin-RevId: a8b044c79ea4a6678388130d5ce77a05693c2d60
 2019-08-06 12:34:37 +00:00
Timothée Alby
7785c7b59e Merge pull request #2029 from overleaf/ta-build-main-recurly-3 
Load Recurly JS Separately

GitOrigin-RevId: 8baa2be76fa9d8a47676bc0bd0a80f4c05cc1600
 2019-07-31 15:44:44 +00:00
Timothée Alby
befa4e932e Merge pull request #2027 from overleaf/ta-build-main-recurly-2 
add main-recurly.js to Gruntfile

GitOrigin-RevId: 5527f97394efe6ca3d8c206276c46993547c8edc
 2019-07-31 10:48:57 +00:00
Timothée Alby
ef9b487a60 Merge pull request #2019 from overleaf/jel-remove-oauth-migration 
Remove unused OAuth link/unlink migration

GitOrigin-RevId: 20fce5a714f5897a1b5a93a65156f5368f2d1c65
 2019-07-31 08:33:37 +00:00
Timothée Alby
b9ab0edf69 Merge pull request #2015 from overleaf/ta-recurly-upgrade 
Upgrade Recurly

GitOrigin-RevId: 9a7c4804d2fafa31ea634498359dbfd95416b2ae
 2019-07-31 08:33:31 +00:00
nate stemen
49ac91efe6 Merge pull request #2006 from overleaf/ns-project-import-dash-improvements 
project import dash improvements

GitOrigin-RevId: 4e8ce6bdef7d22acff1746981a513ae1ef7a4539
 2019-07-29 14:56:14 +00:00
Simon Detheridge
3b3e9e79fa Merge pull request #2007 from overleaf/bg-enable-doc-hash-checking-for-all-users 
enable doc hash checking for all users

GitOrigin-RevId: 9f26580bf21791669361cc84ca2fa561b1bb3f50
 2019-07-25 11:14:09 +00:00
Jessica Lawshe
0a2a32120f Use v2 data for OAuth providers 
GitOrigin-RevId: 09df3253c283b3196bc48a0440e9ea5f1eb20c9c
 2019-07-23 10:59:53 +00:00
Simon Detheridge
4cf480a448 Merge pull request #1965 from overleaf/jel-remove-v1-login 
Remove login to v1 via v2

GitOrigin-RevId: e5ba86786d14c5a2be87aff6b38cfd807b5cd053
 2019-07-22 15:31:24 +00:00
Alasdair Smith
827814175f Remove sixpack (#1974) 
* Remove unused sixpack AB test

* Remove unused sixpack AB test

* Remove unused sixpackDomain global

* Remove unused Sixpack file

* Remove sixpack from frontend

* Remove unused sixpack-client package

GitOrigin-RevId: cdd4acf91cb045db93485f09dcb5ec63e43d01dc
 2019-07-18 14:35:29 +00:00
Simon Detheridge
941662ecca Merge pull request #1977 from overleaf/jel-remove-schema-attr 
Remove structured data HTML attributes

GitOrigin-RevId: abd45205af37452abb90bbbfdf460955ff75c218
 2019-07-18 14:35:15 +00:00
Simon Detheridge
959dfee6bf Merge pull request #1986 from overleaf/ns-project-timeout-wording 
update wording on timeout modal

GitOrigin-RevId: 51b0dd1ba8625d2b49178248e7e0725fd4188e36
 2019-07-18 14:34:53 +00:00
Simon Detheridge
748a21d74c Merge pull request #1975 from overleaf/em-one-time-login-landing-page 
Landing page for one-time login

GitOrigin-RevId: d7453e7f3dbf12062cc45108e4cb2ebb7b042a76
 2019-07-18 14:34:37 +00:00
Ersun Warncke
23ff7c23e8 add custom error page for v1 project if no overleaf id 
GitOrigin-RevId: 538c68c568c9138f26353d5492f4aa9d66fbae19
 2019-07-18 11:12:47 +00:00
Ersun Warncke
d624c29b6f remove v1 deps for password change/reset 
GitOrigin-RevId: be25f19ae589c50bfde0b170860127fa8d6f63b7
 2019-07-17 15:09:24 +00:00
Jessica Lawshe
6e09af6fbe Merge pull request #1971 from overleaf/jel-settings-add-aria-label 
Update label to match input ID

GitOrigin-RevId: 849c9d49d861cf3b5645496b5e4eed1dc6d7392a
 2019-07-11 17:07:51 +00:00
Jessica Lawshe
ed6891e66d Merge pull request #1961 from overleaf/jel-remove-force-import-feature-check 
Remove checks for `force-import-to-v2`

GitOrigin-RevId: f94e8b0fb2f7f4416759583d5ca02babec345120
 2019-07-11 15:35:36 +00:00
Jessica Lawshe
d4a8f38736 Merge pull request #1942 from overleaf/jel-user-settings-form-msg 
Move user settings form message next to submit button and add ID attributes

GitOrigin-RevId: 3d87242e5a7211f9fa58b07f38a278fb94019046
 2019-07-11 15:35:31 +00:00
Eric Mc Sween
545b57d6be Merge pull request #1939 from overleaf/jel-no-search-results 
Show message when there are no learn wiki search results

GitOrigin-RevId: cb1600baeb4a9860575385be78a825cb3942903a
 2019-07-04 12:51:22 +00:00
Timothée Alby
e029616ed4 Merge pull request #1914 from overleaf/jel-no-pw-message 
Check for password on delete modal

GitOrigin-RevId: a2ec40b9c73e92490a9dfd0377b10f9d1831f56f
 2019-07-01 14:06:42 +00:00
Miguel Serrano
dc54a261e3 Merge pull request #1907 from overleaf/as-fix-tag-project-count 
Fix tag project count

GitOrigin-RevId: 60236571403f8cc02f70bbe49e652ef18bbeab4d
 2019-06-27 10:32:01 +00:00
Simon Detheridge
bd3f59c22a Merge pull request #1895 from overleaf/jel-oauth-db-flip 
Add setting var for OAuth data source

GitOrigin-RevId: e8a2ce588c7b5c8a9cf2c782d0434b421df7b356
 2019-06-25 11:22:17 +00:00
Simon Detheridge
14c176a832 Merge pull request #1896 from overleaf/as-remove-v1-return-message-flag 
Remove unused v1-return-message feature flag

GitOrigin-RevId: c8ffe88fc3294ec207ad8888254ee8d4b95cde05
 2019-06-25 11:21:58 +00:00
Simon Detheridge
6fc507aea3 Merge pull request #1883 from overleaf/as-remove-rttc-beta-program 
Move rich text track changes out of the beta program

GitOrigin-RevId: 4b23a42f3b2ef53012b5c6cca310fe82de5d9a0c
 2019-06-21 13:58:52 +00:00
Alasdair Smith
f83ab4ec3b Merge pull request #1767 from overleaf/as-color-contrast 
Improve colour contrast

GitOrigin-RevId: 56796839e5c2e741e85bc849399cb28d3db36976
 2019-06-19 09:01:43 +00:00
Simon Detheridge
ab5b1b6dc4 Merge pull request #1870 from overleaf/spd-invalid-intent-sso 
Fix invalid intent errors when logging in with OAuth

GitOrigin-RevId: 20f88a24080b41256bd31b9fb55b68a872ded56b
 2019-06-18 15:48:29 +00:00
Simon Detheridge
08861187d5 Merge pull request #1834 from overleaf/ns-sd-synctex-fail-gooder 
display warning if synctex fails to return filename

GitOrigin-RevId: 1de5f9f06a03d6debc35cd4bace6cc921a634d6d
 2019-06-17 15:14:31 +00:00
Simon Detheridge
82672269c4 Merge pull request #1862 from overleaf/em-json-stringify 
Globally apply StringHelper.stringifyJsonForScript()

GitOrigin-RevId: 82dc812a43a1e6f389471380a6a430c0a18dcec2
 2019-06-17 15:14:25 +00:00
Brian Gough
c242a8d4c1 Merge pull request #1853 from overleaf/bg-check-doc-hashes-staged-rollout 
enable sharejs hash checking

GitOrigin-RevId: 2c71d239b2f5ee2bee6baf03dd54aaa8afc6fae7
 2019-06-13 08:47:52 +00:00
nate stemen
642081dd17 Merge pull request #1802 from overleaf/jel-oauth-hide-when-not-linked 
OAuth provider check and capitalize button text

GitOrigin-RevId: afa2e8301d5141da178d88304932c5736d8632c4
 2019-06-03 18:32:13 +00:00
Hugh O'Brien
d4eb71b525 Merge pull request #1788 from overleaf/ta-ensure-can-delete-account 
Prevent Subscription Owner from Deleting their Account

GitOrigin-RevId: bd60484bdfb6381216cfc0799e45b28300014ca0
 2019-05-28 15:51:27 +00:00
Simon Detheridge
ff4e0013cd Merge pull request #1809 from overleaf/ns-escape-archive-translation 
treat translate call as var, not string

GitOrigin-RevId: db1b40182bbfabef4ea31b2e1923bb28921900b0
 2019-05-28 09:33:31 +00:00
Timothée Alby
d86abf49e6 Merge pull request #1729 from overleaf/ta-show-last-modified 
Show LastUpdatedBy on Dashboard

GitOrigin-RevId: 11760e575a46f061d4aa9059a0c1e813b9adb1f9
 2019-05-21 13:39:29 +00:00
Jessica Lawshe
e03b5ae691 Merge pull request #1741 from overleaf/jel-manage-linked-accounts 
Manage linked accounts via v2

GitOrigin-RevId: 09a7af361e1fc3c30bd01f7876fc17d651f60f06
 2019-05-20 16:10:46 +00:00
Alasdair Smith
dc09095ae7 Merge pull request #1756 from overleaf/pr-resize-ace-when-toggling-pdf 
Resize Ace when toggling PDF view

GitOrigin-RevId: 77e6fe662eb67f2ec39a00f42a35026f6a696eb9
 2019-05-10 08:56:21 +00:00
Simon Detheridge
5517adcbd1 Merge pull request #1726 from sharelatex/hb-sso-password-setting 
Check for password from v1 before showing password change form

GitOrigin-RevId: 58ef0f9d3c8ce3ab7ca51d3538f1be13f05d4658
 2019-04-25 14:37:38 +00:00
Simon Detheridge
16f905358a Merge pull request #1690 from sharelatex/cmg-color-tags 
Color-code tags/folders

GitOrigin-RevId: d8dcb90b861dd61c1bc502e0b67556dcd772b42e
 2019-04-25 14:37:32 +00:00
Simon Detheridge
3990a5d736 Merge pull request #1724 from sharelatex/ta-subscription-canceled-page 
Add Subscription Canceled Page

GitOrigin-RevId: b490ff008dd888911e8168606d90ae92662c0745
 2019-04-25 14:37:15 +00:00
Timothée Alby
967973f354 Only show label version button for users with write permission (#1665) 
Only show label version button for users with write permission

GitOrigin-RevId: f0a6504b51c1e9018942592ad6784599694c571a
 2019-04-23 14:35:32 +00:00
Timothée Alby
85e7f688d5 Display Pricing Exceptions on Subscription Dashboard (#1720) 
Display Pricing Exceptions on Subscription Dashboard

GitOrigin-RevId: 31de89824db70b7af1f8704e6da592064ce44bfd
 2019-04-23 14:35:21 +00:00
Timothée Alby
44ba16bb7c Fix Wording in Subscription Cancellation Flow (#1723) 
Fix Wording in Subscription Cancellation Flow

GitOrigin-RevId: 27b89982d0ac9d4bc9e9b985df2dd515253a1368
 2019-04-23 14:35:14 +00:00
Timothée Alby
54186d9db1 Add linked accounts section to user settings page (#1705) 
Add linked accounts section to user settings page

GitOrigin-RevId: d2bb26a3bfb3946144a05b98f58d50a2c57f3040
 2019-04-23 14:34:55 +00:00
Jessica Lawshe
1306de81e1 Merge pull request #1711 from sharelatex/pr-fix-tc-toggle-ie 
Fix review panel toggles in IE11.

GitOrigin-RevId: f8c0c8191a8299da87c6308749bace0d7bf8bca8
 2019-04-17 14:14:27 +00:00
Jessica Lawshe
f455a11aa8 Merge pull request #1655 from sharelatex/jel-user-must-reconfirm 
Reconfirm user accounts

GitOrigin-RevId: 0343ff745e881cd51b5efbfb97404b6b926905c8
 2019-04-17 14:14:19 +00:00
Paulo Jorge Reis
f2fbdcc078 Merge pull request #1718 from sharelatex/revert-1667-pr-add-post-integration-survey-link 
Revert "Add survey link in the projects list sidebar."

GitOrigin-RevId: 22b3a9bce5e53d54929f9593af4156b668665de2
 2019-04-17 10:45:15 +00:00
Paulo Jorge Reis
5a6cdf0999 Merge pull request #1679 from sharelatex/cmg-dashboard-owner 
Fix ordering by Owner on the dashboard

GitOrigin-RevId: ec780ae8de5221e151f970638f3fa55c00bd6767
 2019-04-17 10:26:03 +00:00
Paulo Jorge Reis
6c6bc1216a Merge pull request #1670 from sharelatex/pr-fix-contrast-issues 
Fix contrast issues (and others)

GitOrigin-RevId: 5882978b70163e65efdf0ef7d5f82a8fc29b48ec
 2019-04-17 10:25:55 +00:00
Shane Kilkelly
0773311805 Merge pull request #1674 from sharelatex/sk-email-make-primary-tooltip 
Change the wording on emails from 'default' to 'primary'

GitOrigin-RevId: e09792f6fba73b626c09d8f1bf4298b6e9780d15
 2019-04-13 01:57:15 +00:00
Chrystal Maria Griffiths
36d0e8e199 Merge pull request #1654 from sharelatex/ns-add-status-page 
add status.overleaf.com to 500 page

GitOrigin-RevId: 47988918a4c2ea83b2edbd9f850d65a0d2bcdf82
 2019-04-10 09:52:46 +00:00
Chrystal Maria Griffiths
5d6a307234 Merge pull request #1664 from sharelatex/as-fix-read-only-comment 
Only show add comment button if user has permission

GitOrigin-RevId: e2de9ec435eff45d575a368f07ff40416ed43f1f
 2019-04-10 09:52:41 +00:00
Chrystal Maria Griffiths
ab6565beb8 Merge pull request #1697 from sharelatex/cmg-leave-archived 
Leave an archived project

GitOrigin-RevId: c1da7fdff9ae90b9992ed99dbcff3e7ee31ec4d9
 2019-04-10 09:52:36 +00:00
Paulo Jorge Reis
9c5c6922b9 Merge pull request #1626 from sharelatex/pr-history-drag-and-drop-selection 
History drag and drop selection

GitOrigin-RevId: d2bc0dfc2e2634553224b7bef2ac5d926d42bf01
 2019-04-09 10:11:13 +00:00
Paulo Jorge Reis
9e63211a17 Merge pull request #1680 from sharelatex/cmg-hide-unarchive 
Only show unarchive button for project owners

GitOrigin-RevId: 5990be70cfcd9cf0708248d78845dc163a59a8b3
 2019-04-08 10:31:10 +00:00
Paulo Jorge Reis
e6943e8e71 Merge pull request #1667 from sharelatex/pr-add-post-integration-survey-link 
Add survey link in the projects list sidebar.

GitOrigin-RevId: 085f969336e81d546c51043c3ab9dc63585f97fb
 2019-04-08 10:14:19 +00:00
Alasdair Smith
9ff021cc88 Merge pull request #1676 from sharelatex/as-upgrade-pdfjs-2.0.943 
Upgrade PDFjs to v2.0.943

GitOrigin-RevId: 79081841d64558a7fe82055c172893533466c4eb
 2019-04-01 09:27:32 +00:00
Simon Detheridge
385da07930 Merge pull request #1675 from sharelatex/spd-zip-file-limit-ui 
Display more descriptive errors when uploading a project fails

GitOrigin-RevId: e206ca0d595f927ab141fb901644906f000160f8
 2019-03-28 15:14:30 +00:00
Simon Detheridge
364561d5fb Merge pull request #1666 from sharelatex/cmg-rttc-typo 
Remove duplicate text on review panel

GitOrigin-RevId: 20d37f392ed28ebbe31bae4f66892414b2966b87
 2019-03-25 16:34:18 +00:00
Simon Detheridge
f9594707ca Merge pull request #1662 from sharelatex/as-fix-wrong-favicon 
Fix missed favicon path update and make track-changes page inherit from layout

GitOrigin-RevId: e702b965b7445d86193b3b914d40d91a9a3345e3
 2019-03-25 15:52:44 +00:00
Simon Detheridge
cd9ed1dd6b Merge pull request #1663 from sharelatex/cmg-rttc-typo 
Fix lack of whitespace typo on review panel

GitOrigin-RevId: cfbbf421800af479f148d2006b96242acef7f275
 2019-03-25 15:52:38 +00:00
Simon Detheridge
d2e053f456 Merge pull request #1610 from sharelatex/cmg-reintroduce-beta 
Revive the beta program in the settings area

GitOrigin-RevId: 40024210cba08de96805d58147b6a0fe166a7d43
 2019-03-22 12:28:36 +00:00
Alasdair Smith
e6e3c023ed Merge pull request #1635 from sharelatex/as-fix-broken-chat-mathjax 
Fix broken messages in chat due to mathjax XSS filtering

GitOrigin-RevId: 8d5eb1f4df6496cafabff4669e5e59633c160647
 2019-03-18 12:12:10 +00:00
Alasdair Smith
41f75b5936 Merge pull request #1543 from sharelatex/as-fix-potential-angular-xss 
Fix potential Angular XSS issues

GitOrigin-RevId: a18a609a25b29e910cb78e28a37398417cfe4842
 2019-03-18 10:37:15 +00:00
Timothée Alby
1edf1964c8 Merge pull request #1607 from sharelatex/spd-succserror 
Don't show 'No errors' message if PDF generation fails

GitOrigin-RevId: 7ed454b489dcef419c51f48b6c5b3920d5558a79
 2019-03-14 16:02:32 +00:00
Timothée Alby
b86a949f50 Merge pull request #1485 from sharelatex/cmg-comments-track-changes 
Add comments highlighting to rich text track changes

GitOrigin-RevId: 7f81490417cc228db5f6f687c309a4e39c0b25d5
 2019-03-11 11:08:10 +00:00
Timothée Alby
89f31d71e3 Merge pull request #1603 from sharelatex/spd-admin-panel-buttons-not-working 
Don't use multipart/form-data for admin panel buttons

GitOrigin-RevId: 97c265a1c0addbddf5628d5e0c70fedb38bda75d
 2019-03-11 11:07:45 +00:00
Timothée Alby
e1fb28ae28 Merge pull request #1598 from sharelatex/jel-wiki-search 
Stop search bar clearing on enter

GitOrigin-RevId: 54d0de33fc196ea97b3f8628442704475aa959dd
 2019-03-11 11:07:34 +00:00
Timothée Alby
72ae3f3aa5 Merge pull request #1601 from sharelatex/hb-metrics-email-bugfixes 
Fixes for unsubscribing from metrics email

GitOrigin-RevId: 7d7ae79275d6216ef2b44d2e75c51fabf460ef65
 2019-03-11 11:07:20 +00:00
Douglas Lovell
24da4799ed Merge remote-tracking branch 'origin/jel-payment-countries' 
GitOrigin-RevId: 412422397ad36408566899b7b2bcbbaabf88138b
 2019-03-11 11:05:58 +00:00
Douglas Lovell
ce8695c951 Merge branch 'dcl-i1261b' 
GitOrigin-RevId: 2d6c318e12220f39309238a2c7c76650cefa8be6
 2019-03-11 11:05:47 +00:00
Douglas Lovell
44dd7c1c75 Merge remote-tracking branch 'origin/as-fix-email-address' 
GitOrigin-RevId: 5fa0d5b540f0d7b79a1dab0c6dc345bcb06d04e2
 2019-03-11 11:05:36 +00:00
Simon Detheridge
96759a90f4 Merge pull request #1578 from sharelatex/jel-student-disclaimer 
Show disclaimer on student subscription trials

GitOrigin-RevId: dfac98e74b3bc34742a179193cc8ce92deb14229
 2019-03-11 11:04:46 +00:00
Hugh O'Brien
491c29bad1 Merge pull request #1569 from sharelatex/hb-v2-metrics-email-opt-out 
v2 metrics email opt out and last sent tracking

GitOrigin-RevId: d45ac653c26e780dc380883c0ac1da7436bf8c2b
 2019-03-11 11:03:39 +00:00
Douglas Lovell
9b6ac8f715 Merge remote-tracking branch 'origin/ta-entity-create-form-fix' 
GitOrigin-RevId: e16167515c1c64bb350751fc1e748b719446a5b3
 2019-03-11 11:03:28 +00:00
Hugh O'Brien
f887bcb121 Merge pull request #1556 from sharelatex/cmg-search-clearing 
Stop search bar clearing on enter

GitOrigin-RevId: c3dc6236e3fd889b229f68633a17b396cbe45f60
 2019-03-11 11:03:07 +00:00
Paulo Jorge Reis
46c6d11574 Merge pull request #1544 from sharelatex/pr-fix-sl-history-toolbar 
Show the toolbar in SL history projects.

GitOrigin-RevId: ea268638c4ccfd2439a624fc10966f9b9c9ae86b
 2019-03-11 11:01:56 +00:00
Simon Detheridge
6e960492ff Merge pull request #1550 from sharelatex/spd-fix-broken-team-invite-accept 
Fix broken accept-team-invite page

GitOrigin-RevId: 0ba3c906548358931902beb48812257da16fc5db
 2019-03-11 11:01:10 +00:00
Simon Detheridge
5d8b8ff012 Merge pull request #1530 from sharelatex/spd-dont-cancel-groups-on-invite 
Only prompt for group cancellation if group is personal when accepting invite

GitOrigin-RevId: 921807b25d64f037859d303e28c40cdc12eb7685
 2019-03-11 11:00:48 +00:00
Simon Detheridge
c6b8ab3245 Merge pull request #1542 from sharelatex/as-fix-noopener 
Fix some missing noopener attributes

GitOrigin-RevId: a833fc26b2c783bb713f771fb2ae4a494e5fec63
 2019-03-11 11:00:17 +00:00
Jessica Lawshe
b8bb118fe3 Merge pull request #1528 from sharelatex/jel-portal-print 
Update portals for printing

GitOrigin-RevId: ad3861b8464f0e5a8d8e70daa0166ebcf7d2312d
 2019-03-11 10:59:47 +00:00
Chrystal Maria Griffiths
e379691767 Merge pull request #1521 from sharelatex/as-fix-noreferrer-noopener 
Add some missing rel="noreferrer noopener" attributes

GitOrigin-RevId: 470de17ba724b8ba544b736bf3a7682b3d499a5d
 2019-02-15 13:33:54 +00:00
Chrystal Maria Griffiths
9abea8ae5f Merge pull request #1516 from sharelatex/as-sanitize-team-notice 
Show sanitized HTML for team notice on subscription page

GitOrigin-RevId: 20256eed298a709d663bdfd0057e0d8462722a0c
 2019-02-15 13:33:28 +00:00
Timothée Alby
c4dd8b5da8 Merge pull request #1502 from sharelatex/jel-social-metatags 
Update `og` metatags and add protocol to image URL

GitOrigin-RevId: 9548ca5f378cb770e454bc75062e80bd1c3da9ac
 2019-02-12 15:48:00 +00:00
Timothée Alby
fb5caf7b63 Merge pull request #1504 from sharelatex/jel-portal-sign-in-redirect 
Add redircts when signing in/up via portal

GitOrigin-RevId: b84105f35b5f1c14fa57ca91e766b8b6de00ccd7
 2019-02-12 15:47:53 +00:00
Simon Detheridge
255981bdc2 Merge pull request #1486 from sharelatex/ta-subscription-dash-fix 
Fix Subscirption Dashboard Messaging

GitOrigin-RevId: 601b0df74c6f9f6bcc1c3ba6ecbf64721bc6fb99
 2019-02-11 11:42:34 +00:00
Ersun Warncke
81e3db260c Merge pull request #1472 from sharelatex/ew-add-close-site-and-private-disconnect-route 
Add close site setting and private disconnect all users route

GitOrigin-RevId: d078c053ba4e5f5c048f30f2a6d509966736b3e0
 2019-02-06 14:24:52 +00:00
Brian Gough
c51461da09 Merge pull request #1480 from sharelatex/bg-allow-separate-websocket-url 
allow setting separate wsUrl for websockets

GitOrigin-RevId: afd4f441397c6b4b402e342f1dec01c971847a0f
 2019-02-06 10:20:36 +00:00
Paulo Reis
f902eb7d4a Add the project name as a translation local var when rendering project invites. 
GitOrigin-RevId: 80f4b10adc142173c2194f56c55df8b3ce9f948b
 2019-02-04 17:59:05 +00:00
Chrystal Maria Griffiths
91594eee6d Merge pull request #1473 from sharelatex/as-fix-notification-translation 
Inject data into translation string to workaround removed potential XSS

GitOrigin-RevId: 6d9fa7050dafa1d48e3622765586eb4350dc514b
 2019-02-04 16:24:57 +00:00
Chrystal Maria Griffiths
2463fef390 Merge pull request #1454 from sharelatex/hb-subscriptions-page-messaging 
Subscription page messaging updates

GitOrigin-RevId: c29999d22636dfe11c55b3f6110a38992645fad3
 2019-02-04 16:24:35 +00:00
Chrystal Maria Griffiths
d9692b7f91 Merge pull request #1168 from sharelatex/cmg-range-prototype 
Rich text track changes pt. 1 view changes

GitOrigin-RevId: a50ba1491a46525894b32b87a8c05be0af90084d
 2019-01-30 14:07:06 +00:00
Timothée Alby
9a0dd31d8c Merge pull request #1061 from sharelatex/ja-remove-domain-license-code 
Remove deprecated domain license code

GitOrigin-RevId: c9eebe1a657b07b69d618cdb5e73b64782109714
 2019-01-29 12:08:29 +00:00
James Allen
286dd564e2 Merge pull request #1413 from sharelatex/pr-fix-history-default-file-selection 
Fix history default file selection and bug when comparing with version zero

GitOrigin-RevId: 7a123eaec908abd0178eba435f6820ad1e858da1
 2019-01-29 10:12:17 +00:00
James Allen
abb259a98b Merge pull request #1432 from sharelatex/as-upgrade-angular-sanitize-1.6.4 
Upgrade to angular-sanitize 1.6.4

GitOrigin-RevId: 80ce995bdc622c83f7247b1184dd9aeda381902e
 2019-01-29 10:12:02 +00:00
Timothée Alby
300e7d2f12 Merge pull request #1449 from sharelatex/ta-subscription-page-fix 
Fix Subscription Page for Users with Free Affiliation

GitOrigin-RevId: 3b3b2649c4ade40c7dc04e7c090748408de1fb6e
 2019-01-28 14:38:16 +00:00
Timothée Alby
6985f7d1a3 Merge pull request #1443 from sharelatex/jel-vat-plans-page 
Add VAT text to plans page

GitOrigin-RevId: a0693737cbf57bbb094e9ee77273bab1b687e619
 2019-01-28 14:38:08 +00:00
Douglas Lovell
2a72804434 Merge remote-tracking branch 'origin/as-different-share-copy-for-link-sharing' 
GitOrigin-RevId: e8a0dfdc175e036dd491db41ab17d70604dd0cc3
 2019-01-24 12:13:23 +00:00
Douglas Lovell
c294a8425b Merge remote-tracking branch 'origin/ns-new-file-modal' 
GitOrigin-RevId: 8017778fcf909edc499e9ca2a1bc5267f5a5906c
 2019-01-24 12:13:02 +00:00
Douglas Lovell
59d4bd6182 Merge remote-tracking branch 'origin/ns-new-file-modal-error-handling' 
GitOrigin-RevId: 4eadc159d779c10918e045e080e3b8be12e807a2
 2019-01-24 12:12:56 +00:00
Douglas Lovell
15061047a3 Merge remote-tracking branch 'origin/ns-check-institution' 
GitOrigin-RevId: a147965b4f3294215f1396e53d184ef4919fa6cd
 2019-01-24 12:12:51 +00:00
Ersun Warncke
ef9875c5a6 Merge pull request #1427 from sharelatex/ew-recaptcha 
add recaptcha validate middleware to reg and add recaptcha v3

GitOrigin-RevId: 35375b7887832b40bc570cf848cab9c62243443b
 2019-01-21 17:27:54 +00:00
Simon Detheridge
6650dfe494 Merge pull request #1419 from sharelatex/as-fix-invites-permissions 
Fix invite permissions in share modal

GitOrigin-RevId: 8fe073faebcd84236ac58671820166a2ad73262f
 2019-01-18 10:37:11 +00:00
Timothée Alby
837302327e Merge pull request #1407 from sharelatex/ta-team-status-free 
Hide Free v1 Teams on Subscription Dashboard

GitOrigin-RevId: ba805e77eb1f994158d3ceaa42be23943fca0f1f
 2019-01-17 15:15:44 +00:00
Timothée Alby
5169b4a73f Merge pull request #1415 from sharelatex/ta-trial-fix 
Check if Trial is Current in Subscription Page

GitOrigin-RevId: 7a7f562d321bc0f3a952c37f799760a7d42b7ba1
 2019-01-17 15:15:33 +00:00
Ersun Warncke
87b2c72449 Merge pull request #1410 from sharelatex/ew-make-logout-area-clickable 
make area around logout button clickable

GitOrigin-RevId: 8f080c6bedb7dce2ac39d877e8076b83241a4c12
 2019-01-16 17:21:21 +00:00
Ersun Warncke
330f878085 Merge pull request #1378 from sharelatex/ew-post-logout 
POST logout instead of GET

GitOrigin-RevId: b502a6ed945acd336d1a921e5c4c5433d8b7c7b7
 2019-01-15 16:48:00 +00:00
Simon Detheridge
b7daca4f3f Merge pull request #1379 from sharelatex/jel-import-page-mobile-friendly 
Mobile friendly project import page

GitOrigin-RevId: b33a3fa5113d4400beec065fe856a19967e68845
 2019-01-11 14:43:39 +00:00
James Allen
7ee0dcbd7c Merge pull request #1377 from sharelatex/as-deemphasise-download-zip 
De-emphasise download zip button if not the primary action

GitOrigin-RevId: 041c44109897c30ade9f5ed2ef47a416749a87a5
 2019-01-09 17:08:52 +00:00
James Allen
b969526c19 Merge pull request #1371 from sharelatex/as-fix-dash-user-stubs 
Handle UserStubs when linking projects with owners

GitOrigin-RevId: eb54df048ccf7fffd3feac14fbb5c8991efd47c3
 2019-01-09 13:41:06 +00:00
James Allen
1530062d00 Merge pull request #1370 from sharelatex/as-update-v1-tag-messaging 
Update messaging on v1 tags now that v1 dash is inaccessible

GitOrigin-RevId: 4e2ca9e58ccf9b9feb2e94e92a310f8ce949184e
 2019-01-09 13:40:55 +00:00
James Allen
563cdfd439 Merge pull request #1363 from sharelatex/as-gdpr-notice 
Add note about deleting a project if no owner to import status page

GitOrigin-RevId: 3c88ab66b6e8c351c7111c87ba3b8d9df701bdb4
 2019-01-08 13:02:19 +00:00
Alasdair Smith
42cf6a1216 Merge pull request #1362 from sharelatex/as-fix-status-page 
Fixes for import status page

GitOrigin-RevId: 65c18e1c0ea981bf6e5cc8b65045566e14d5fb12
 2019-01-08 12:02:58 +00:00
James Allen
1bddd03335 Merge pull request #1319 from sharelatex/ja-account-deletion-message 
Change account deletion message when v1 access is removed

GitOrigin-RevId: c81cc85042b30fcff998283cf1ffea0503d0ed40
 2019-01-07 11:33:30 +00:00
James Allen
87b983ec6b Merge pull request #1348 from sharelatex/as-tweak-import-status-page 
Tweak import status page

GitOrigin-RevId: df30c354dfeb27828225f535e3bfab782212ee60
 2019-01-07 11:33:19 +00:00
James Allen
0de359b70b Merge pull request #1345 from sharelatex/ja-remove-git-warning 
Remove warning about no git bridge in import modal

GitOrigin-RevId: 7b5f83c1ad5d419ddb418313cfb49b13672a1077
 2019-01-04 16:33:49 +00:00
Alasdair Smith
9737a04125 Merge pull request #1338 from sharelatex/as-remove-import-modal 
Don't show project import modal if feature flag is set

GitOrigin-RevId: f48d5e5cc795030d6c3332f5fde744d2e67f6366
 2019-01-04 10:51:47 +00:00
Ersun Warncke
985f0a97bc Merge pull request #1332 from sharelatex/ew-block-while-project-importing 
block loading project while importing

GitOrigin-RevId: b96589e5cae9faf269abefd4ea732992a350e68c
 2019-01-03 18:14:19 +00:00
Simon Detheridge
ec1867198f Merge pull request #1313 from sharelatex/as-import-copy 
Improved copy for import status page

GitOrigin-RevId: fa3e6792e7c703ea3a5127186385dcf661fef5e8
 2019-01-03 12:19:35 +00:00
Alasdair Smith
7112e65dc5 Merge pull request #1303 from sharelatex/project-import-refactor 
Project import refactor

GitOrigin-RevId: b4edc35cd4a14db0f4e6746d3da28cd94c351117
 2018-12-20 12:06:15 +00:00
Shane Kilkelly
97e357f772 Merge pull request #1260 from sharelatex/ja-remove-deprecated-v1-team-status 
Remove deprecated display of v1 team data in v2

GitOrigin-RevId: d0198e5ed325ff689f5381a0be05493af35e5f8d
 2018-12-20 10:55:52 +00:00
Douglas Lovell
740dce07a9 Merge remote-tracking branch 'origin/hb-publisher-management' 
GitOrigin-RevId: 746cb15097cdc7c4f4cbd9f029d5e456c9bfe3ad
 2018-12-18 13:42:56 +00:00
Paulo Jorge Reis
4563ce864c Merge pull request #1285 from sharelatex/pr-history-compare-labels-fixes 
History compare labels fixes

GitOrigin-RevId: 176750c4017e5511a22f1792e37ab8918a142ec3
 2018-12-18 11:48:49 +00:00
Alasdair Smith
1160620afc Merge pull request #1278 from sharelatex/revert-1240-as-import-status-page 
Revert "Import status page"

GitOrigin-RevId: aa667a7b158b38aeccc8251931cc20589dcb2bdd
 2018-12-17 15:45:36 +00:00
Alasdair Smith
56784c4089 Merge pull request #1240 from sharelatex/as-import-status-page 
Import status page

GitOrigin-RevId: 8855b910e8cdebb81d7b424e2e07b83e6bf2762a
 2018-12-17 14:01:24 +00:00
Paulo Jorge Reis
d5c651c132 Merge pull request #1276 from sharelatex/pr-fix-history-v1 
Undo rename and removal of the v1 history list controller.

GitOrigin-RevId: 7201214134e8c8988e49d99ebb308ea12010c694
 2018-12-17 12:16:20 +00:00
Paulo Jorge Reis
217bc180ac Merge pull request #1251 from sharelatex/pr-history-labels-compare 
History labels compare

GitOrigin-RevId: bd06223344e391ba8e6017ebb27bdc3920cf754c
 2018-12-17 10:10:48 +00:00
Jessica Lawshe
7666c8a481 Merge pull request #1236 from sharelatex/jel-password-reset 
Reset password via API request to v1

GitOrigin-RevId: 00b0306ca77df650595a762382a8a63b05a945f6
 2018-12-14 16:02:14 +00:00
Shane Kilkelly
a72b29efd8 Merge pull request #1259 from sharelatex/ja-sso-settings-link 
Add link from v2 settings page to manage linked accounts in v1

GitOrigin-RevId: 2aabd0669349023d6b0da520c55587feb19b5201
 2018-12-13 15:09:59 +00:00
Simon Detheridge
f3a10ac221 Merge pull request #1192 from sharelatex/ta-publisher-create 
Add Interface to Create Publishers

GitOrigin-RevId: 50af2d1c05821d20b1ec33e8f68a05d824e55c46
 2018-12-06 11:10:20 +00:00
Jessica Lawshe
028ad9c05b Merge pull request #1209 from sharelatex/jel-mobile-improvements 
Mobile improvements

GitOrigin-RevId: 4b2fa8b1ab12b7ca23a0a64aeadea90f7cfc6f4d
 2018-12-05 17:59:47 +00:00
James Allen
e603afe106 Merge pull request #1217 from sharelatex/ja-download-zip-version 
Add option to download zip file of version in history

GitOrigin-RevId: 11ffb9a3305e1e5e0492fccf2be41be7beb67d68
 2018-12-05 12:32:26 +00:00
Jessica Lawshe
f02e3e604b Merge pull request #1172 from sharelatex/jel-portal-templates-link 
Link to portal templates from project dash

GitOrigin-RevId: 303f65b9c5b85a23535479a7d06e70e75069db6c
 2018-12-03 19:13:45 +00:00
Douglas Lovell
aae0484458 Merge branch 'master' into dcl-i1207 
GitOrigin-RevId: c947041ca99860d4afb62ecfd28ba6fe1c717bfc
 2018-11-30 13:24:27 +00:00
Douglas Lovell
ed3147a58f Allow open from template button when lacking source 
GitOrigin-RevId: 8fd49bff6cc0f66d041bb70f9345b2744978be3a
 2018-11-30 13:24:23 +00:00
James Allen
ee800f7448 Merge pull request #1176 from sharelatex/ja-manage-v1-subs 
Manage v1 subscriptions from v2

GitOrigin-RevId: 1fd63b3630f781e8b4cc3dc1413966540e8d0076
 2018-11-30 10:43:37 +00:00
James Allen
1070cd36bb Merge pull request #1163 from sharelatex/ja-zotero 
Add support for Zotero linked files

GitOrigin-RevId: 917a881254949163126746667d6debc2a3f16941
 2018-11-28 11:35:27 +00:00
Timothée Alby
701ba90c7b Merge pull request #1182 from sharelatex/ja-dashboard-metrics-links 
Add links to metrics and hubs for groups and institutions

GitOrigin-RevId: ca83108e1d1541fdc805218ea12847b0d7a97cf8
 2018-11-26 13:43:05 +00:00
Paulo Jorge Reis
794e6e146d Merge pull request #1180 from sharelatex/pr-ieee-basic-styling-fixed 
IEEE basic styling fixed

GitOrigin-RevId: 2f3fb3850435b52cea5228ac4a0dd2c1a874e36c
 2018-11-22 15:32:58 +00:00
Paulo Jorge Reis
2f551922d6 Merge pull request #1179 from sharelatex/revert-1167-pr-ieee-basic-styling 
Revert "IEEE basic styling"

GitOrigin-RevId: 1e473bddcfbc9b1a8aef6f4dd23ea3a716eddd71
 2018-11-22 13:30:47 +00:00
Paulo Jorge Reis
41c12e2c52 Merge pull request #1167 from sharelatex/pr-ieee-basic-styling 
IEEE basic styling

GitOrigin-RevId: 43a308fa8ce49d7b809b21fc95aefb41dcbaf46e
 2018-11-22 11:11:34 +00:00
James Allen
49e19cad64 Merge pull request #1162 from sharelatex/ja-show-group-management 
Add group and institution membership and management info to subscription dashboard

GitOrigin-RevId: 1aba5d5a20cd00ff5090811d0f66dc9c4944dd60
 2018-11-20 11:03:56 +00:00
James Allen
0f1c732d15 Merge pull request #1130 from sharelatex/ja-subscription-dashboard 
Refactor subscription dashboard

GitOrigin-RevId: 3573822b8b48c7181c661b2c253d7713f4a4328c
 2018-11-19 16:01:59 +00:00
Brian Gough
8bf9d79d2f Merge pull request #1157 from sharelatex/jel-aria-hidden-fix 
Add value to aria-hidden attribute

GitOrigin-RevId: 09b17a269b8d91c5f4b4e231877db0431b0308a9
 2018-11-19 09:57:35 +00:00
Jessica Lawshe
dd41a50377 Merge pull request #1151 from sharelatex/jel-wiki-search-a11y 
Accessible Wiki Search

GitOrigin-RevId: af9b5444fe1be1ced16f3049bfc1ac731c8bebd5
 2018-11-15 17:41:27 +00:00
Jessica Lawshe
d97fe4e39d Merge pull request #1142 from sharelatex/jel-img-alt-and-icon-alt-a11y 
Image alt tags and accessible icons

GitOrigin-RevId: 58f0609682c0dbeec95cad4e234e3f94b7b3c004
 2018-11-15 17:41:22 +00:00
Paulo Jorge Reis
4c9eee51df Merge pull request #1114 from sharelatex/as-fix-sentry-reporting 
Fix Sentry reporting

GitOrigin-RevId: 1bbe598b520fe9edb136a148cc57af63df77cec4
 2018-11-15 10:04:23 +00:00
Shane Kilkelly
81b09c7800 Merge pull request #1071 from sharelatex/sk-enable-git-bridge-in-v2 
Enable git-bridge in v2

GitOrigin-RevId: 24586c7c80b53ae171199ecde538df794f78ecc7
 2018-11-14 11:29:35 +00:00
James Allen
140f97eb20 Merge pull request #1107 from sharelatex/ja-purchase-groups 
Purchase group/team accounts directly via app

GitOrigin-RevId: 1a502878753de77758fb431f45a6366f199f1cb0
 2018-11-13 13:50:46 +00:00
Chrystal Maria Griffiths
afbeec3b02 Merge pull request #1099 from sharelatex/ta-management-ui-title 
Management UI Wording Tweaks

GitOrigin-RevId: 9e1a8990f226e1fda423f6fa6efa25cf3b924544
 2018-11-13 10:53:56 +00:00
Ersun Warncke
efaa77dbd7 Merge pull request #1143 from sharelatex/robots-noindex 
Add noindex, nofollow to editor pages (read/write and read only)

GitOrigin-RevId: b1bcd3c7203a0027d86aced3ea8371b077c4ac75
 2018-11-09 23:55:43 +00:00
Jessica Lawshe
fceb8e9e66 Merge pull request #1096 from sharelatex/jel-plans-mobile-layout 
Plans page mobile layout

GitOrigin-RevId: d650447bd7df4eda17471c2fa7fb2b376fcc0172
 2018-11-08 16:11:49 +00:00
Paulo Jorge Reis
49388c868b Merge pull request #1093 from sharelatex/pr-editor-cobranding-ui 
Editor cobranding UI

GitOrigin-RevId: c6d5fabc23f9105388faeb037d96545bf574f4d5
 2018-11-07 11:43:31 +00:00
Simon Detheridge
baa5574669 Merge pull request #1120 from sharelatex/spd-bonus-page-facebook-link 
Use asynchronous initialisation for Facebook API

GitOrigin-RevId: 263817edcd8fee03d2d2bf62453e247f61128cdc
 2018-11-07 10:37:13 +00:00
Alasdair Smith
4733a7940d Merge pull request #1100 from sharelatex/as-html-lang-attr 
Add lang attribute to html tag

GitOrigin-RevId: ddc22ae6e742d9b501bac8d3c35d6640a7635b92
 2018-11-05 14:17:47 +00:00
Jessica Lawshe
81f027b4c3 Merge pull request #1104 from sharelatex/jel-content-bg-color 
Lighten .content-alt background color

GitOrigin-RevId: 3a1f73a469b1a2bb537a3f15722ce115f54e1ed0
 2018-11-01 17:48:20 +00:00
Timothée Alby
0cfb765501 Merge pull request #1090 from sharelatex/spd-sharing-sl-sidebar 
Remove errant space before fullstop in 'sharing_sl' sidebar section

GitOrigin-RevId: 449cce021feebe2e0454d3cd0d7f60dd3df95ea4
 2018-10-30 14:38:32 +00:00
Timothée Alby
92582fdc38 Merge pull request #1076 from sharelatex/ta-ui-error-handling 
Management UI Error Handling

GitOrigin-RevId: a0567b5d54af3a8ca31f7e124c0c2d2d8d26b647
 2018-10-30 14:37:59 +00:00
Simon Detheridge
c18ca779ba Merge pull request #1073 from sharelatex/spd-bonus-page-ui 
Add links and update UI for Bonus page

GitOrigin-RevId: e993d4b7dc59f5ea145892e9cddb87f2193ae013
 2018-10-30 10:16:20 +00:00
Timothée Alby
2421e15d7a Merge pull request #1060 from sharelatex/ja-remove-v2-banner 
Remove unneeded v2 banner

GitOrigin-RevId: 972afc2bd07ab64b0dd558cf1f15c0272f575b87
 2018-10-25 15:25:35 +00:00
Jessica Lawshe
7a03fbeb06 Merge pull request #1018 from sharelatex/jel-track-changes-info-page 
Styling for track changes info page and add existence checks for metadata

GitOrigin-RevId: 86a6b178e8107c75ef5b877acc1aaa3d8d1ebd80
 2018-10-19 14:12:30 +00:00
Paulo Jorge Reis
6dd9680af8 Merge pull request #1036 from sharelatex/pr-fix-i18n-breaking-layout 
Fix single-quotes breaking layout directive
 2018-10-19 11:30:59 +01:00
Paulo Reis
00a489a000 Fetch brand variation details for branded projects; inject details into the editor page front-end. 
Test brand variation details.

Rename BrandVariationsController to BrandVariationsHandler.

Use the V1 API helper.

Do not swallow errors when fetching brand details for project load.

Fix indentation.
 2018-10-19 10:47:02 +01:00
Paulo Reis
a957593b62 Avoid adding custom toggler attributes when the feature flag is false. 2018-10-19 10:34:07 +01:00
Paulo Reis
4232732646 Avoid using Angular eval for user-provided strings in the layout directive. 2018-10-19 10:00:52 +01:00
Hugh O'Brien
3b766bf523 Merge pull request #1015 from sharelatex/pr-create-projects-with-brand-variation-id 
Create projects with brand variation id
 2018-10-16 11:17:09 +01:00
Timothée Alby
c41fb5c9f4 Merge pull request #942 from sharelatex/pr-dismiss-email-confirmation 
Email confirmation notification UI fixes
 2018-10-15 14:49:06 +02:00
Tim Alby
6f63cd7ca0 add notification to confirm unconfirmed emails 2018-10-15 14:47:16 +02:00
Tim Alby
e646c5c42a refactor to use config file 2018-10-15 14:46:38 +02:00
Timothée Alby
89590d5199 Merge pull request #1003 from sharelatex/cmg-split-screen-button 
Switch between pdf and editor with full-screen button
 2018-10-11 10:54:53 +01:00
Simon Detheridge
e7506489d1 Fix missing string in modals.pug 
Add escape to execute translate() server-side when handling error message for invalid filenames in project on copy.

Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-10 15:06:37 +01:00
Paulo Reis
29787c42c5 Read brand variation id from v1-crafted links; set brand variation id for projects created from v1 templates. 2018-10-10 14:09:47 +01:00
Simon Detheridge
ea2782ff22 Merge pull request #1005 from sharelatex/spd-no-more-asterisks 
Sanitize paths in all relevant ProjectEntityHandler methods
 2018-10-10 10:44:13 +01:00
Simon Detheridge
32149e652f Handle 'invalid element name' error in project list ui 
When invalid filenames are found during project-copy, the somewhat obscure (and non-localised) 'invalid element name' error is returned. Add a special case to handle this particular error and display something more descriptive to the user.

Added a modal error handler for when this error is generated by clicking the 'copy' icon in the project list, instead of using the 'more' dropdown which opens a modal copy dialog

bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-09 17:23:43 +01:00
Ersun Warncke
8719eff1d7 update error message 2018-10-09 11:44:59 -04:00
Ersun Warncke
7652e80800 add account merge error 2018-10-09 09:47:03 -04:00
Tim Alby
48e5c6b523 add UserMembership logic 2018-10-09 12:09:11 +01:00
Chrystal Griffiths
7ae39a0f84 Revert to ng-show 2018-10-09 10:30:24 +01:00
Chrystal Griffiths
849c5253c7 Avoid duplicating code 2018-10-08 17:50:10 +01:00
Jessica Lawshe
8f8765a412 Merge pull request #1008 from sharelatex/ta-fix-help-link 
fix link to link sharing help page
 2018-10-08 16:09:31 +01:00
Tim Alby
cf47fc0b1c fix link to link sharing help page 2018-10-08 16:07:11 +01:00
Jessica Lawshe
d9c98aa45e Add default Twitter and OG images 2018-10-08 15:18:18 +01:00
Simon Detheridge
50993f59c0 Merge pull request #926 from sharelatex/dcl-i850 
Display password change form in Account Settings
 2018-10-08 13:59:04 +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
254d74899b WIP: enable sudo-mode for v2 2018-10-04 15:05:40 +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
Douglas Lovell
4a846e4d87 Merge branch 'master' into dcl-i850 2018-10-02 16:04:39 +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
Paulo Reis
b8baf1a6f4 Hide front chat widget via code. 2018-09-25 10:30:13 +01:00
Brian Gough
2692090f3f support a mainFile parameter for templates 2018-09-24 15:27:16 +01:00
Douglas Lovell
bfb369fab0 Merge branch 'master' into dcl-i850 
Conflicts repaired:
app/views/user/settings.pug

modified:   app/coffee/Features/Authentication/AuthenticationController.coffee
modified:   app/coffee/Features/Editor/EditorHttpController.coffee
modified:   app/coffee/Features/Email/EmailBuilder.coffee
modified:   app/coffee/Features/Errors/Errors.coffee
modified:   app/coffee/Features/Exports/ExportsController.coffee
modified:   app/coffee/Features/Exports/ExportsHandler.coffee
modified:   app/coffee/Features/Notifications/NotificationsBuilder.coffee
modified:   app/coffee/Features/Notifications/NotificationsHandler.coffee
modified:   app/coffee/Features/Project/ProjectController.coffee
modified:   app/coffee/Features/StaticPages/HomeController.coffee
modified:   app/coffee/Features/Subscription/planFeatures.coffee
modified:   app/coffee/Features/TokenAccess/TokenAccessController.coffee
modified:   app/coffee/Features/TokenAccess/TokenAccessHandler.coffee
modified:   app/coffee/Features/User/UserGetter.coffee
modified:   app/coffee/infrastructure/RedirectManager.coffee
modified:   app/coffee/infrastructure/Server.coffee
modified:   app/coffee/models/User.coffee
modified:   app/coffee/router.coffee
modified:   app/views/_mixins/links.pug
modified:   app/views/general/500.pug
modified:   app/views/layout/navbar.pug
modified:   app/views/project/editor/header.pug
modified:   app/views/project/editor/share.pug
modified:   app/views/project/list.pug
modified:   app/views/project/list/modals.pug
modified:   app/views/project/list/notifications.pug
modified:   app/views/project/list/side-bar.pug
modified:   app/views/project/list/v1-item.pug
modified:   app/views/subscriptions/_modal_group_inquiry.pug
modified:   app/views/subscriptions/dashboard.pug
modified:   app/views/user/settings.pug
modified:   config/settings.defaults.coffee
modified:   npm-shrinkwrap.json
modified:   package.json
new file:   public/apple-touch-icon.png
new file:   public/atlassian-domain-verification.html
modified:   public/coffee/ide/editor/directives/aceEditor.coffee
modified:   public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
modified:   public/coffee/ide/share/controllers/ShareController.coffee
modified:   public/coffee/main.coffee
deleted:    public/coffee/main/account-merge-checker.coffee
modified:   public/coffee/main/contact-us.coffee
modified:   public/coffee/main/project-list/left-hand-menu-promo-controller.coffee
new file:   public/google4f15e48c48709a75.html
new file:   public/googleef256f97939bd9b7.html
new file:   public/img/advocates/friend.jpeg
new file:   public/img/grid.png
new file:   public/img/homepage.png
new file:   public/img/homepage@2x.png
new file:   public/img/other-brands/logo_google.svg
new file:   public/img/other-brands/logo_google_alt.svg
new file:   public/img/other-brands/logo_ieee.svg
new file:   public/img/other-brands/logo_orcid.svg
new file:   public/img/other-brands/logo_orcid_alt.svg
new file:   public/img/other-brands/logo_sharelatex.svg
new file:   public/img/other-brands/logo_twitter.svg
new file:   public/img/overleaf-partner/overleaf-greygreen-410.png
new file:   public/img/overleaf-partner/overleaf-white-410.png
new file:   public/static/brochures/Overleaf-Information-v8.pdf
new file:   public/static/brochures/Overleaf-Institutional-Solutions-v1.pdf
new file:   public/static/brochures/Overleaf-Tri-Fold-leaflet.pdf
new file:   public/static/brochures/Overleaf-request-for-service.pdf
new file:   public/static/brochures/Overleaf_Institutional.pdf
new file:   public/static/campus-challenge/campus-challenge-2016-flyer.pdf
new file:   public/static/campus-challenge/campus-challenge-2016-poster.pdf
new file:   public/static/campus-challenge/campus-challenge-2017-flyer.pdf
new file:   public/static/campus-challenge/campus-challenge-2017-poster.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-1.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-2.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-3.pdf
new file:   public/static/partners/caltech-library.gif
new file:   public/static/partners/stanford-building.jpg
modified:   public/stylesheets/_ol_style_includes.less
modified:   public/stylesheets/app/blog-posts.less
modified:   public/stylesheets/app/cms-page.less
new file:   public/stylesheets/app/content_page.less
modified:   public/stylesheets/app/editor/share.less
modified:   public/stylesheets/app/editor/toolbar.less
modified:   public/stylesheets/app/features.less
modified:   public/stylesheets/app/homepage.less
new file:   public/stylesheets/app/login-register.less
modified:   public/stylesheets/app/plans.less
modified:   public/stylesheets/app/portals.less
modified:   public/stylesheets/app/templates-v2.less
modified:   public/stylesheets/app/wiki.less
modified:   public/stylesheets/components/alerts.less
modified:   public/stylesheets/components/buttons.less
modified:   public/stylesheets/components/icons.less
new file:   public/stylesheets/components/images.less
new file:   public/stylesheets/components/tabs.less
modified:   public/stylesheets/core/_common-variables.less
modified:   public/stylesheets/core/ol-variables.less
modified:   public/stylesheets/ol-style.less
modified:   test/acceptance/coffee/ExportsTests.coffee
new file:   test/acceptance/coffee/RedirectUrlsTests.coffee
modified:   test/acceptance/coffee/TokenAccessTests.coffee
modified:   test/acceptance/coffee/helpers/User.coffee
modified:   test/acceptance/config/settings.test.coffee
modified:   test/unit/coffee/Authentication/AuthenticationControllerTests.coffee
modified:   test/unit/coffee/Editor/EditorHttpControllerTests.coffee
modified:   test/unit/coffee/Exports/ExportsControllerTests.coffee
modified:   test/unit/coffee/Exports/ExportsHandlerTests.coffee
new file:   test/unit/coffee/Notifications/NotificationsBuilderTests.coffee
modified:   test/unit/coffee/Project/ProjectControllerTests.coffee
modified:   test/unit/coffee/TokenAccess/TokenAccessControllerTests.coffee
modified:   test/unit/coffee/User/UserGetterTests.coffee
deleted:    test/unit/coffee/infrastructure/RedirectManagerTests.coffee
 2018-09-24 09:11:48 -03: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
Jessica Lawshe
bfcb91e60f Hide content page links in nav when on dash 2018-09-20 11:16:18 -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
Hugh O'Brien
8805447bb9 Revert "Add notification to confirm unconfirmed emails" 2018-09-19 12:28:39 +01:00
Douglas Lovell
98be2c2bf5 Update wording and endpoint for change password form 2018-09-19 07:58:04 -03: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
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
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
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
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
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
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
Chrystal Griffiths
3b43cf9075 Slight copy change 2018-09-13 17:57:11 +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
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
James Allen
c072961183 Update project-list list to a table and show last updated user 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
Douglas Lovell
0ecda4e093 Display password change from in Account Settings 2018-09-10 14:53:33 -03:00
Chrystal Griffiths
46eadfada4 Conditionally show sharing bits 2018-09-07 17:23:03 +01:00
Jessica Lawshe
aa2f6ad0dd Merge pull request #880 from sharelatex/jel-v2-launch-plans 
Launch v2 Plans Page
 2018-09-06 08:51:05 -05:00
Shane Kilkelly
3d369b725c Add another confirmation checkbox to account-delete. 
This confirms the user understands they will lose both their OL v2 and SL
accounts, and their projects.
 2018-09-06 11:35:28 +01:00
Jessica Lawshe
c3c2e524f5 Add quotes 2018-09-05 08:14:32 -05:00
Jessica Lawshe
40a412b6b9 Remove plans message about v2 beta 2018-09-05 08:14:05 -05:00
Jessica Lawshe
65b2715e62 Remove unused layout for v2 plans 2018-09-05 08:14:05 -05:00
hugh-obrien
5605e1c5c3 update copy for ip match notifications 2018-09-05 11:22:26 +01:00
hugh-obrien
d950e14b3f use new routes and params from v1 ip matcher endpoint 2018-09-05 11:22:26 +01:00
hugh-obrien
38faa5c25e correctly create and display ip matched affiliations 2018-09-05 11:22:25 +01:00
Shane Kilkelly
81c845850e Merge pull request #889 from sharelatex/sk-update-account-delete-wording-v1 
Account-delete, clarify what happens to v1 account and projects
 2018-09-05 10:22:32 +01:00
Christopher Hoskin
c3e64b12cf Remove 'beta' from v2 welcome text 2018-09-04 15:11:27 +01:00
Shane Kilkelly
680654f7e7 Account-delete, clarify what happens to v1 account and projects 2018-09-04 13:31:22 +01:00
Shane Kilkelly
7be716e889 Merge pull request #879 from sharelatex/sk-handle-user-account-delete 
Sk handle user account delete
 2018-09-03 10:41:49 +01:00
Shane Kilkelly
bafcf24cc9 Add missing column class to the change-password panel 2018-09-03 10:21:45 +01:00
Shane Kilkelly
1776482159 Update wording of the change-password instruction 2018-09-03 10:21:45 +01:00
Shane Kilkelly
0300ffbdc6 Bonus, add a link to the v1 settings page to change password 2018-09-03 10:21:45 +01:00
Shane Kilkelly
27a2e06d7b Revert "Move the new logic to the externalAuthenticationSystemUsed function" 
This reverts commit 34009fbf59cc6597b08e9262ea274ce266baa8fe.
 2018-09-03 10:21:45 +01:00
Shane Kilkelly
40a500648c Move the new logic to the externalAuthenticationSystemUsed function 2018-09-03 10:21:45 +01:00
Shane Kilkelly
be6720d805 Add a janky warning that this action will delete the account on v1 also. 2018-09-03 10:21:45 +01:00
Shane Kilkelly
9141f678b1 Show the account delete option on v2 2018-09-03 10:21:45 +01:00
Paulo Reis
60cbc989e2 Add delete as an inline table action (only when viewing archived projects). 2018-09-02 15:14:45 +01:00
Paulo Reis
fbf98d89f2 Improve the collapsing behaviour of 'change' entries in track-changes. 2018-09-01 15:36:02 +01:00
Paulo Reis
4ff7410391 Disable the review button when history is open. 2018-08-31 17:10:15 +01:00
Paulo Reis
f88a3815c6 Add loading spinner when cloning a project. 2018-08-31 16:14:20 +01:00
Paulo Reis
7e5094f53d Avoid z-index issues with the new project dropdown. 2018-08-31 15:37:22 +01:00
Paulo Reis
fc7b5bdd63 * Share button shown to all users, with a tooltip for non-admin; remove its id. 2018-08-31 15:33:56 +01:00
Timothée Alby
59b137e303 Merge pull request #877 from sharelatex/pr-fill-university-model-as-you-type 
Update university, role and department value as the user types.
 2018-08-31 13:15:01 +02:00
Jessica Lawshe
dff29637b7 Move quotes to partial 2018-08-30 09:52:55 -05:00
Jessica Lawshe
eb8e279ac7 Add border styling 2018-08-30 09:52:55 -05:00
Jessica Lawshe
7d249f513b Remove Positive SSL badge for v2 2018-08-30 09:52:55 -05:00
Jessica Lawshe
c1d37a712c Update translations to use appName 2018-08-30 09:52:55 -05:00
Jessica Lawshe
c920dc37d2 Update button classes for v2 
Use `.btn-default` instead of `.btn-info`
 2018-08-30 09:52:55 -05:00
Jessica Lawshe
26f2ff3d6f Unlink instapages for v2 FAQ and add group contact modal 
group contact link: v2 opens contact portal and SL opens instapage
 2018-08-30 09:52:50 -05:00
James Allen
52381c8fb7 Merge pull request #851 from sharelatex/jel-remove-a-b-test 
Remove Plans and Pricing A/B Test
 2018-08-30 15:19:56 +01:00
Paulo Jorge Reis
cf075b0c42 Merge pull request #878 from sharelatex/ja-hide-bonus-in-v2 
Don't suggest bonus page to v2 users
 2018-08-30 11:29:41 +01:00
Paulo Jorge Reis
4be364cd93 Merge pull request #864 from sharelatex/pr-history-restore-placeholder 
Add a placeholder "restore" button, showing a tooltip.
 2018-08-30 11:25:25 +01:00
Paulo Jorge Reis
cb4d4145a1 Merge pull request #855 from sharelatex/pr-v2-light-theme 
v2 light theme
 2018-08-30 11:24:52 +01:00
Paulo Jorge Reis
8b9397f80c Merge pull request #863 from sharelatex/as-update-v1-import-modal 
Update project import modal to be more friendly near the launch
 2018-08-30 11:24:44 +01:00
James Allen
b86ac31c63 Don't suggest bonus page to v2 users 2018-08-30 10:56:31 +01:00
Jessica Lawshe
3a2400b212 Merge pull request #841 from sharelatex/ns-remove-wufoo-log-links 
remove wufoo latex error response logging
 2018-08-29 12:24:22 -05:00
Jessica Lawshe
a5d84ecc0a Merge pull request #842 from sharelatex/jel-portals-user-affiliation 
Add dashboard link mixin
 2018-08-29 12:23:50 -05:00
Paulo Reis
79f1e7b0ee Update ui-select value as the user types. 2018-08-29 17:31:47 +01:00
Alasdair Smith
4174b8edee Update image and adjust size 2018-08-29 10:50:07 +01:00
Alasdair Smith
3dc437d932 More copy updates 2018-08-29 10:50:07 +01:00
Alasdair Smith
ff275e3425 Replace image and improve copy 2018-08-29 10:50:07 +01:00
Alasdair Smith
2e0d6ab305 Remove 2 step modal and make copy more friendly 2018-08-29 10:50:07 +01:00
James Allen
6a04800f70 Merge pull request #810 from sharelatex/ja-v2-templates 
Split out feature flags into publish and view templates
 2018-08-29 10:27:23 +01:00
Shane Kilkelly
b8ff6ae9a2 Merge pull request #862 from sharelatex/ta-increase-space 
Increase Spacing Between Buttons
 2018-08-29 09:21:31 +01:00
Shane Kilkelly
2c782fee67 Merge pull request #858 from sharelatex/sk-update-v2-migration-banner 
Update the color and wording of the warning message shown on SL
 2018-08-29 09:21:19 +01:00
Shane Kilkelly
6157db1964 Merge pull request #835 from sharelatex/sk-sanitize-system-messages 
Sanitize display of system messages.
 2018-08-29 09:21:07 +01:00
Shane Kilkelly
33a4882bd3 Update the color and wording of the warning message shown on SL 2018-08-29 09:08:44 +01:00
Paulo Reis
0df5c61c44 Add a placeholder restore button, showing a tooltip. 2018-08-28 21:35:35 +01:00
Jessica Lawshe
e1fbef6910 Move style from winning test variant to main class 
`.more-details` contained style for the winning variant. Move these CSS declarations to main class of page, `.plans`.

Also alphabetize CSS classes.

Remove .more-details and extra .container from layout

CSS statements for .more-details were moved to .plans
 2018-08-28 12:42:09 -05:00
Jessica Lawshe
ae85bfafef Move FAQ to partial 2018-08-28 12:42:09 -05:00
Jessica Lawshe
e5c3d72e1a Move winning variant layout to main layout 2018-08-28 12:42:09 -05:00
Jessica Lawshe
8889f2aed2 Remove Plans and Pricing A/B Test 
Remove all layouts, analytics events, and scope related to the A/B test.

The group modal from the default layout of the A/B test should be maintained though for v2.
 2018-08-28 12:42:09 -05:00
Tim Alby
204423696d increase spacing between buttons 2018-08-28 17:34:49 +02:00
Paulo Reis
32ff66b0dd Add two more font-size options to the editor. 2018-08-28 14:52:25 +01:00
Paulo Reis
90b353298d Switch themes at runtime. 2018-08-28 14:12:00 +01:00
Timothée Alby
8057f4e74d Merge pull request #849 from sharelatex/pr-fix-add-new-university 
Correctly invoke the function to add unknown universities.
 2018-08-28 14:03:35 +02:00
Paulo Reis
64c29787c0 Add i18n; update the review icon image. 2018-08-27 15:57:51 +01:00