Commit graph

9962 commits

Author SHA1 Message Date
Thomas
682abe9ca5 Merge pull request #3980 from overleaf/tm-show-error-if-plan-change-fails
Show error in plan change modal if plan change fails

GitOrigin-RevId: 698aab43feacdb5ced41f239167c5d132f7ca8de
2021-05-18 02:08:20 +00:00
Thomas
f7b96e86a7 Merge pull request #4034 from overleaf/tm-pending-subscription-addons
Display correct information when pending subscription has addons

GitOrigin-RevId: 7634ccf24788951507963b6d421fdb86e0dc38d5
2021-05-18 02:08:16 +00:00
Miguel Serrano
73c47fa0e0 Layout divider for Symbol Palette (#4036)
Co-authored-by: Alf Eaton <alf.eaton@overleaf.com>
GitOrigin-RevId: e22635978c16646060c80ceb8376a560bfbf6527
2021-05-18 02:08:12 +00:00
Jakob Ackermann
4fc8cb842e Merge pull request #4053 from overleaf/jpa-fix-clsi-server-id-case
[misc] serviceWorker: fix casing of clsiServerId in query

GitOrigin-RevId: ae4b9d16b053ea36ce701f1f467eed34699751d1
2021-05-18 02:08:09 +00:00
Jakob Ackermann
234cabdcf5 Merge pull request #4051 from overleaf/jpa-fix-lint
[misc] fix lint

GitOrigin-RevId: 56db2a752a02801a9b6fd379f130a258a84c55b0
2021-05-18 02:08:05 +00:00
Jakob Ackermann
715fad4883 Merge pull request #4046 from overleaf/jpa-fix-404s
[misc] use ng-href for dynamic link targets

GitOrigin-RevId: 22cccf7a3784cde046d73d88c5929036e3572279
2021-05-18 02:08:01 +00:00
Jakob Ackermann
7db7cd4a49 [misc] merge pdf caching into main (#4033)
* [frontend] WIP: pdf caching using service worker -- squashed

Ref: 920fbaa00b31530f7c457a2d93bad5e553798057
Co-Authored-By: Brian Gough <brian.gough@overleaf.com>
Co-Authored-By: Eric Mc Sween <eric.mcsween@overleaf.com>

* [misc] add contentId into the URL for protecting PDF stream contents

* [misc] gracefully handle missing ranges in serviceWorker

* [misc] support PDF stream caching for anonymous users

* [misc] polish header names and add URL to error message when fetch fails

* [misc] polish event handler registration

* [misc] limit serviceWorker scope to /project/ -- trailing slash

This will block the service worker from intercepting requests on the
 project dashboard.

* [misc] add per-request feature flag for enabling PDF stream caching

* [misc] expose compile stats and timings to the frontend

* [misc] serviceWorker: support clsiServerId and compileGroup url params

* [misc] serviceWorker: polish header maps

* [misc] serviceWorker: drop TODO for p-limit -- the browser has a queue

* [misc] serviceWorker: drop verbose log message on every fetch

* [misc] cut down size of diff in backend code

* [misc] add test case for forwarding of pdf caching and metrics details

* [misc] serviceWorker: drop all the log lines

* [misc] serviceWorker: add boundary guards to the compile request regex

Co-authored-by: Brian Gough <brian.gough@overleaf.com>
Co-authored-by: Eric Mc Sween <eric.mcsween@overleaf.com>
GitOrigin-RevId: 4b291b4a4f2866cf07bccf8ec9068f33bbfdc916
2021-05-18 02:07:57 +00:00
Jakob Ackermann
2901de7830 Merge pull request #4020 from overleaf/jpa-gracefully-access-mathjax
[frontend] chat: gracefully access MathJax details

GitOrigin-RevId: 5a68bf715a21c8b3881957afc7ac0ba83c353602
2021-05-18 02:07:53 +00:00
Jakob Ackermann
55f2a6e000 Merge pull request #4017 from overleaf/jpa-fix-notification-ack
[NotificationsBuilder] fix too broad acknowledge API calls

GitOrigin-RevId: 4ddaeb33ccf4d4a4f5c36671c720ec3cd32ef761
2021-05-18 02:07:47 +00:00
Jakob Ackermann
1d95137e13 Merge pull request #4016 from overleaf/jpa-faster-ci-4288
[perf] faster CI

GitOrigin-RevId: 858c0c4947e41961dae35cb20e0fcc2e2f723787
2021-05-18 02:07:44 +00:00
Alf Eaton
01c8a8a04d Merge pull request #4025 from overleaf/ae-timeout-upgrade
Only show upgrade message on timeout if not already premium

GitOrigin-RevId: 1378b0a98c6b511d63f2ce1192d3fdca16e8db26
2021-05-15 02:10:09 +00:00
Alf Eaton
79f58598eb Merge pull request #4045 from overleaf/ae-register-spaces
Restore spaces on SP register page

GitOrigin-RevId: 5a8bdb25e4715861957a071bb4bc8f628ee36a41
2021-05-15 02:10:06 +00:00
Alf Eaton
85347293ff Merge pull request #4037 from overleaf/ae-symbol-palette-test
Enable symbol palette test

GitOrigin-RevId: 5610c3bb82197f4c1a7a2768e1fe6924632a9300
2021-05-15 02:10:02 +00:00
Alf Eaton
d7b997e86c Merge pull request #4038 from overleaf/ae-move-use-debounce
Move useDebounce hook

GitOrigin-RevId: f047e279ca1694fc4fa68aa098d6608edefd20fe
2021-05-15 02:09:58 +00:00
Timothée Alby
a82ccf9aec fix mongo sort argument (#4021)
GitOrigin-RevId: 639f31d5046b4df5f9f75f688cf73f3366232c31
2021-05-14 02:09:55 +00:00
Alf Eaton
0360d01aeb Add Symbol Palette component, data and stories (#4027)
GitOrigin-RevId: b00128bc087e2ebe9911fa19b7e62fd4bb492226
2021-05-14 02:09:50 +00:00
Miguel Serrano
bb88af80cf Merge pull request #3947 from overleaf/msm-reenable-eslint-rules
Reenable `eslint` rules

GitOrigin-RevId: a0aa5f941ba1bc49ff758b5256f91d696f442c6d
2021-05-14 02:09:45 +00:00
Miguel Serrano
1d4c7f71d5 Merge pull request #4010 from overleaf/msm-navbar-tests
Added tests for navbar chat button and project name

GitOrigin-RevId: fc33142ef80254d65505c2b623ac768f8a4dfdf2
2021-05-14 02:09:41 +00:00
Miguel Serrano
1c552cba92 Merge pull request #4015 from overleaf/msm-fix-chat-button-reset
Fixed `resetUnreadMessageCount` used instead of `markMessagesAsRead`

GitOrigin-RevId: 8337afd73d8dff570a289e159847a1f6b4fd2fb2
2021-05-14 02:09:36 +00:00
CloudBuild
62f3eb493e auto update translation
GitOrigin-RevId: b91bce90ac637d4a212311950f8cb9d5a1f68d2a
2021-05-14 02:09:31 +00:00
Alf Eaton
e63ac0e896 Merge pull request #4032 from overleaf/ae-revert-sentry-commits
Disable sentry-cli releases set-commits

GitOrigin-RevId: 5e6d5e29bfbc949f656550e259d9545d274a2b8c
2021-05-13 02:09:14 +00:00
Alf Eaton
7d3b989d74 Merge pull request #3977 from overleaf/as-file-tree-application-context
Pull user id from ApplicationContext instead of window in file tree

GitOrigin-RevId: e6c037b4a46ecdca066bcb5c67f6eeb8834f11fd
2021-05-13 02:09:11 +00:00
Alf Eaton
0026e9d246 Merge pull request #3994 from overleaf/ae-sentry-packages
Upgrade @sentry/browser to v6

GitOrigin-RevId: aec8e55b2c36de13bc084def5607ef92bb441b8f
2021-05-13 02:09:07 +00:00
Alf Eaton
3a1099c4d8 Merge pull request #3995 from overleaf/ae-sentry-set-commits-2
Enable Suspect Commits in Sentry releases

GitOrigin-RevId: 599122d5d14c8f926bf1eff54d5602b8d60414c3
2021-05-13 02:09:04 +00:00
Alf Eaton
0e7c27d91a Merge pull request #4013 from overleaf/ae-share-modal-header
Restore the React share modal

GitOrigin-RevId: 697524bceaf0f711889028ad313914edf29e246a
2021-05-13 02:09:00 +00:00
Alf Eaton
669e8f923f Merge pull request #4014 from overleaf/ae-react-translations
Add more translations to React components

GitOrigin-RevId: c0392472f4d6603c147876c30def36f329994af5
2021-05-13 02:08:56 +00:00
Alf Eaton
5ea11cdf83 Merge pull request #4029 from overleaf/msm-symbol-palette-toggle
Added `symbol_palette` feature toggle

GitOrigin-RevId: 0de00543d15f3f02a2130ac5abf30f35ac814684
2021-05-13 02:08:53 +00:00
Alf Eaton
f8cb1638d1 Merge pull request #3988 from overleaf/ae-use-fetch-mock
Add useFetchMock hook for use in Storybook

GitOrigin-RevId: 4eb1c5edf2f94dc6ad51358e109e29c9f62d2058
2021-05-12 02:10:04 +00:00
Jessica Lawshe
29264061d8 Merge pull request #3987 from overleaf/jel-ukamf-script
Check if IdP metadata to hide set

GitOrigin-RevId: 7a30961730b21d512b55faf718e5fe97e15eb6ce
2021-05-12 02:09:58 +00:00
Jessica Lawshe
5d7faa7977 Merge pull request #4006 from overleaf/jel-refresh-features-reason
Pass reason to refreshFeatures

GitOrigin-RevId: 400e3081333239248e3408f93b0517b9bbdbc90c
2021-05-12 02:09:55 +00:00
Jessica Lawshe
2bf126af68 Merge pull request #3993 from overleaf/jel-reconfirmation-script
Add script to refresh features for users not reconfirmed

GitOrigin-RevId: d49f496dc6f1997763d54c6d8f41f7c3634b8b2d
2021-05-12 02:09:51 +00:00
Brian Gough
1d94ef5b54 Merge pull request #4003 from overleaf/bg-project-archiver-deletion
project archiver deletion of expired projects

GitOrigin-RevId: 7e010f4883e0bfeb593da6b728c8e4ac329824cd
2021-05-12 02:09:48 +00:00
CloudBuild
6965b27c05 auto update translation
GitOrigin-RevId: 44b66d1abbe635711335f7eec3111a5d6606e37e
2021-05-10 02:09:27 +00:00
CloudBuild
6f647ae4ce auto update translation
GitOrigin-RevId: 893603572bc1ef72b345ac3f8af638bc22a629ec
2021-05-09 02:09:21 +00:00
Thomas
d2dad0d802 Merge pull request #4011 from overleaf/tm-fix-group-plan-educational-discount-text
Lowercase 'educational' for consistency in group plan modal text

GitOrigin-RevId: 139549dc96e71295f1eb5949fad66af1b4df4e16
2021-05-08 02:10:15 +00:00
Hugh O'Brien
d9b369c6c1 Merge pull request #3997 from overleaf/ae-react-translations
Ensure that all strings are translated in React components

GitOrigin-RevId: 855280150a21982fcf0ba57a39002451d37621e8
2021-05-08 02:10:10 +00:00
Hugh O'Brien
903c1110e0 Merge pull request #3998 from overleaf/jpa-learn-sanitize
[learn] sanitize the wiki content

GitOrigin-RevId: c114bbd94479e926c0621953fe9c03f6d380a19d
2021-05-08 02:10:06 +00:00
Hugh O'Brien
1f3b01486e Merge pull request #3991 from overleaf/em-oversized-logs
Avoid logging project contents

GitOrigin-RevId: 6255ffebca83728bc69e64286ea40fd5aed244a1
2021-05-08 02:10:01 +00:00
Alf Eaton
a1bc43d994 Rename plan to planCode
GitOrigin-RevId: 401bcbe32e3f551d525ffb59fd548c153b82baca
2021-05-08 02:09:55 +00:00
Alf Eaton
e832c9ed70 Add StartFreeTrialButton
GitOrigin-RevId: dd9ab4bb12e8b9071b2a869e2d452945b49d9cd7
2021-05-08 02:09:50 +00:00
Jakob Ackermann
e6acfda6e3 Merge pull request #3967 from overleaf/jpa-upgrade-ratelimiter
[misc] upgrade rolling-rate-limiter to latest upstream version

GitOrigin-RevId: cf2fdf9ea7dab1fb4953de3a4f03e4dc913bcb23
2021-05-08 02:09:45 +00:00
Jakob Ackermann
057c8528c9 Merge pull request #4007 from overleaf/jpa-upgrade-underscore
[misc] upgrade underscore to the latest version

GitOrigin-RevId: 2261fa4a431d30449d55b5e6b6dc11a4b731465d
2021-05-08 02:09:41 +00:00
Alexandre Bourdin
87b3654bff Merge pull request #4001 from overleaf/ab-hash-split-test
Add hashing to compute the user's percentile in a split test

GitOrigin-RevId: 94302cd1c0ab9e9075a506096b4f36ba50b9b7fa
2021-05-07 02:13:17 +00:00
Jakob Ackermann
8faae673b4 Merge pull request #4000 from overleaf/jpa-skip-pug-compile
[Server] optionally skip pre-compiling pug templates in production

GitOrigin-RevId: c50e6007dae3b0ab83a7edbce07a695a17e71404
2021-05-07 02:13:13 +00:00
Miguel Serrano
46ecb39bdb Merge pull request #3986 from overleaf/tm-decaf-limitations-manager
Decaf cleanup of LimitationsManager and tests

GitOrigin-RevId: 9bbfc4c3ad002a424863a43c3c19dc66fa5e9854
2021-05-06 02:09:39 +00:00
Miguel Serrano
6583d6de21 Merge pull request #3971 from overleaf/tm-migrate-recurly-cancellations
Migrate cancel/reactivatation of recurly subscription to node client

GitOrigin-RevId: 68a8a3eba7b653ec923d020a74a09e49efa8ba21
2021-05-06 02:09:35 +00:00
Miguel Serrano
a5e905f730 Merge pull request #3975 from overleaf/tm-change-default-group-subscription
Make Enterprise the default group pricing and clarify related text

GitOrigin-RevId: c723c87fa97ca0f8e9a03039f05cb397e1213de3
2021-05-06 02:09:32 +00:00
Miguel Serrano
c081db1ddf Merge pull request #3989 from overleaf/jel-reconfirm-tests
Fix reconfirm tests

GitOrigin-RevId: bbcaf97f339dc563a7b49db14252cc8de601878d
2021-05-06 02:09:29 +00:00
Miguel Serrano
4bcab34580 Merge pull request #3978 from overleaf/jel-notifications-decaf
Notifications decaf cleanup and remove eslint disable

GitOrigin-RevId: 557a7c63aecda346501d56d1eb18935b12130e8a
2021-05-06 02:09:25 +00:00
Miguel Serrano
219f9ec39e Merge pull request #3966 from overleaf/jpa-acceptance-tests-rate-limiter
[misc] replace RateLimiter unit tests with acceptance tests on /metrics

GitOrigin-RevId: c4ef502b38bb4b300c6b9812e1c97858e93a38fe
2021-05-06 02:09:22 +00:00
Miguel Serrano
6c831e9a02 Merge pull request #3976 from overleaf/jpa-explicit-dependencies
[misc] add linting for missing explicit dependencies and fix any errors

GitOrigin-RevId: 813de53eafbbe1ffda37ce2832d1ed2538d5476b
2021-05-06 02:09:18 +00:00
Miguel Serrano
f9871103bf Merge pull request #3949 from overleaf/msm-reenable-eslint-const-rule
Reenable eslint `prefer-const` rule

GitOrigin-RevId: 4f3825be8b8dff381095209085a36eaab76260d5
2021-05-06 02:09:14 +00:00
Miguel Serrano
0874fcb8ca Release new navigation toolbar to alpha + feature flag refactoring (#3931)
* release new navigation toolbar to alpha and refactor flags

GitOrigin-RevId: d6ff9a3740423510457247882169b7d5aae2b843
2021-05-06 02:09:11 +00:00
Alf Eaton
e9b93a6ef2 Merge pull request #3979 from overleaf/ae-exposed-settings
Remove exposed-settings.js

GitOrigin-RevId: 056526b6e5fb50c4fd8058338e894eed9a3a50f4
2021-05-05 02:10:00 +00:00
Alf Eaton
1173c5c2da Merge pull request #3983 from overleaf/ae-github-sync-modal
Move GitHub Sync Modal stories under Modals

GitOrigin-RevId: 65f1f989550026f7e29846bc4f1685b13f5d0cfe
2021-05-05 02:09:57 +00:00
Alf Eaton
adf53f1e22 Merge pull request #3982 from overleaf/ae-binary-file-stories
Ensure that BinaryFile stories have full file data

GitOrigin-RevId: 59ea6372517308a31e5b104b25d09a59627feaf2
2021-05-05 02:09:53 +00:00
Alf Eaton
13e6166259 Merge pull request #3974 from overleaf/ae-refactor-context-hooks-usememo
Refactor functions from hooks into context providers

GitOrigin-RevId: f985ec15c16bdb49bedf7b64a0f5fe2853b6bb85
2021-05-05 02:09:50 +00:00
Alf Eaton
dbc909ae54 Merge pull request #3970 from overleaf/ae-remove-filetreereactbridge
Remove showReactAddFilesModal, showReactFileTree, useFileTreeAngularListener and FileTreeReactBridge

GitOrigin-RevId: 61fc54efe761922137b032b9b532975fc101264d
2021-05-01 02:13:18 +00:00
Shane Kilkelly
f1f8c4e152 Merge pull request #3965 from overleaf/ae-file-tree-popup
Use custom overlay for file tree dropdown menu

GitOrigin-RevId: 261b21953f9331427d6d368716662d7eaec65477
2021-05-01 02:13:14 +00:00
Shane Kilkelly
6893cce6c9 Merge pull request #3964 from overleaf/jpa-unique-project-name-with-year
[ProjectHelper] _addNumericSuffixToProjectName: add heuristic for year

GitOrigin-RevId: 24c57d68706bdabba620137674946e3c8e675939
2021-05-01 02:13:10 +00:00
Shane Kilkelly
3c9cd69bfa Merge pull request #3956 from overleaf/ae-icon-story
Add a story for the Icon component

GitOrigin-RevId: fd63c4138fdea197b941b56a404e2dd8b20f7324
2021-05-01 02:13:05 +00:00
CloudBuild
7786a08e54 auto update translation
GitOrigin-RevId: d5ac2e4a22f9bff18bf9d3e8680aa050ba1e34e5
2021-05-01 02:12:59 +00:00
Chrystal Maria Griffiths
3dfcb95802 Merge pull request #3960 from overleaf/cmg-binary-file
[BinaryFile] Reopening of Binary file React migration

GitOrigin-RevId: 050e66e3321bd6579d44932b669fc0a31df06d18
2021-04-29 02:09:38 +00:00
Jakob Ackermann
23c73b9bf1 Merge pull request #3959 from overleaf/jpa-take-note-of-past-url
[UnsupportedBrowserMiddleware] take note of the past URL in redirect

GitOrigin-RevId: d80ed876f87e54c181f00669a11795a2ce44e5a5
2021-04-29 02:09:33 +00:00
Jakob Ackermann
cf496e1fd2 Merge pull request #3958 from overleaf/jpa-script-delete-orphaned-docs-online
[scripts] add a script for deleting orphaned docs

GitOrigin-RevId: f3b16d900cc162852491bd7a83fe1ba61a0579d8
2021-04-29 02:09:29 +00:00
Jakob Ackermann
48edcb0127 Merge pull request #3924 from overleaf/as-remove-ie-banner
Remove unused IE banner after support has been dropped

GitOrigin-RevId: 115e4e371d34ed4b209c683a5b16260ca3beb4c3
2021-04-29 02:09:25 +00:00
Jakob Ackermann
86e74d9e5c Merge pull request #3962 from overleaf/as-upgrade-storybook
Upgrade to Storybook 6.2.9

GitOrigin-RevId: 56936f2d18b61fbfd28ad3cd4eb739a89ceb698e
2021-04-29 02:09:21 +00:00
Jakob Ackermann
b350843b4e Merge pull request #3957 from overleaf/ae-stories-context-root
Add required attributes for ContextRoot in stories

GitOrigin-RevId: c0cabf4eb03785c6232abe417e34bd7916b97046
2021-04-29 02:09:17 +00:00
Jakob Ackermann
adfde7d26b Merge pull request #3950 from overleaf/msm-reenable-lint-prefer-regex-literals
Reenable `prefer-regex-literals` eslint rule

GitOrigin-RevId: 3c576d92a08dfcb745d447b1bf8c7b828753010d
2021-04-29 02:09:10 +00:00
Thomas
72af966c9c Schedule subscription downgrades to occur at the current term end (#3801)
* Schedule subscription downgrades to occur at the current term end.

If the plan is a downgrade, schedule the subscription change for term
end. Use Recurly v3 API subscription change event instead of v2 update
subscription.

* Add ability for user to revert a pending subscription change

In the case where a user has downgraded, but has since decided they'd
rather stay on their current plan, we need a way to let them revert. It
isn't enough to re-use a subscription change, because Recurly sees it as
an attempt to make a change from the current plan to itself.

Instead, we use a new dialog and call a new endpoint that has the
specific intent of reverting the pending plan change, by calling the
removeSubscriptionChange recurly client method.

* Add message prompting users to contact support for immediate changes

We're showing this in the confirmation modal for a plan change that
would occur in the future, and and on the subscription page if a pending
change is due.

Most users shouldn't need this, but it should help them out if they find
an edge case like moving from eg. Student (Annual) to Professional
(Monthly) and were expecting to be "upgraded" immediately.

GitOrigin-RevId: c5be0efbeb8568ed9caa941aadcef6f6db65c420
2021-04-28 02:10:31 +00:00
Miguel Serrano
8fbd4e3340 Merge pull request #3963 from overleaf/revert-3819-msm-update-pdfjs-2-6
Revert "Update `pdf.js` to `2.6.347`"

GitOrigin-RevId: 62402d8e0b99b302206f0edc61411c9477d29249
2021-04-28 02:10:27 +00:00
Miguel Serrano
bac110ee46 Merge pull request #3819 from overleaf/msm-update-pdfjs-2-6
Update `pdf.js` to `2.6.347`

GitOrigin-RevId: fd2a6708077e574a909ff05105ab70ea7c99daf5
2021-04-28 02:10:23 +00:00
Alexandre Bourdin
855f815277 Merge pull request #3930 from overleaf/msm-uppercase-submit-title
Added `submit_title` for uppercase label

GitOrigin-RevId: b74651e8107667cfd882c47b9e1be185e952f9cf
2021-04-28 02:10:19 +00:00
Alexandre Bourdin
82d7d6681e Merge pull request #3927 from overleaf/msm-react-navbar-rename-tooltip
React navbar rename tooltip

GitOrigin-RevId: a933aa8654e0c5b0e22cfc72f6262cc75da0ccf7
2021-04-28 02:10:15 +00:00
Alexandre Bourdin
1436731053 Merge pull request #3929 from overleaf/as-block-ie-config
Add IE11 to unsupported browser config

GitOrigin-RevId: 0a9c5a736a842ec8ccddf9ce7feefec7ac5a2b35
2021-04-28 02:10:12 +00:00
Alexandre Bourdin
affaae14b7 Merge pull request #3917 from overleaf/ab-example-project-ab-test
Example Project Split Test

GitOrigin-RevId: a9d68811c878e32b92e0547311c9e477e4096135
2021-04-28 02:10:08 +00:00
Alf Eaton
1be43911b4 Merge pull request #3942 from overleaf/prettier-trailing-comma
Set Prettier's "trailingComma" setting to "es5"

GitOrigin-RevId: 9f14150511929a855b27467ad17be6ab262fe5d5
2021-04-28 02:10:01 +00:00
Alf Eaton
15011a9982 Merge pull request #3946 from overleaf/ae-upload-error-response
Handle undefined response in upload error handler

GitOrigin-RevId: 09c09bc353d3db3c0f5040c4d99d64fbe3ba56db
2021-04-28 02:09:57 +00:00
Alf Eaton
c102bcac6c Merge pull request #3955 from overleaf/ae-remove-axios
Remove axios dependency

GitOrigin-RevId: 1a1fe2335529a7840096f35aa9cf1ce21f6efe10
2021-04-28 02:09:53 +00:00
Alf Eaton
9e83c42200 Merge pull request #3948 from overleaf/ae-invite-spaces
Remove spaces from invited email addresses

GitOrigin-RevId: 034c4e7297561b9195248eb8a52cd1f800940b6d
2021-04-28 02:09:49 +00:00
Jessica Lawshe
c5a1368d30 Merge pull request #3953 from overleaf/jel-reconfirm-thank-you
Reconfirm UI translation

GitOrigin-RevId: 3dea8abb20763813ea5f1d372269b2b97a9c9747
2021-04-27 02:09:32 +00:00
Jessica Lawshe
517485d7ea Merge pull request #3914 from overleaf/jel-graphs-cached-licenses
Use cached affiliation data

GitOrigin-RevId: b8ae2b871cc1f3a11e61dd449b4d1ddc7835860d
2021-04-27 02:09:28 +00:00
Chrystal Maria Griffiths
4e9d7c36ff Merge pull request #3952 from overleaf/revert-cmg-binary-file
Revert "Merge pull request #3526 from overleaf/cmg-binary-file"

GitOrigin-RevId: 5f539f26992fefd01b07922b1f43a3a3bc753141
2021-04-24 02:10:12 +00:00
Eric Mc Sween
1186c3e9a4 Merge pull request #3526 from overleaf/cmg-binary-file
[BinaryFile] Binary file React migration

GitOrigin-RevId: e229ad8ec3781607b5ca28387927b84d4af95060
2021-04-24 02:10:07 +00:00
Alasdair Smith
f33c00f2fd Merge pull request #3944 from overleaf/revert-3943-revert-3735-as-chat-reducer
Re-do Refactor chat store to use React state

GitOrigin-RevId: 626e3379ddb2f75680742df8957fbe350ba89881
2021-04-24 02:10:01 +00:00
Alf Eaton
ff62a7e63c Enable React add files modal for all users (#3941)
GitOrigin-RevId: 923bf41a8c5e9f0932a1711530446dfd5c8d0d7f
2021-04-23 02:10:09 +00:00
Alf Eaton
5cec4420dc Merge pull request #3940 from overleaf/ae-share-modal-for-everyone
Enable React share modal for all users

GitOrigin-RevId: 2cb288e15770d3169034e4511df6537d010e924d
2021-04-23 02:10:05 +00:00
Alasdair Smith
b3b8502e5e Merge pull request #3943 from overleaf/revert-3735-as-chat-reducer
Revert "Refactor chat store to use React state"

GitOrigin-RevId: e75e2d56a80c3741415bea3941a26f7dd8f505d3
2021-04-23 02:09:59 +00:00
Alasdair Smith
bb4523b7f6 Merge pull request #3735 from overleaf/as-chat-reducer
Refactor chat store to use React state

GitOrigin-RevId: 800a21c3c8a5c3c628c0a13bcb091675d1fb6f25
2021-04-23 02:09:54 +00:00
Alf Eaton
59fe11f0ff Merge pull request #3936 from overleaf/ae-gitignore-js-config
Add .js files in config/ to .gitignore

GitOrigin-RevId: c20ca5a4e58092336829d9cac2700cf3c61a6fd2
2021-04-23 02:09:50 +00:00
Christopher Hoskin
d27ac38057 Merge pull request #3932 from overleaf/csh-add-nvmrc
Add .nvmrc

GitOrigin-RevId: 3b95005c65a4289869b55aebf028c4c6900ec92e
2021-04-22 02:09:44 +00:00
Alf Eaton
2621a1d5bb Merge pull request #3933 from overleaf/ae-csp-report-percentage
Add CSP_REPORT_PERCENTAGE

GitOrigin-RevId: 4afde0da6e3660c83df8c5c9cd31a3f246e9e572
2021-04-22 02:09:40 +00:00
Alf Eaton
8b35db3fc1 Merge pull request #3928 from overleaf/ae-safari-error
Check for existence of elements before attaching event listeners in SafariScrollPatcher

GitOrigin-RevId: 67338581878871cf67fc050dc233da93f14753a7
2021-04-22 02:09:37 +00:00
Alf Eaton
f9bda25072 Merge pull request #3921 from overleaf/ae-remove-broadcast-open
Remove $scope.$broadcast('open') from React controllers

GitOrigin-RevId: 40780c373e14c4dbbd921460638bcb4616f34c86
2021-04-22 02:09:34 +00:00
Shane Kilkelly
07ec567b07 Merge pull request #3902 from overleaf/sk-ref-providers-hide
Editor: don't leak encrypted tokens to frontend
GitOrigin-RevId: 245c1e9d479f7eec2979b46a5959bd3eb9f08363
2021-04-22 02:09:31 +00:00
Jakob Ackermann
58fbbf6269 Merge pull request #3925 from overleaf/jpa-cache-deleted-project
[scripts] back_fill_dummy_doc_meta: add a cache for deletedProjects

GitOrigin-RevId: 3d24c9fc4985f33b2e18f8f63f0b690d65476d1b
2021-04-21 02:09:23 +00:00
Jakob Ackermann
35e9d4ea0b Merge pull request #3923 from overleaf/ta-format-fix
Fix formatting after Prettier 2 upgrade

GitOrigin-RevId: c06462c321f8586e442710e9a1186b3643ae6153
2021-04-20 02:10:25 +00:00
Timothée Alby
0ecebefb0c Merge pull request #3804 from overleaf/msm-react-publish-button
[ReactNavigationToolbar] Submit button

GitOrigin-RevId: 9b40e09f001b44bd2f5035469f0d0c852fea7199
2021-04-20 02:10:19 +00:00
Timothée Alby
f7166c5c1b Merge pull request #3922 from overleaf/jpa-fix-project-restore-deleted-files
[ProjectDeleter] undeleteProject: deletedFiles.projectId is an ObjectId

GitOrigin-RevId: 53bdc7c2a20269ef22ec7ca55a6ccf9339209cdd
2021-04-20 02:10:14 +00:00
Timothée Alby
7d0f117918 Merge pull request #3919 from overleaf/jpa-refactor-inline-script
[views] referal/bonus: refactor inline script in event handler

GitOrigin-RevId: 825f15c1badf964e0e0e2c9bc42951a5f318b357
2021-04-20 02:10:10 +00:00
Timothée Alby
97f89f132c Merge pull request #3920 from overleaf/as-fix-unsupported-middleware
Fix unsupported browser middleware

GitOrigin-RevId: 27dc8cef4747abba85a985c28865340bc5116ab7
2021-04-20 02:10:05 +00:00
Timothée Alby
5520553e34 Merge pull request #3877 from overleaf/jpa-script-regenerate-referreal-ids-optimize-queries
[scripts] regenerate_duplicate_referral_ids: optimize queries, add tests

GitOrigin-RevId: 5b6881b857b20a80bc8db6e01fb7668dc0377675
2021-04-20 02:09:59 +00:00
Alf Eaton
dcd6bd347f Use the full (relative) view path for CSP exclusion (#3916)
GitOrigin-RevId: f6828a447abcc550f0c7dfd0fc6fc72f4b5b1f7e
2021-04-17 02:09:56 +00:00
Alasdair Smith
f7cf7626ec Merge pull request #3820 from overleaf/as-block-ie
Add middleware to block unsupported browsers

GitOrigin-RevId: b1f1e4ae1572c3c323dc72442c8d5169b4879d5d
2021-04-17 02:09:52 +00:00
Jakob Ackermann
e47237f350 Merge pull request #3915 from overleaf/jpa-script-back-fill-dummy-doc-meta
[scripts] back_fill_dummy_doc_meta: bug fixes and limit result size

GitOrigin-RevId: 6823cf626ba7e0e6733a317866512745bb1e5206
2021-04-16 02:05:36 +00:00
Jakob Ackermann
4f8a905e9b Merge pull request #3909 from overleaf/jel-reconfirm-email-template
Add reconfirm email template

GitOrigin-RevId: 2488c79c25a7148f601e3e3e2021cdbee4be7b4c
2021-04-16 02:05:33 +00:00
Jakob Ackermann
78326fb352 Merge pull request #3903 from overleaf/as-clean-up-error-pages
Clean up error pages

GitOrigin-RevId: 764375124ef5349c97416339119471a166d727b5
2021-04-16 02:05:30 +00:00
Jakob Ackermann
d2e6449e79 Merge pull request #3897 from overleaf/tm-meta-tags-billing
[views] migrate subscription templates to meta tags, re-issue

GitOrigin-RevId: c18bb7c96186cc8c34344ecf7cee35f9da19698e
2021-04-16 02:05:27 +00:00
Jakob Ackermann
b276587c42 Merge pull request #3911 from overleaf/ae-share-modal-link-sharing
Only use project sharing data from the websocket connection

GitOrigin-RevId: 4549a6379dfebb00581ca4ddf276654fbbb3701d
2021-04-16 02:05:24 +00:00
Jakob Ackermann
70841f4b3b Merge pull request #3907 from overleaf/jpa-script-back-fill-dummy-doc-meta
[scripts] add a new script for back filling dummy doc meta data

GitOrigin-RevId: d3cb0900f08d4d3264cb1e8a0b3f7e8acdd6eb6c
2021-04-16 02:05:21 +00:00
CloudBuild
83adfff7a6 auto update translation
GitOrigin-RevId: 97358e7132c6afd0ba87bd9b3b61cea88a24054c
2021-04-16 02:05:17 +00:00
Alf Eaton
1ebc8a79cb Merge pull request #3495 from overleaf/ae-prettier-2
Upgrade Prettier to v2

GitOrigin-RevId: 85aa3fa1acb6332c4f58c46165a43d1a51471f33
2021-04-15 02:05:22 +00:00
Alasdair Smith
930d7ba028 Merge pull request #3904 from overleaf/ae-chat-contrast
Fix contrast of chat instructions message

GitOrigin-RevId: 7e5bd375d8bdbf6505a71edc4b1648e2639cd444
2021-04-15 02:05:19 +00:00
Alasdair Smith
676b70b2be Merge pull request #3899 from overleaf/ae-csp-report-sample
Add 'report-sample' to script-src CSP directive

GitOrigin-RevId: 1a2c26339e7ef353a89fc264b0f186a1d313e1bc
2021-04-15 02:05:16 +00:00
Alasdair Smith
c89beb7657 Merge pull request #3905 from overleaf/jel-analytics-licence-api
Proxy analytics request to v1

GitOrigin-RevId: 82bcca52d096b8a9bc590f0ee0a0d3a6054e294e
2021-04-15 02:05:12 +00:00
Alasdair Smith
93492bb25a Merge pull request #3908 from overleaf/jel-reconfirm-ui-meta-tags
Meta tag migration for reconfirm UI

GitOrigin-RevId: b0bda07acc5389b1d5ef4e9ea3d10688ac26f0a0
2021-04-15 02:05:09 +00:00
Alasdair Smith
d7542e60c3 Merge pull request #3895 from overleaf/ta-delete-subscriptions-script
Add Script to Delete Subscriptions

GitOrigin-RevId: fb8eda38f89c897cbd4c6d8bdcba19171b5914d3
2021-04-15 02:05:05 +00:00
Alasdair Smith
3002a34cd3 Merge pull request #3887 from overleaf/hb-GH-sync-react-unlinking
GH-sync react: unlink button when repo returns 404

GitOrigin-RevId: 75d7517e949b0abc7a0db93513f0885f9b0acff7
2021-04-15 02:05:01 +00:00
Alasdair Smith
2b154e273e Merge pull request #3898 from overleaf/as-fix-angular-service-arrow-function
Refactor Angular service method away from an arrow function

GitOrigin-RevId: a83d90d0d44a28d1b898aef0490084def3089f47
2021-04-15 02:04:57 +00:00
CloudBuild
7288fef34f auto update translation
GitOrigin-RevId: c2dc2a25825c73a1b272ec2b05d0e56967f62baa
2021-04-15 02:04:53 +00:00
CloudBuild
3a8c4702ac auto update translation
GitOrigin-RevId: 25782b7b303fc98962d9807db87a133d6cb944a2
2021-04-14 02:04:56 +00:00
Paulo Jorge Reis
98e631a9c7 New logs UI out of beta + fixes (#3868)
* Update new logs pane: remove beta icons, add specific surveys

* Remove unneeded reset of log entries

* Remove unneeded reset of the autocompile linting error flag

* Lower compile event sampling rate ahead of prod release

* Never send logs UI subvariant when user is getting the existing UI

GitOrigin-RevId: ab726761ba372c6806e56fc0cf841099cc30df50
2021-04-13 02:05:54 +00:00
Shane Kilkelly
04fa863f9f Merge pull request #3892 from overleaf/sk-reroll-csrf
Regenerate CSRF token on login

GitOrigin-RevId: 501582b34794a822f4c9fe3af2575b5756511e06
2021-04-10 02:05:13 +00:00
Shane Kilkelly
16d02c9d8b Merge pull request #3882 from overleaf/ab-wfh-ga-events
Add new GA events to WFH2021 links

GitOrigin-RevId: 939f589c359a97b794eceb8e493cccd95ec1913a
2021-04-10 02:05:09 +00:00
Shane Kilkelly
f013f33c05 Merge pull request #3884 from overleaf/jpa-meta-editor-take-2
[misc] migrate the editor templates to meta tags -- take 2

GitOrigin-RevId: 447d4c6c2197dd2c5f5e182a5edf57313557b8b9
2021-04-10 02:05:05 +00:00
Jessica Lawshe
2fca78eaf0 Merge pull request #3896 from overleaf/revert-3834-tm-meta-tags-billing
Revert "[views] migrate subscription templates to meta tags"

GitOrigin-RevId: 8ab3dae6e3aa359b6d7aa69df70a1b1eb2405dfd
2021-04-09 02:05:33 +00:00
Jessica Lawshe
e697064f16 Merge pull request #3834 from overleaf/tm-meta-tags-billing
[views] migrate subscription templates to meta tags

GitOrigin-RevId: 4e81e81380048436a011467c230cc54c02e0c423
2021-04-09 02:05:29 +00:00
Jessica Lawshe
5220198991 Merge pull request #3879 from overleaf/jel-ja-wiki-mathjax
Fix learn wiki XSS

GitOrigin-RevId: 3964b2eaf56ef57ec34e4cdd3e683dd36f9eae6e
2021-04-09 02:05:26 +00:00
Jessica Lawshe
2cb709161e Merge pull request #3875 from overleaf/jel-portal-btn
Update button text on portal

GitOrigin-RevId: 411c18ee84791126eae23b015441e881b967227b
2021-04-09 02:05:21 +00:00
Jessica Lawshe
66105d6937 Merge pull request #3782 from overleaf/revert-3773-revert-3718-jel-emailHasLicence
Revert "Revert "Update emailHasLicence for reconfirmation and SAML""

GitOrigin-RevId: 120ee0ca2f59573578e6279477c6e62972b5fb4a
2021-04-09 02:05:17 +00:00
Miguel Serrano
42a1211ba7 Merge pull request #3888 from overleaf/jpa-hotfix-soft-failure-for-missing-deleted-docs
[EditorHttpController] joinProject: ignore err when fetching deletedDocs

GitOrigin-RevId: e2e2e5172de04cebb4a951739ac4222645fdd289
2021-04-08 02:05:07 +00:00
Brian Gough
11b4d91d9e Merge pull request #3883 from overleaf/bg-expire-tokens
expire tokens from mongo

GitOrigin-RevId: 5666fd40d04e122f2bc2a22bff24c0723e1e9a73
2021-04-08 02:05:04 +00:00
Hugh O'Brien
0aba0300d1 GitHub sync modal react port (#3711)
* GH-sync React - initial left menu github sync react skeleton

* GH-sync modal main switching logic setup and free trial mode

* GH-sync react - message for link sharing users

* GH-sync react: link gh account from modal

* GH-sync React: add export to github form modal

* GH-sync react: display commits and merge buttons

* GH-sync react: merge logic

* GH-sync React: merge endpoint error handling

* GH-sync React: update error handling to new fetch behaviour

* GH-sync React: handle ignoring external updates

* GH-sync React: main switcher modal tests

* GH-sync React: tests for export and merge

* GH-sync react: error handling and error boundary

* GH-sync React: put behind alpha flag

* GH-sync React: re-adding translations lost in rebase and cleanup

* GH-sync React: use renderWithEditorContext for tests and replace missing translations

* GH-sync React review code cleanup
GH-sync React fix state ordering causing errors

GitOrigin-RevId: 37261966683112b399ef180ec6bc4036bc689fd9
2021-04-07 02:05:06 +00:00
Jakob Ackermann
ec7cd9fc3e Merge pull request #3656 from overleaf/jpa-script-back-fill-doc-name
[scripts] add new script for back filling the names of deleted docs

GitOrigin-RevId: c3a7ad8ba1306728bc1a433bec5dc847651bf94d
2021-04-07 02:05:03 +00:00
Jakob Ackermann
76b1cdff51 Merge pull request #3754 from overleaf/jpa-project-restore-handle-deleted-docs
[ProjectDeleter] restore project.deletedDocs meta data into docstore

GitOrigin-RevId: 570543d2cb9c5c790ac49328382ed88ef6ac3129
2021-04-07 02:05:00 +00:00
Jakob Ackermann
9692392bf8 Merge pull request #3655 from overleaf/jpa-change-write-path-doc-deletion
[ProjectEntityUpdateHandler] change write path for doc deletion

GitOrigin-RevId: 7d7ece8fe25c1d59b3469c136d92c4c81e9f0f81
2021-04-07 02:04:57 +00:00
Jakob Ackermann
75dabdd299 Merge pull request #3881 from overleaf/jpa-fix-unit-test
[misc] fix a unit test

GitOrigin-RevId: 22bd33a8c7c4311d8f22881a42e387190aa7c6e7
2021-04-07 02:04:55 +00:00
Jakob Ackermann
3bdf7afbbf Merge pull request #3653 from overleaf/jpa-merge-deleted-docs-sources
[EditorHttpController] fetch deletedDocs from docstore, merge w/ project

GitOrigin-RevId: 5cf46aa7ded034285051ddae21b5c80d8c806693
2021-04-07 02:04:52 +00:00
Jakob Ackermann
92194202d7 Merge pull request #3652 from overleaf/jpa-tell-docstore-doc-name-on-delete
[DocStoreManager] pass doc name as part of DELETE request

GitOrigin-RevId: cdb5fb21580a95aa8a78e0a44ca1e4db4da7f934
2021-04-07 02:04:49 +00:00
CloudBuild
380dc41b17 auto update translation
GitOrigin-RevId: 1c3ebc789f557399d62f9dbd6d1ce716b835b398
2021-04-04 02:05:08 +00:00
CloudBuild
cba05342de auto update translation
GitOrigin-RevId: e920dbbd9bd4411da9f890be91461cfac172dc81
2021-04-03 02:05:02 +00:00
Thomas
eb46f9a738 Merge pull request #3880 from overleaf/revert-3826-jpa-meta-editor
Revert "[views] migrate the editor templates to meta tags"

GitOrigin-RevId: 02caaf24ae0ee6a74a38ef870909527da19d4882
2021-04-02 02:05:02 +00:00
Jakob Ackermann
23be656aec Merge pull request #3746 from overleaf/jpa-hard-deletion-from-deleted-files
[ProjectDeleter] hard deletion of project deletes deletedFiles entries

GitOrigin-RevId: b514c34465d5fdc66b40aae5bcdb8b66975bc350
2021-04-02 02:04:58 +00:00
Shane Kilkelly
9c38d41652 Merge pull request #3872 from overleaf/jpa-batched-update-work-around-mongo-bug
[scripts] work around broken .setReadPreference() on mongo cursor

GitOrigin-RevId: 127c0593f4c20e45acb15ec26b45a45d9449d9ba
2021-04-02 02:04:56 +00:00
Shane Kilkelly
ae212feec4 Merge pull request #3701 from overleaf/jpa-script-back-fill-deleted-files-stage-2
[scripts] back_fill_deleted_files: optionally fix partial inserts

GitOrigin-RevId: 7d48d311db1af0b38222725ca86cdba8951b16b3
2021-04-02 02:04:52 +00:00
Shane Kilkelly
b9b4ca224c Merge pull request #3862 from overleaf/tm-remove-comms-introducing-archiving
Remove comms which introduced per-user archiving and trashing

GitOrigin-RevId: e8bd7bd741fe25f4530f447cf020b499256745dc
2021-04-02 02:04:49 +00:00
Miguel Serrano
f9962fefe8 React git-bridge modal (#3869)
GitOrigin-RevId: 5b2609ed9ad7909a10cb08342053e955447688f5
2021-04-01 02:06:05 +00:00
Miguel Serrano
a0393e14af Merge pull request #3870 from overleaf/ae-project-tokens
Fix applying new link sharing tokens to scoped project data in React Share modal

GitOrigin-RevId: 8234e836b5d7301896b877748461911180c81a72
2021-04-01 02:06:01 +00:00
Alexandre Bourdin
973e6f31d7 Merge pull request #3871 from overleaf/ab-referral-id-script-timeout
Increase timeout for initial query of referral ID generation script

GitOrigin-RevId: f60d67ed8a8862c771a1dc33332230d73145ae51
2021-04-01 02:05:58 +00:00
Brian Gough
1d30feecaf Merge pull request #3855 from overleaf/bg-skip-metadata-for-single-user
skip metadata broadcast for single user

GitOrigin-RevId: 4277870615aea1b07e1a8db6a26956be3661a443
2021-04-01 02:05:55 +00:00
Eric Mc Sween
9ddaa8c9f6 Merge pull request #3830 from overleaf/em-upgrade-node-12
Upgrade to Node 12

GitOrigin-RevId: 19870922884b7c98e7e5f2c94df21829672d2db5
2021-04-01 02:05:52 +00:00
Eric Mc Sween
c2f16621db Merge pull request #3803 from overleaf/ab-regenerate-duplicate-referral-ids-script
Add script to regenerate duplicate referral IDs

GitOrigin-RevId: cbcd7027f8dc342140ca5c22ed20c7814561e118
2021-04-01 02:05:49 +00:00
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
Alf Eaton
989aeca7f2 Organise modal stories into a "Modals" folder (#3814)
GitOrigin-RevId: bced6f0591d14c9d56ce5875acd5598216285487
2021-03-26 03:04:49 +00:00
Alf Eaton
79a520dd1c Use defaultVariables to define variables for all translations (#3815)
GitOrigin-RevId: d7b30f523edba7c384d5207a44643acdbbedc74c
2021-03-26 03:04:45 +00:00
Alf Eaton
974fe8fd39 Remove optional hyphens from pug templates (#3788)
GitOrigin-RevId: 2d31719a6aaefb85bba323d65ed66bdb06ec8928
2021-03-25 03:05:05 +00:00
Alf Eaton
54e6053cf9 Fix some aria-hidden attributes (#3790)
GitOrigin-RevId: a48086c01abd937b2e03ced38e8baf6c67753f56
2021-03-25 03:05:01 +00:00
Alf Eaton
ee79728bf9 Only check a user's features for importing from reference provider (#3797)
GitOrigin-RevId: cc5a36be20c673f8941a2694eaeba80eebb4db6a
2021-03-25 03:04:57 +00:00
Alf Eaton
cddb01c72b Update settings-sharelatex (#3775)
GitOrigin-RevId: 585e4c0db91a20662bac9aa8cf50b40b6622aaa5
2021-03-25 03:04:54 +00:00
Brian Gough
0452b53ce3 Merge pull request #3802 from overleaf/bg-increase-flush-delay
increase single and multi-user flush delays

GitOrigin-RevId: c9415a093d08c8f6cc403d0ddb6cd313ea99aebe
2021-03-24 03:04:45 +00:00
Paulo Jorge Reis
3f0e897e32 Logs UI variant without popup (#3794)
* Add logs UI without pop-up variant

* Implement frontend for logs UI without pop-up

* Add logs UI variants to admin panel and front user info

* Fix existing UI subvariant window global

GitOrigin-RevId: 075db56032354d782e489b5235925f55b1a67e0b
2021-03-24 03:04:41 +00:00
Jakob Ackermann
b19bd1ef61 Merge pull request #3781 from overleaf/jpa-xss-18
[views] mitigate Angular XSS in the user-activate module

GitOrigin-RevId: 88a4501699b92e33c7ee120d180e60825d82fbd5
2021-03-23 03:05:21 +00:00
Jakob Ackermann
535c97e8cf Merge pull request #3774 from overleaf/jpa-meta
[frontend] import meta tag processing from das7pads fork

GitOrigin-RevId: ca74ff9fbbcb51091a626a45468ff3d24d6136ca
2021-03-23 03:05:12 +00:00
Alf Eaton
2e305f36bc Ensure that Features.hasFeature returns a boolean (#3796)
GitOrigin-RevId: f3961f032c6c91c29afaf239c291857798dad3ad
2021-03-20 03:04:41 +00:00
Paulo Jorge Reis
15f49994bd New compile UI autocompile (#3762)
* Animate recompile button when autocompile is waiting

* Add code-check failed notice to the new compile UI

GitOrigin-RevId: 83b62f41438e8e5b94bd893c222bec37745c0f57
2021-03-19 03:04:50 +00:00
Alf Eaton
ba4300d9e1 Merge pull request #3518 from overleaf/ae-react-create-file-modal
Migrate "Add Files" modal to React

GitOrigin-RevId: fc5235108ee65294e3176da9c327791c34aa5b3c
2021-03-19 03:04:46 +00:00
Brian Gough
0ca6b5921f Merge pull request #3789 from overleaf/bg-fix-root-doc-override
suppress root doc override when in the root doc

GitOrigin-RevId: 3671dece0857b114d0b40cdc2161be0546377985
2021-03-19 03:04:43 +00:00
Brian Gough
be95516185 Merge pull request #3761 from overleaf/bg-redis-and-request-cleanups
redis and request cleanups

GitOrigin-RevId: d2bf133ef823c96b06eb09b4ef2c83ba7c54cd12
2021-03-19 03:04:40 +00:00
Jakob Ackermann
83a38a9980 Merge pull request #3764 from overleaf/jpa-drop-alternative-plans-page-logic
[SubscriptionController] drop unused handling of alternative plans page

GitOrigin-RevId: 1a4ec8276ac0ea87567cfbad9f8d82544267320c
2021-03-18 03:05:04 +00:00
Jakob Ackermann
1e2ed05bed Merge pull request #3760 from overleaf/jpa-xss-5
[views] mitigate Angular XSS on new project from template POST gateway

GitOrigin-RevId: a19de060cad0baf2822d1b6df419bbe1a2361ea4
2021-03-18 03:04:54 +00:00
Jakob Ackermann
f353728bda Merge pull request #3755 from overleaf/jpa-xss-2
[views] mitigate Angular XSS via email/new_email

GitOrigin-RevId: 3d127c283ba9f97c5b0e6c53a9d77f7f597058bb
2021-03-18 03:04:50 +00:00
Jakob Ackermann
7609b741fa Merge pull request #3768 from overleaf/jpa-xss-10
[views] mitigate Angular XSS on password reset page

GitOrigin-RevId: 65f423fcb1a3afff0f396bb8e173d1e1bcff056a
2021-03-18 03:04:45 +00:00
Jakob Ackermann
8766c23abb Merge pull request #3767 from overleaf/jpa-xss-9
[views] mitigate Angular XSS in email confirmation post gateway

GitOrigin-RevId: 11cd752d520054e448b3eeea431fe27f3c02fa00
2021-03-18 03:04:41 +00:00
Jakob Ackermann
115fe20184 Merge pull request #3766 from overleaf/jpa-xss-8
[views] mitigate Angular XSS in affiliations section of user settings

GitOrigin-RevId: bad444cea136c51f54546770653f21cec6fa70e3
2021-03-18 03:04:38 +00:00
Jakob Ackermann
58841ecbe9 Merge pull request #3765 from overleaf/jpa-xss-6
[views] mitigate Angular XSS in subscription dashboard

GitOrigin-RevId: 4ac0c431d520957aabd53436ae29a30c2aef3870
2021-03-18 03:04:34 +00:00
Thomas
001f7f0cc2 Merge pull request #3773 from overleaf/revert-3718-jel-emailHasLicence
Revert "Update emailHasLicence for reconfirmation and SAML"

GitOrigin-RevId: 637b85d10fc0c79e8d55e51b43952e956d73baa6
2021-03-16 03:04:44 +00:00
Thomas
fee245b570 Merge pull request #3732 from overleaf/tm-recurly-create-admin-link
Create link to Recurly in admin panel

GitOrigin-RevId: 214802e9fbe16954d455ac04eb176ff27890769c
2021-03-16 03:04:40 +00:00
Thomas
1c54a15e42 Merge pull request #3718 from overleaf/jel-emailHasLicence
Update emailHasLicence for reconfirmation and SAML

GitOrigin-RevId: 58daf538d9f0a7db46bb3c1e21f8ca04df095446
2021-03-16 03:04:36 +00:00
Jakob Ackermann
18eea6d024 Merge pull request #3763 from overleaf/jpa-xss-7
[views] mitigate XSS on new subscription page

GitOrigin-RevId: 74baa58527aa9b2f9e434c280885b627f73898b6
2021-03-13 03:05:14 +00:00
Alf Eaton
d9576189a3 Merge pull request #3636 from overleaf/ae-share-modal-split
Migrate Share modal to React

GitOrigin-RevId: 96a52df6ffd751cfcca2bbb68eb9e7a6dc31ff28
2021-03-13 03:05:10 +00:00
Miguel Serrano
a555f0d309 [ReactNavToolbar] Project name + pdf and share project buttons (#3709)
* Added project name, pdf toggle and share project buttons to navigation toolbar

* Added PropTypes check to `useChatContext()`

* React context updates for project name/rename, pdf view and share moda

* Hide PDF button when pdfLayout != 'flat'

GitOrigin-RevId: 3f4a1b072259df7148d3417cd22116702bdd79ac
2021-03-11 03:05:33 +00:00
Alf Eaton
c3a6ac320b Remove AbortController usage (#3739)
GitOrigin-RevId: 662589bc8da8133036e4e9211098a9c5545c8edf
2021-03-11 03:05:29 +00:00
Miguel Serrano
3c2351c22f Merge pull request #3740 from overleaf/ae-safari-remove-event-listener
Add required arguments for removeEventListener in Safari

GitOrigin-RevId: ad1cc79b12e56dc1019920964a93acbe1bec10ff
2021-03-11 03:05:26 +00:00
Alexandre Bourdin
b8fc4b58ca Merge pull request #3741 from overleaf/ta-refresh-institution-users
Refresh Institution Users Script Changes

GitOrigin-RevId: 917287450ba30a9f8b605a2d38933a0f6e1979e6
2021-03-11 03:05:21 +00:00
Alexandre Bourdin
cb19041b7f Merge pull request #3736 from overleaf/ab-review-icon-light
Invert review icon color when selected

GitOrigin-RevId: e6e0d76c969d52e1632ea486042c353a0c77d0b4
2021-03-11 03:05:18 +00:00
Alexandre Bourdin
9415a1dd8d Merge pull request #3726 from overleaf/ta-ab-analytics-events
Add new analytics events

GitOrigin-RevId: f71a6dc5ccd44bdabb48c601f9f0e005cc765077
2021-03-11 03:05:15 +00:00
Alexandre Bourdin
623d77cef6 Merge pull request #3717 from overleaf/ae-file-tree-context-minimal
Wrap file tree context functions in useCallback

GitOrigin-RevId: 86fbaf4f168bbe31f474bdea38d2cd09b69c950f
2021-03-11 03:05:11 +00:00
Alexandre Bourdin
8001e55b88 Merge pull request #3716 from overleaf/ta-tried-to-confirm-saml
Show Descriptive Error Mesage When Trying To Confirm SAML Email

GitOrigin-RevId: bb816d3774c18f2952851affb1f8d7c174570ba1
2021-03-11 03:05:08 +00:00
Alexandre Bourdin
6e35561aeb Merge pull request #3725 from overleaf/ab-ta-pdf-sync-spinner
Stop spinner on PDF sync when file does not exist anymore

GitOrigin-RevId: cba4bf3dd3d90c2894c6c5f1b28d184f18bb08fd
2021-03-11 03:05:04 +00:00
CloudBuild
da6222fc58 auto update translation
GitOrigin-RevId: 49dc8b4692f8ed76a24337dda76588f5e731cbec
2021-03-11 03:05:00 +00:00
Thomas
fc4f71a0c0 Merge pull request #3704 from overleaf/jel-reconfirm-disable-btn
Disable "Make Primary" button when reconfirmation needed

GitOrigin-RevId: df821185ce84c64ed1a8f4d413dd35ef18aa9e0c
2021-03-09 03:04:43 +00:00
Thomas
99834f0d7e Merge pull request #3738 from overleaf/jpa-fix-xss-registration
[misc] fix angular xss on user registration page

GitOrigin-RevId: 5dcc2aa0212371f154fba563d21018379292b9fe
2021-03-09 03:04:40 +00:00
Thomas
695561aa01 Merge pull request #3733 from overleaf/tm-mathjax-query-param
Add query parameter to MathJax script path

GitOrigin-RevId: c4f17505a23f8de4f5f5c7e62f74db930a029c22
2021-03-09 03:04:37 +00:00
Jakob Ackermann
6eaf4abe46 Merge pull request #3719 from overleaf/jpa-script-user-export
[scripts] add a new script for exporting user data

GitOrigin-RevId: 54be134696b3a44717d9a02d3951e5112d74fa35
2021-03-09 03:04:32 +00:00
Alf Eaton
59f6f34083 Merge pull request #3710 from overleaf/ae-refactor-hotkeys-modal
Refactor "HotKeys" modal

GitOrigin-RevId: 1df86322bac229bb04092e872300e5f1ee4cbddc
2021-03-06 03:04:46 +00:00
Alf Eaton
c8f139cced Merge pull request #3707 from overleaf/ae-refactor-word-count-modal
Refactor "Word Count" modal

GitOrigin-RevId: 00561b5b3f8f161238321c440ecde67cd42ece1c
2021-03-06 03:04:42 +00:00
Alf Eaton
1707a2555b Merge pull request #3705 from overleaf/ae-refactor-clone-modal
Refactor "Copy Project" modal

GitOrigin-RevId: b6039d57c29c04a7cd20dd4a2ab5216d485c05ed
2021-03-06 03:04:39 +00:00
Thomas
2d8167fa0a Merge pull request #3675 from overleaf/tm-main-landmarks-a11y
Add main landmark roles to multiple templates

GitOrigin-RevId: 80ae851fae015b21a3210d71d04287c0c9a3024d
2021-03-05 03:05:00 +00:00
Thomas
84a4cc33be Replace vendor MathJax with NPM package, upgrade to 2.7.9 (#3702)
* Replace vendor MathJax with NPM package, upgrade to 2.7.9

* Disable fast-preview feature in Mathjax

GitOrigin-RevId: e3ef1dbabae1da7c359e370a2c491a4214841c76
2021-03-05 03:04:57 +00:00
Alasdair Smith
522a71b514 Merge pull request #3708 from overleaf/msm-fix-chat-stories
Fix chat stories

GitOrigin-RevId: 7a36d9649486c203ba9334a18e380a595014e646
2021-03-05 03:04:53 +00:00
Alasdair Smith
d8baef0077 Merge pull request #3712 from overleaf/pr-fix-chat-resizer
Set chat resizer "closed" size to zero

GitOrigin-RevId: 0b774efb9d921134e190c263a8969d9411988501
2021-03-05 03:04:49 +00:00