Eric Mc Sween
c8df1da69a
Merge pull request #3856 from overleaf/em-git-folder
...
Helpful error when trying to merge .git folder with Github
GitOrigin-RevId: 15e976b738e91d89a6dfe64833620b75070ff998
2021-04-01 02:05:46 +00:00
Eric Mc Sween
5587de9cf5
Merge pull request #3833 from overleaf/em-meta-tags
...
Pass values to JS through meta tags
GitOrigin-RevId: f663a1b7fef4544b560574d21f59fdabaf617830
2021-04-01 02:05:44 +00:00
Alf Eaton
5653116cdb
Reset the "select collaborators" combobox when needed ( #3821 )
...
GitOrigin-RevId: 773ea3ff01d2b6ec058728430174b77fadc481c8
2021-04-01 02:05:41 +00:00
Alf Eaton
be804b5fc1
Merge pull request #3832 from overleaf/ae-modal-beta
...
* Add BetaBadge component
* Add beta_badge_tooltip translation
* Add beta badge to modal headers
* Enable Share and Add Files modals for beta users
GitOrigin-RevId: df0933830a0745c0ecf57db34f2cb75104a570cd
2021-04-01 02:05:38 +00:00
Alf Eaton
a2be1f8981
Check that error.info exists ( #3865 )
...
GitOrigin-RevId: 83c575cc3b94d9d6564d4a2919f81e7b47a116cc
2021-04-01 02:05:35 +00:00
Alf Eaton
8227e68aca
Improve form "for" and "autocomplete" attributes ( #3822 )
...
GitOrigin-RevId: 2ce35d57526fc36b5a974d0f940ef6ba08806864
2021-04-01 02:05:32 +00:00
Alf Eaton
d0d28524a2
Switch to useScopeValue
for project data in Share modal ( #3823 )
...
GitOrigin-RevId: f82170c241c59cf7b66fea7e1471004e46ab3547
2021-04-01 02:05:30 +00:00
Miguel Serrano
445c850004
Revert "React Git Bridge Modal ( #3757 )" ( #3867 )
...
This reverts commit cf883b776a9ddc7975977534dc453ece4b3ec431.
GitOrigin-RevId: 462d7282d2c706ef5395c25a335239bfac4787a6
2021-04-01 02:05:27 +00:00
Miguel Serrano
835c60071d
React Git Bridge Modal ( #3757 )
...
* git-bridge-modal react component and stories
* added react git-bridge-modal to angular tree
GitOrigin-RevId: cf883b776a9ddc7975977534dc453ece4b3ec431
2021-04-01 02:05:24 +00:00
Miguel Serrano
d444ba3335
Merge pull request #3864 from overleaf/msm-show-syntex-spinner-double-click
...
Show the synctex spinner on PDF double click
GitOrigin-RevId: 420e65b822ba2879949fc600a5b15e97f1dccf0d
2021-04-01 02:05:21 +00:00
Miguel Serrano
e5bf3f50ef
Merge pull request #3806 from overleaf/msm-publish-template-wording
...
Update `publish_as_template` translation
GitOrigin-RevId: b0a9eaaf8cfe624f60455ba320e82c6e7ffd8a66
2021-04-01 02:05:18 +00:00
Miguel Serrano
d8b49f65da
Merge pull request #3861 from overleaf/jpa-meta-launchpad
...
[views] migrate the launchpad module to meta tags
GitOrigin-RevId: 05295de90bf478e9b3494d854e2c57039c8f39e8
2021-04-01 02:05:15 +00:00
Miguel Serrano
13bf8dad2b
Merge pull request #3860 from overleaf/jpa-cleanup-layout
...
[views] drop a hack that blocked 3rd party software from loading in 2015
GitOrigin-RevId: c6a26e05d12e3a02669a05d40a9f3562d780eead
2021-04-01 02:05:12 +00:00
Miguel Serrano
454d9790ca
Merge pull request #3828 from overleaf/jpa-meta-project-dash
...
[views] migrate the project dashboard to meta tags
GitOrigin-RevId: 934a9a64ca8668e8982caa7a945b1a55c87cb1ee
2021-04-01 02:05:10 +00:00
Miguel Serrano
eeb2b7d18b
Merge pull request #3826 from overleaf/jpa-meta-editor
...
[views] migrate the editor templates to meta tags
GitOrigin-RevId: 01745172840c8ceb5fb9947ca6c14e919e9c4ac7
2021-04-01 02:05:07 +00:00
Miguel Serrano
d65db1acf0
Merge pull request #3824 from overleaf/jpa-password-reset-email-forwarding
...
[misc] fix passing around of users email as part of password reset
GitOrigin-RevId: 54e8cde9867a2ce735bc7ebe281ead19ef49e6cd
2021-04-01 02:05:04 +00:00
Miguel Serrano
8f30b699b0
Merge pull request #3671 from overleaf/jpa-metrics-module-3-5-1
...
[misc] bump the version of the metrics module to 3.5.1
GitOrigin-RevId: fac259672baad98a7ce3d09ec85a960c796843a3
2021-04-01 02:05:00 +00:00
Miguel Serrano
65d9186e0b
Merge pull request #3727 from overleaf/ab-ta-unique-referal-id
...
Generate User referal_id using longer and more complex token to avoid duplicates
GitOrigin-RevId: 302515b0250fec875dcb7b3a505c1c7be4189e2b
2021-04-01 02:04:57 +00:00
Miguel Serrano
7a36373a0f
Merge pull request #3863 from overleaf/hb-clear-content-outside-heading-def
...
Remove content outside of the title commands for outline
GitOrigin-RevId: 4361521b5e1ae8adc853ed4fb250cbeeaebb1d71
2021-04-01 02:04:54 +00:00
Timothée Alby
afc15335c7
Update Wording on Portals ( #3859 )
...
GitOrigin-RevId: cde3976c9a6982d572623ae5757cdda7aed597f3
2021-04-01 02:04:51 +00:00
Miguel Serrano
80dff8d42c
Merge pull request #3800 from overleaf/ab-queue-onboarding-emails
...
Implement queuing for onboarding emails
GitOrigin-RevId: f1eca149a6a2cab35b4cf9c3889dc384372fd453
2021-04-01 02:04:48 +00:00
Miguel Serrano
09ccceb38a
Merge pull request #3786 from overleaf/sk-smtp-params
...
Add 'logger' and 'name' smtp params
GitOrigin-RevId: e54070c8dcc693d84ddbb350be564d5d9a63649d
2021-04-01 02:04:45 +00:00
Simon Detheridge
e4f84b9f69
Merge pull request #3854 from overleaf/tm-show-new-editors-with-track-changes
...
Fix newly added collaborators not showing track-changes as enabled
GitOrigin-RevId: 20a4ca3278cbea8a50b6c285b8fc416a34dfcf52
2021-03-31 02:05:59 +00:00
Simon Detheridge
f02d4feea2
Merge pull request #3858 from overleaf/ab-ae-remove-token-project-invite
...
Remove token from project invites object returned to frontend
GitOrigin-RevId: 439fdb6fb44af1f46a9f16c4be8cc1d4fce8b562
2021-03-31 02:05:55 +00:00
Simon Detheridge
036018d65c
Merge pull request #3809 from overleaf/sk-history-exception-fix
...
Remove references to `this` in history toolbar
GitOrigin-RevId: 7e3e970317d94ab694ccd2ccd5bb89fee9cb72b6
2021-03-31 02:05:51 +00:00
Simon Detheridge
ae0805e684
Merge pull request #3850 from overleaf/jpa-set-image-name-for-synctex
...
[misc] include the projects imageName as part of synctex requests
GitOrigin-RevId: 99f05cf67859b1e43c2342fc0c2575ddd661a57d
2021-03-31 02:05:46 +00:00
Simon Detheridge
12f3e8d6bb
Merge pull request #3847 from overleaf/ae-user-select-out-of-sync
...
Display the Out Of Sync modal file contents in a readonly textarea
GitOrigin-RevId: b91ff3ad32c3ed07987858e83571887ae356f4f3
2021-03-31 02:05:42 +00:00
Simon Detheridge
9e2db00d53
Merge pull request #3845 from overleaf/ho-upload-file-mark-updated
...
mark project as updated when uploading/replacing files
GitOrigin-RevId: 948a3351ac59d4f08411dd83bb543444de0b9b52
2021-03-31 02:05:38 +00:00
Simon Detheridge
3d48e1e027
Merge pull request #3799 from overleaf/tm-past-due-invoice-warning
...
Show warning if users Recurly account has past due invoices.
GitOrigin-RevId: 8c501e7e561b201a3a184923c0681d67049464a9
2021-03-31 02:05:33 +00:00
Simon Detheridge
467aa16da7
Merge pull request #3835 from overleaf/ho-mf-file-extension
...
add mf files as editable in editor
GitOrigin-RevId: b22d59af3fcd0c647cc436d6ac72130d8f29b4aa
2021-03-31 02:05:29 +00:00
Jakob Ackermann
b532833466
Merge pull request #3842 from overleaf/jpa-persistent-navigation-between-tabs
...
[views] admin: persist the navigation between tabs into the URL
GitOrigin-RevId: 202793b9d0b17934bb952e0283228603e036dbc9
2021-03-31 02:05:22 +00:00
Jakob Ackermann
ce2b7f7858
Merge pull request #3846 from overleaf/cmg-tracked-changes-whitespace
...
Add the space back into tracked-changes entry
GitOrigin-RevId: 2f1451c1dbeda393bc6a9ad12434e10755bff86d
2021-03-31 02:05:17 +00:00
Jakob Ackermann
c47f756d2c
Merge pull request #3841 from overleaf/hb-restore-linked-file-errors
...
put back refreshFile errors for linked files
GitOrigin-RevId: aca36443a7d9ee37ae810ff02575489b3aaf0419
2021-03-31 02:05:13 +00:00
Jakob Ackermann
60cefae09a
Merge pull request #3836 from overleaf/jpa-no-close-editor-in-saas
...
[views] admin: the open/close editor feature is not available in SAAS
GitOrigin-RevId: 6d9ba22e7843be7c27084a6bb5bc1c502ecdccc9
2021-03-31 02:05:07 +00:00
Alexandre Bourdin
57cd6b4754
Merge pull request #3843 from overleaf/ab-comment-linebreak
...
Add CSS property to display line-breaks in review comments
GitOrigin-RevId: aa499556c0c50d042450e0421a55d51c9a097a29
2021-03-31 02:05:01 +00:00
Alf Eaton
c9f772f497
Ensure that Features.hasFeature returns a boolean ( #3798 )
...
GitOrigin-RevId: d6f286544f42db4d101ba06897044ada0bcd14d8
2021-03-30 02:05:21 +00:00
Alf Eaton
a69f7af055
Improve CSS chunk importing ( #3817 )
...
* Move ide.css to editor.pug
* Import angular-csp.css
GitOrigin-RevId: e0f4792690567e785e124d742e0332ddcf1155e6
2021-03-30 02:05:17 +00:00
Timothée Alby
0f5243d3f0
Merge pull request #3829 from overleaf/jpa-meta-user-activate
...
[views] migrate the user activate page to meta tags
GitOrigin-RevId: 422992af7aae005cc60a5de1c26ca583333b1f65
2021-03-30 02:05:13 +00:00
Timothée Alby
8ec7ebe645
Merge pull request #3713 from overleaf/jpa-login-event-drop-pii
...
[AuthenticationController] do not include PII as part of login event
GitOrigin-RevId: 274378b3a21945637dc33d2cfb39a53e9aaad9b7
2021-03-30 02:05:09 +00:00
Timothée Alby
b2b9a05e3c
Merge pull request #3706 from overleaf/msm-jlm-configurable-text-extensions
...
New ADDITIONAL_TEXT_EXTENSIONS env to support extra editable files
GitOrigin-RevId: 03bec0a1a9dbd303754f0b90377d1b7d1ec3f528
2021-03-30 02:05:04 +00:00
Timothée Alby
d346172819
Merge pull request #3776 from overleaf/ho-post-clsi-cookie
...
convert _populateServerIdViaRequest to a post request
GitOrigin-RevId: cbbf926708804527ba3717a66e9f0192ecf70fbd
2021-03-30 02:04:59 +00:00
Timothée Alby
94896bca4e
Merge pull request #3731 from overleaf/dependabot-npm_and_yarn-pug-3.0.2
...
Bump pug from 2.0.4 to 3.0.2
GitOrigin-RevId: 7b5454b8263f9960f9126224a8ed7ec70714b829
2021-03-30 02:04:54 +00:00
Jakob Ackermann
fc15525fb3
Merge pull request #3816 from overleaf/jpa-fix-settings
...
[misc] fix the pre-filling of the users email in settings for Server Pro
GitOrigin-RevId: 7732c362a6ca4a16b8c89f3430fceebaaf27dee7
2021-03-27 03:05:19 +00:00
Jakob Ackermann
d05f262615
Merge pull request #3811 from overleaf/jpa-get-meta-user-sessions
...
[frontend] clear-sessions: read otherSessions from meta tag
GitOrigin-RevId: e20996cc43968b310a9d6633d32ccdabc7d51ec1
2021-03-27 03:05:16 +00:00
Jakob Ackermann
deca5f3b0d
Merge pull request #3810 from overleaf/jpa-meta-tag-user-sessions
...
[views] user/sessions: refactor window assignment into meta tag
GitOrigin-RevId: a5b07ccc99021b2c72a5888b9a9d28c1c458e1e9
2021-03-27 03:05:13 +00:00
Jakob Ackermann
0ca9d0236c
Merge pull request #3750 from overleaf/jpa-req-ip-in-unit-tests
...
[misc] test/unit: add req.ip to MockRequest helper
GitOrigin-RevId: 07b1cf11f20eccb4c002a21f4a59588d201a3f0c
2021-03-27 03:05:10 +00:00
Jakob Ackermann
4280a96b2c
Merge pull request #3749 from overleaf/jpa-refactor-audit-log-access-in-tests
...
[misc] test/acceptance: refactor access on user audit log
GitOrigin-RevId: fab5b81a7469ef4fa0daa553169a47e3427c49fd
2021-03-27 03:05:06 +00:00
Jakob Ackermann
f66fa58a7c
Merge pull request #3745 from overleaf/jpa-project-restore-handle-deleted-files
...
[ProjectDeleter] restore project.deletedFiles into own collection
GitOrigin-RevId: cb34e0e22609a49c676ebfe0753e650699b96f5d
2021-03-27 03:05:01 +00:00
Alf Eaton
a5637651b5
Add Content-Security-Policy header ( #3783 )
...
* Add Content-Security-Policy header
* Add nonce attribute to script tags
* Use source-map for webpack devtool
* Add ng-csp attribute when CSP is enabled
* Allow overriding CSP settings with environment variables
* Hook into render and allow routes to disable the CSP header
GitOrigin-RevId: a873736a3514198165f1b2f1e18d002b65f20d30
2021-03-26 03:04:55 +00:00
Alf Eaton
116f167a6f
Merge pull request #3813 from overleaf/ae-user-has-feature-follow-up
...
Fix React attributes for Add Files modal
GitOrigin-RevId: 8254cdd14accdd8ead710d75a3ad4df75fc05134
2021-03-26 03:04:52 +00:00