Commit graph

454 commits

Author SHA1 Message Date
Alexandre Bourdin
150cf21710 Merge pull request #13311 from overleaf/ab-tear-down-subscription-pages-react
[web] Tear down subscription-pages-react test and remove Angular code

GitOrigin-RevId: 3cf906e476ffa52a058ccb4e4acbb89a657bd021
2023-07-17 10:22:45 +00:00
M Fahru
2360ed2623 Use the same Git paywall for project owner and collaborator when both are free users (#13271)
GitOrigin-RevId: 4cf47769a08a7ff671690b09fe411d5b9e717a4f
2023-06-02 08:07:49 +00:00
M Fahru
8c549aa0fa Implement new welcome page UI with split test (#11677)
GitOrigin-RevId: 3028ee5e34802e4f9a29cb752fcfa8ca6d5c284c
2023-06-01 08:05:01 +00:00
Miguel Serrano
51223315e4 Merge pull request #13164 from overleaf/msm-email-limit
[web] limit user email addresses to 10

GitOrigin-RevId: 038214cc921d86a407391e6c82fa9cd16a7f9646
2023-05-29 08:04:04 +00:00
M Fahru
3e315eada1 Teardown old project list frontend code (#11950)
* Remove frontend project list angular code (pugfiles + controllers)

* Remove unused translation keys in every language

GitOrigin-RevId: e0514721d6a32ca2de7d1be9433da3476ba1680c
2023-05-26 08:05:02 +00:00
Jimmy Domagala-Tang
76d0d82e74 Merge pull request #13027 from overleaf/jdt-personal-plan-split-test
Personal plan split test

GitOrigin-RevId: 067973398c57be7466f6529f28fbfd896c86b10b
2023-05-25 08:05:52 +00:00
Tim Down
fd8557ef39 Merge pull request #13159 from overleaf/td-history-comparison-text-icon-tweaks
History migration: Icon and text changes to version comparison, switch order of from and to

GitOrigin-RevId: e31db255c55caf15481ed0237875e637c0ac0861
2023-05-23 08:04:15 +00:00
Tim Down
ebbb4fd6d0 Merge pull request #13093 from overleaf/td-history-cm6-translations
History migration: Use translatable strings in history diff highlight tooltips

GitOrigin-RevId: 90c127b792c116c5805ee191b80564eb763cee44
2023-05-17 12:05:12 +00:00
Tim Down
c870bd5f53 Merge pull request #13104 from overleaf/td-history-compare-to-from
History migration: Add "compare to" and "compare from" options

GitOrigin-RevId: f550ad06b1e812011ecb32e6772354eb0abc2163
2023-05-17 12:04:56 +00:00
Miguel Serrano
b2a0fd13e6 [web] Git Bridge modal with Personal Access Token (#13058)
* [web] Git Bridge modal with Personal Access Token

* [web] Added `git-bridge-modal-tokens` unit tests

GitOrigin-RevId: 854ce83bba91b9d97afa950d49ce18f62970fb5b
2023-05-17 09:28:10 +00:00
Miguel Serrano
27c2d1c16e [web] Personal Access Token Settings UI (#13040)
* [web] Personal Access Token Settings UI

* [web] Add Personal Access Token Settings UI to settings page

* [web] Added `personal-access-token-settings` unit tests

GitOrigin-RevId: 353b2f1a2b57c3292554f129be6cbb4f8f8382f8
2023-05-17 09:28:01 +00:00
Mathias Jakobsen
988fc57574 Merge pull request #13077 from overleaf/mj-figure-modal-tests
[web] Add cypress tests for figure modal

GitOrigin-RevId: 4debae1c665a68fd7bfa9f0dcfc150bec38a7c64
2023-05-17 08:06:33 +00:00
Mathias Jakobsen
c754eaf5c5 Merge pull request #13108 from overleaf/mj-figure-modal-translations
[web] Translate figure modal

GitOrigin-RevId: b9f2c2e9ba3141dfee15c0af572a022a2b21fd47
2023-05-17 08:06:16 +00:00
June Kelly
ff4ac0a803 Merge pull request #12851 from overleaf/jk-dashboard-filter-visibility
[web] Improve filter visibility on project dashboard

GitOrigin-RevId: de7a9f999d6d0164ab3c18c58e305c7c628f946c
2023-05-17 08:03:39 +00:00
Mathias Jakobsen
5fd4504f51 Merge pull request #13061 from overleaf/mj-cm6-translations
[web] Make translations accessible to CM6

GitOrigin-RevId: ef617638419597548e6e0545bac3ac94216177de
2023-05-16 08:04:11 +00:00
Alexandre Bourdin
caeceba28c [web] INR Geo pricing test (#12976)
* Implement INR geopricing test

* Show again the INR banner after 30 days

* Update INRBanner to direct users to the plans page and add tracking

* Remove local testing hack in GeoIpLookup

* Update formatter for subscription dashboard

* Flip assignment to assign all users and add event segmentations

* Fix linting

* Review suggestions - factorised recommended currency helper function

GitOrigin-RevId: b1616520f8c7ead689a840720057297e67d3f574
2023-05-11 08:03:59 +00:00
Jakob Ackermann
b0633b3a47 Merge pull request #12842 from overleaf/jpa-logout
[web] remove GET /logout endpoints

GitOrigin-RevId: 93f9498fdb66ece5028d90941aac50cda2737604
2023-05-04 08:05:57 +00:00
Alf Eaton
e0d9069131 [cm6] Add "within selection" option to the search form (#12798)
* Use forked @codemirror/search
* Use getPanel to get the search panel
* Remove layer-based highlightSelectionMatches
* Add "within selection" option to the search form
* Add test for "replace all within selection"
* Fix tests

GitOrigin-RevId: 95ce76fd017f96278b04c16a1fd34f785f7504a3
2023-05-01 08:05:02 +00:00
M Fahru
0648b8aa6c Implement deleted file restore for history react (#12753)
* Add strikethrough to deleted file tree item in history file tree

* Add "restore file" button on toolbar if the selected file have a `removed` operation.

* Implement "restore file" functionality on removed file:

- Refactor the `Selection` object in history context value since we need the `deletedAtV` data which currently is not passed through the state.
- Refactor and clean up file tree type system to support passing through the whole `FileDiff` object for getting the `deletedAtV` data which only appear on `removed` operation
- Implement `postJSON` with file restoration API and pass it on restore file onClick handler at toolbar

* Implement loading behaviour while restoring file is inflight:

- Add `loadingRestoreFile` to `LoadingState`
- Change restore file button to `Restoring...` when in loading state.

* Refactor:

- Rename `DiffOperation` to `FileOperation`
- Extract `isFileRemoved` and `isFileRenamed` to its own file
- Extract `Toolbar` components into small files

GitOrigin-RevId: 2e32ebd2165f73fc6533ff282a9c084162efd682
2023-04-28 08:04:59 +00:00
ilkin-overleaf
0895e33235 Merge pull request #12773 from overleaf/ii-history-react-changes-list-dropdown
[web] Actions dropdown history migration

GitOrigin-RevId: 6b7055501c5eb1529b1794db92bb9f5f3faa6648
2023-04-26 08:05:24 +00:00
June Kelly
f5740e6b17 Merge pull request #12593 from overleaf/jk-remove-plans-split-test
[web] Remove 'plans-page-layout-v3' split test

GitOrigin-RevId: 91e0d3d8bc40632df630131b2e872fa824015da5
2023-04-26 08:04:21 +00:00
Davinder Singh
10f879eab8 Merge pull request #12365 from overleaf/ds-deleted-project-page
Admin panel- Deleted project info page migration to react

GitOrigin-RevId: a964d80b3a2ef25340452fccdab6bdc51c01c59e
2023-04-26 08:04:03 +00:00
M Fahru
4dec157e08 Implement history react toolbar UI (#12530)
There are two different UI in this PR: `comparing` and `viewing` mode.

- For `comparing`, the user would be shown two separate date. It uses the `UpdateRange` object and this PR adds a timestamp to both `fromV` and `toV` of the object type.
- For `viewing`, the user would only be shown one date since `viewing` mode means viewing a specific update version.

Some other notable changes:

- Move `diff` state to `diff-view.tsx`, which contains `main.tsx` (main editor history view) and `toolbar.tsx` as its children
- refactor `autoSelectFile` by passing `updateRange.toV` directly
- refactor `updateIsSelected` by passing an object that contains `fromV` and `toV` instead of passing `update

There's also a cypress test for both the `viewing` mode and `comparing` mode in this PR.

GitOrigin-RevId: ba54f073f3479c55a39eb6b2932ea7faff78dddc
2023-04-21 08:03:39 +00:00
Jessica Lawshe
6fc5385ca6 Merge pull request #12249 from overleaf/tm-gallery-top-picks
Implement top picks in template gallery for CVs

GitOrigin-RevId: 22f720582e27fac2b9e454ce4e28bd124de094b7
2023-04-19 08:03:19 +00:00
Tim Down
38998afa8e Implement history diff viewer buttons (#12439)
GitOrigin-RevId: 0ed8eb8568783b4938188a86c4ee75c767e6d713
2023-04-17 08:05:41 +00:00
Alf Eaton
dda9230c6c [rich text] Add "Insert Citation" and "Insert Cross-reference" buttons (#12529)
GitOrigin-RevId: fde2f1a281318afede138ccae12f73ade3fa9f65
2023-04-17 08:04:34 +00:00
Alexandre Bourdin
f03b75e55f [web] Tags/color picker tweaks (#12595)
* Change wording of tags header and hide uncategorized when tags list is empty

* Add a tooltip on the colour picker more button

* Fix linting

GitOrigin-RevId: 07e1c411c2c9f6f66e0a00c1610af662b829c4e4
2023-04-13 08:04:37 +00:00
Alexandre Bourdin
376d9c43a3 Merge pull request #12374 from overleaf/ab-rename-folders-tags
[web] Rename folders to tags

GitOrigin-RevId: 05c34c515aeeb9230ed512c267f97bcb679767a8
2023-04-13 08:04:20 +00:00
Alexandre Bourdin
481cd14cb1 Merge pull request #12557 from overleaf/ii-history-react-labels-only
[web] History labels only list

GitOrigin-RevId: 58b8e5a5af0754e32841223f9c478c25900df526
2023-04-13 08:04:12 +00:00
Alexandre Bourdin
04c204f989 [web] Colour picker for tags (#12255)
* Base for color picker

* React color picker and updated modals

* Add tag color picker to mobile dashboard

* Update existing tests and fix disable save button condition

* CSS adaptations for desktop modal streched into mobile display

* Update TagsController tests

* Add aria-hidden label on color pickers

* Fix linting

* Fix project list test

* Select random color when creating tag

* Cleanup leftovers in project list context

* Test cleanup

* Pre-select custom color and store local color while picking

* Add type to preset colors

* Add css fix to override disabled button opacity

* Skip redundant check

* Fix linting

* Add back btn-secondary on manage tag modal after rebase

GitOrigin-RevId: a4cf24e85cc0ca01466f4bf9c77482be8360e68e
2023-04-13 08:04:03 +00:00
June Kelly
841df71a1d Merge pull request #12342 from overleaf/jk-password-ux-please-use-another-password
[web] Password UX: 'Please use another password'

GitOrigin-RevId: ca9b26cbcf2dabb27c716da314764ee40ffc83dd
2023-04-12 08:04:13 +00:00
ilkin-overleaf
8e0aa685ce Merge pull request #12549 from overleaf/ii-history-react-list-of-all-versions
[web] All versions of history entries

GitOrigin-RevId: 7365ac4913c115b3b2872a3713d893463719c15e
2023-04-12 08:03:47 +00:00
June Kelly
a140e3dc8c Merge pull request #12269 from overleaf/jk-enable-password-similarity-check
[web] Enforce password similarity check

GitOrigin-RevId: 1bc4efebba401663c1db9d209dc560560f160ce0
2023-03-23 09:04:12 +00:00
ilkin-overleaf
122d2310e6 Merge pull request #12278 from overleaf/ii-change-email-confirmation
[web] Show confirmation modal when making an email primary

GitOrigin-RevId: eb67fc37c18a5ecd59973baa27ee9ef8e4b67423
2023-03-21 09:04:23 +00:00
Jakob Ackermann
df3c7e48ab Merge pull request #12198 from overleaf/jpa-force-new-compile-domain
[web] changes for force-new-compile-domain test

GitOrigin-RevId: a4ceaf46fdcebed156d155385cbbc2f06405d31f
2023-03-17 09:04:49 +00:00
Miguel Serrano
720475a482 [web] remove remaining Angular settings (#12166)
* [web] remove remaining Angular settings

* cleanup old settings locales

GitOrigin-RevId: ff81b46b3af78c7dd9518304c224446ea7c04680
2023-03-14 09:04:37 +00:00
Mathias Jakobsen
5fd4acffd5 Merge pull request #12159 from overleaf/jel-translations
[web] Add translations for top nav and footer

GitOrigin-RevId: 4240943e91ea6e1d19ce020cdacfe05c0302fdf8
2023-03-14 09:04:05 +00:00
Mathias Jakobsen
89ce4757fa [web] Update commons notifications (#12149)
GitOrigin-RevId: 0a39ce64c34467cd3a2c3304c2aba5e8bea64956
2023-03-14 09:03:57 +00:00
Thomas
5dc15a19de Merge pull request #12083 from overleaf/tm-teardown-refreshed-payment-page
Tear down refreshed payment page test, keeping refreshed page

GitOrigin-RevId: 4f0d9a1f4bcd3b018b12372fbe86aad3c8e41fbd
2023-03-10 09:04:18 +00:00
M Fahru
f7131b720b Implement onboarding video tour split test (#11889)
* Implement onboarding video tour split test:

- Add split test infrastructure
- Create new `OnboardingVideoTourModal` component
- Place the component inside the editor pug template with a split test

* add event segmentation for `onboarding-video-tour-close-button-click` event:

1. video: `first` | `second`
2. firstVideoWatchingTimeInSecond: total time watching first video
2. secondVideoWatchingTimeInSecond: total time watching second video (0 if skipped)

* add event segmentation for:

1.  `onboarding-video-tour-dismiss-button-click`
2. `onboarding-video-tour-next-button-click`
3. `onboarding-video-tour-done-button-click`

with these key/value:

1. firstVideoWatchingTimeInSecond: total time watching first video
2. secondVideoWatchingTimeInSecond: total time watching second video (0 if skipped/not watched yet)

* Use contentful to host video assets

GitOrigin-RevId: 27a6f38d15d7a03b07455e216dda63d99983ca80
2023-03-02 09:05:43 +00:00
ilkin-overleaf
9f95c7c2ab Merge pull request #11919 from overleaf/ii-react-subscription-dash-user-email-not-matching-recurly-email
[web] Subscription dash user email not matching recurly email section - react migration

GitOrigin-RevId: 8d89dbc804694afffea2a92cebdeb5d4e9389810
2023-03-01 09:02:47 +00:00
Thomas
16b2d27fde Update B2B Groups and Enterprise banners (#11989)
* Tear down B2B banner ad split test and implement updated ads

GitOrigin-RevId: 7d09d54bef7cb4e2b2b597d3834e0f58551b179e
2023-02-28 09:04:31 +00:00
Jessica Lawshe
0037e45740 Merge pull request #11970 from overleaf/ab-sub-dash-already-have-warning
[web] Display a warning on subscription dash when coming from plans page

GitOrigin-RevId: 6c6294fbf634a5dcd1a09b94538add6586ebd15b
2023-02-24 09:05:20 +00:00
Jessica Lawshe
ebc04e4a9d Merge pull request #11888 from overleaf/jel-subscription-dash-cancel-plan
[web] Migrate cancel subscription to React

GitOrigin-RevId: 8482fd61894c8011b4c980263ae1d41f396233c6
2023-02-24 09:05:12 +00:00
Alexandre Bourdin
d2fb800174 Merge pull request #11885 from overleaf/ab-personal-sub-custom-react
[web] Display a message for custom personal subscriptions in React dash

GitOrigin-RevId: c70986ffacfdfdeccd3675385e2e5dba1a2ad61f
2023-02-23 09:05:13 +00:00
Alexandre Bourdin
8b00a496e7 Merge pull request #11881 from overleaf/ab-custom-subscription-react-dash
[web] Add a contact support message for custom subsbcriptions on React dash

GitOrigin-RevId: e2a2bb27b4f1e70cbbe62f4c837fe63d81a820c2
2023-02-23 09:05:05 +00:00
Alexandre Bourdin
d6e9508aed [web] Migrate managed publishers to React dash (#11749)
* Migrate managed publishers to React dash

* Decaf cleanup + async/await PublishersGetter

* Continue migration of managed publishers to react dash

* Fix linting

* Add tests

* Decaf cleanup PublishersGetterTests

* Update PublishersGetter tests

* Rename component files to kebab-case

GitOrigin-RevId: cb1fe14d120457c965a9d23a8ddb2c2c92e1d5da
2023-02-23 09:04:03 +00:00
Jessica Lawshe
124306d7ac Merge pull request #11819 from overleaf/jel-subscription-dash-change-to-group-prices
[web] Show price in change to group plan modal on React subscription dash

GitOrigin-RevId: 6a1a4be3a7d008cd9e26186c2d97bc0bdc2f82ed
2023-02-22 09:05:13 +00:00
Jessica Lawshe
b2a10260be Merge pull request #11773 from overleaf/jel-subscription-dash-change-to-group
[web] Begin change to group plan via React subscription dash

GitOrigin-RevId: 3f0f2820ab18ecc8337746282295302d7951c56f
2023-02-22 09:04:56 +00:00
Alf Eaton
7515cf5cb4 [rich text] Add translations and tests for toolbar buttons (#11883)
GitOrigin-RevId: 11c93215fcd7131b59b6990a3b81361e5b193a71
2023-02-21 09:04:35 +00:00
Jessica Lawshe
d539aaf226 Merge pull request #11681 from overleaf/jel-confirm-subscription-change
[web] Plan change request in subscription dash

GitOrigin-RevId: 9afe22b2da035f887c6fa9abe8129711d492108c
2023-02-17 09:05:51 +00:00
Alf Eaton
1807f18b7d Add a tooltip to the disabled Rich Text toggle (#11843)
GitOrigin-RevId: e7be96c68d87ab1f1ed40c8e9784160689ee8e96
2023-02-17 09:04:15 +00:00
Davinder Singh
c524fee690 Merge pull request #11694 from overleaf/ab-managed-institutions-react
[web] Migrate managed institutions to React dash

GitOrigin-RevId: 535dfafe42d88189bb20e7bb3beac233221ee6ba
2023-02-15 09:04:55 +00:00
Davinder Singh
ba2d5db50c Merge pull request #11670 from overleaf/ab-manage-members-back-button
[web] Add a back button on the members/managers management pages

GitOrigin-RevId: 7a723853683438ebac91eb534f9fb9a445a306c9
2023-02-15 09:04:46 +00:00
June Kelly
53b78ad68b Merge pull request #11590 from overleaf/jk-password-reset-ux-improvements
[web] Password Reset UX Improvements

GitOrigin-RevId: d62575ff965e045823bfb7268db892188cf709ed
2023-02-10 16:33:14 +00:00
ilkin-overleaf
b0841592c7 Merge pull request #11646 from overleaf/ii-payment-page-payment-preview-panel
[web] Payment page payment preview panel

GitOrigin-RevId: 35f2e11a9a80e8b240dc8485b8062cf33d5b40b4
2023-02-09 14:34:18 +00:00
Thomas
6811b9085a Merge pull request #11709 from overleaf/jpa-cleanup-more-locales
[web] scripts: translations: exclude more places from i18n tracking

GitOrigin-RevId: bd2204c59b73638358348c0742cc3b2cb45f248a
2023-02-09 09:04:05 +00:00
Thomas
ce79f03b87 Merge pull request #11706 from overleaf/jpa-fix-de-translations
[web] fix a few German translations

GitOrigin-RevId: a19713144a236e367a28bd443919bd81acbb4656
2023-02-09 09:03:57 +00:00
ilkin-overleaf
1824fd901d Merge pull request #11671 from overleaf/ii-revert-removed-translations
[web] Revert removed payment translations

GitOrigin-RevId: 1cf55cf6f85b265639af6f279cf5280e989cae98
2023-02-07 09:05:09 +00:00
Alexandre Bourdin
ed40a87cdc [web] Migrate group management to React (#11293)
* Rename manage group entry point

* Migrate group management root page to React

* Add cypress tests for the group management react page

* Fix linting

* Add checkbox labels for screen-readers + remove unused classes

* Await on add/remove members calls

* Display the export CSV link for a full group

* Display error message when group is full

* Sort locales

* Handle the managers management page in React version

* Fix missing type in GroupMemberRow

* Split members and managers React pages

* Build API paths on frontend side + add cypress tests for each page

* Fix linting

* Update unit tests

* Review improvements

* Type API errors

GitOrigin-RevId: d124a9d24cbf33de8aacc5d69e9d46e7bcda93c5
2023-02-07 09:04:18 +00:00
Mathias Jakobsen
9370803f44 [cm6+rt] Decorate preamble and \end{document} (#11598)
* [cm6+rt] Add preamble decoration

* [cm6+rt] Add end document decoration

* [cm6+rt] Move preamble margin to wrapper padding

* [cm6+rt] Remove info icon from end document decoration

GitOrigin-RevId: 87c08e0c61adfd1cbed36e25fdb97d35ebab9081
2023-02-06 09:04:56 +00:00
Alf Eaton
73395e008a Fix and run extract-translations (#11622)
GitOrigin-RevId: b36c70748da800979dbb7f8c11c1b555515cce7b
2023-02-06 09:04:42 +00:00
ilkin-overleaf
db54475bd0 Merge pull request #11525 from overleaf/ii-payment-page-migration-init
[web] Payment page migration initialisation

GitOrigin-RevId: f33b73a13b96fad3cddf0c0205d05df678ce5300
2023-02-02 18:21:52 +00:00
M Fahru
1d04aa0315 Editor file uploader design update (#11447)
* Redesign the styling of conflict state for file upload in the editor

* Change overwrite button style from primary (green) to danger (red)

* Change the idle state and dragging state styling to match the error state new design:

    *remove the double border; only keep the dashed border
    * on idle state, change border color

* Add hardcoded texts to translation file

* Add padding to prevent text is becoming too near to the border when multiple files appear in the conflict file list

* Apply custom file uploader style to smaller screen

GitOrigin-RevId: 266e60bb8575a02c02c1ed1d7fa04cdb101f3dd1
2023-02-02 09:03:33 +00:00
M Fahru
e5f8b991ba Add text to clarify what currency is being displayed in the new plans page (#11568)
GitOrigin-RevId: 7875f0afa4e6a538bd52d800ae75de231bf40629
2023-02-02 09:03:25 +00:00
M Fahru
772a3efb65 Tear down micro survey for new users (#11569)
GitOrigin-RevId: b86cfa150dd365f3d1da758feb20509d35c7cc56
2023-02-02 09:03:22 +00:00
Jessica Lawshe
b7108f7874 Merge pull request #11515 from overleaf/ab-group-membership-dash-react
[web] Managed groups in React subscription dash

GitOrigin-RevId: 4811d8dd2b42fa9ad83b5c4f12582e7bc04bad40
2023-02-01 09:05:27 +00:00
Jessica Lawshe
dad1460d71 Merge pull request #11414 from overleaf/jel-react-personal-subscription-dash-pt-2
[web] Continue migration of personal subscription dash commons to React

GitOrigin-RevId: 997716f70c953b088f686d4b0f638705ad838520
2023-01-27 09:05:30 +00:00
Jessica Lawshe
2499ecadcc Merge pull request #11340 from overleaf/jel-react-personal-subscription-dash
[web] Begin to migrate personal subscription dash commons to React

GitOrigin-RevId: 43c096bd72199c8c0a7b40c8fd84a0a12c108217
2023-01-27 09:05:22 +00:00
M Fahru
8227199dcb Implement new users micro survey for project dashboard page on react and non-react version (#11347)
* Implement new users micro survey for project dashboard page on react and non-react version

* Add 'new-users-micro-survey-click' and 'new-users-micro-survey-prompt' new event for the analytics

GitOrigin-RevId: 9aabe931987638b38995d404aa90ac4d40b2f3b5
2023-01-20 14:13:53 +00:00
M Fahru
29fbc253fd Clean up link sharing upgrade prompt test and keep the default variant
GitOrigin-RevId: d34ed081bbc61dfc74a7117c0ba633db4b5a0bad
2023-01-20 14:13:51 +00:00
Jessica Lawshe
7075a1e513 Merge pull request #11259 from overleaf/jel-react-subscriptions-dash-free
[web] Migrate institution free plan subscription dash to React

GitOrigin-RevId: 5f488bdeeb6db4a0895fe99218122220a2ee9561
2023-01-18 15:09:36 +00:00
Jakob Ackermann
b91f43f4f2 Merge pull request #11121 from overleaf/jpa-cleanup-en-locales
[web] locales: cleanup unused locales and check on it in CI

GitOrigin-RevId: 7625047f1731ec627df43bb9eb00348f110eadaf
2023-01-13 09:03:50 +00:00
Davinder Singh
073645d929 Again => Admin panel- Sessions tab react migration (#11137)
GitOrigin-RevId: 338d2e372de4a827e585c24a3ac09b07e77e6a30
2023-01-11 09:05:08 +00:00
Jakob Ackermann
1ff186a738 Merge pull request #11087 from overleaf/jpa-sort-locales
[web] sort all the locale files and check sorting in CI

GitOrigin-RevId: 5921e24f22e2ca126f7d49a1956b44d810b52dcd
2023-01-10 09:04:22 +00:00
Jessica Lawshe
d7233870b9 Merge pull request #10891 from overleaf/jel-features-page-test
[web] Setup split test for new features page

GitOrigin-RevId: c301089f2a251fef6cdc4434ac3c8356bb17545d
2022-12-20 09:04:44 +00:00
M Fahru
bed2596468 Implement groups & enterprise awareness banner on project dashboard (#10818)
- Implement the banner on both react and non-react project dashboard
- Use split test with 4 different variants, `save`, `empower`, `did-you-know`, and `default`, each variant has a different copy, except the `default` which won't show the banner to users

GitOrigin-RevId: ee76769dfd38b8e52de8cc0f201c24e41905d016
2022-12-13 09:05:08 +00:00
ilkin-overleaf
2675cab92e Merge pull request #10394 from overleaf/ii-password-reset-and-strength-checking
[web] Password reset strength checking and UI updates

GitOrigin-RevId: 442a5c9e7e9d0a61d3ae649f3526bc3c02fd5704
2022-12-07 09:03:36 +00:00
M Fahru
6dcc22642a Update "go to line" hotkey for cm6 and add new info text in hotkeys modal
* Update "go to line" hotkey for cm6 and add new info text in hotkeys modal

* Differentiate modal title between cm6 and ace hotkeys

* Update test to reflect change in hotkeys modal title

* Add test for hotkeys modal bottom text

* Update test on editor left menu hotkeys button to reflect change in hotkeys modal title

GitOrigin-RevId: 61bae16313ea7a37fa3b9441dbe5a93ab7823d01
2022-11-25 09:04:20 +00:00
June Kelly
c98e002365 Merge pull request #10619 from overleaf/ii-capitalize-plan-name
[web] Capitalize plan name in a translation

GitOrigin-RevId: 8f67976f6f50da7e2df83f0fadff26f68240cc6c
2022-11-24 09:03:08 +00:00
ilkin-overleaf
11e789229e Merge pull request #10528 from overleaf/ii-add-modal-before-checkout
[web] Show student confirmation modal for student plans on checkout page

GitOrigin-RevId: 6009bde36adb2ca24d3438def95db3b47f1ce8b2
2022-11-22 09:04:19 +00:00
Miguel Serrano
edeaa4baa0 Merge pull request #10435 from overleaf/msm-remove-survey-banner
Remove banner to recruit new joiners for survey

GitOrigin-RevId: c427c57b80d6e38285ddbafc67554b62516ea8b8
2022-11-17 09:03:49 +00:00
ilkin-overleaf
87b844aa15 Merge pull request #10438 from overleaf/ii-offer-personal-plan-on-cancellation
[web] Offer personal plan on subscription cancellation

GitOrigin-RevId: a7845fb3f7edc2f169ba237d8b822ff958a5c6a5
2022-11-16 09:06:18 +00:00
Mathias Jakobsen
8ddfd958d2 Merge pull request #10348 from overleaf/mj-outline-fixes-redo
[cm6] File outline improvements

GitOrigin-RevId: 9f4859cb35476d4baf0b3e3c2c2cb5d1678fd4a8
2022-11-09 09:04:08 +00:00
Jakob Ackermann
111cce4ca4 Merge pull request #10299 from overleaf/jpa-nicer-warning-message-for-missing-pdf
[web] show a nicer warning message for missing pdf exceptions

GitOrigin-RevId: f519ec145d7ff4fe725241742fb66a1defdd257e
2022-11-08 09:03:57 +00:00
Tim Down
2bb8bd6f14 Merge pull request #10196 from overleaf/ta-galileo-instruction-modal
Add Galileo Instruction Modal

GitOrigin-RevId: c6eb9465c9a90b7b6fb681537bf2851a4570b397
2022-11-02 09:03:46 +00:00
ilkin-overleaf
7180ee8700 Merge pull request #10132 from overleaf/ii-dashboard-are-you-affiliated-migration
[web] Project dashboard are you affiliated migration

GitOrigin-RevId: 455ad915dd023c5fab3ce9a5165aa7e960915f1f
2022-11-01 09:05:02 +00:00
Miguel Serrano
b299ccf139 Merge pull request #10191 from overleaf/msm-new-joiner-survey
Banner to recruit new joiners for survey

GitOrigin-RevId: f901818cb428f0338de55655885eb8b54e702268
2022-10-28 08:05:22 +00:00
Davinder Singh
049d7573d8 Removed the hightlight-sso-2 split test, Re-order login SSO options & remove ShareLaTeX wording (#9984)
* removed the hgihlight-sso-2 split test

* added the correct variant

* removed the if else condition

* renamed the file _registration_sso_highlight_sso_variant.pug  to _registration_sso.pug

* replaced with home-registration

* Swapped translations and deleted one

* removed shareLatex login text from login page and related translations that were being used only once in this code snippet

* renamed a file name while rendering it and deleted the unsuded file. and replaced a string with error variable for message

* added event segmentation back

* swapped two lines

* removed event-segemntation from one file

GitOrigin-RevId: d99de42215e9f6034f618c47dbd47fa7a4913efa
2022-10-25 08:03:50 +00:00
Timothée Alby
4af5ed24ad Merge pull request #9866 from overleaf/ta-pdf-detach-safari-no-warnings
Remove PDF Detach Safari Warning

GitOrigin-RevId: 80f17660d81dc3812fab74c5e2ea4ff23cd7f1d0
2022-10-18 08:03:20 +00:00
Alf Eaton
6c83939765 Merge pull request #9931 from overleaf/ii-dashboard-table-accessibility
[web] Project dashboard table accessibility improvements

GitOrigin-RevId: ac8202b587c796ad1560e26242c1edca8c72a897
2022-10-17 08:04:28 +00:00
Alexandre Bourdin
7a20e1376d Merge pull request #9882 from overleaf/ii-dashboard-system-message-migration
[web] Project dashboard system & translation message migration

GitOrigin-RevId: 0c723a3b526980e5c749da44ebe8a0a3edcc66ad
2022-10-13 08:05:38 +00:00
Alexandre Bourdin
20d00c8db9 Merge pull request #9934 from overleaf/jpa-dropbox-modal-refresh
[web] refresh dropbox sync modal

GitOrigin-RevId: 368c20167a53210cd54eee6535cae38f9cd5f710
2022-10-13 08:05:09 +00:00
Tim Down
e87e164a84 Merge pull request #9829 from overleaf/ds-chat-placeholder-change
Chat Pane-Change Placeholder for message input box

GitOrigin-RevId: 254efa89b883734ad3b7bfeefe625db84d93d579
2022-10-04 08:03:31 +00:00
Tim Down
ad147e250d Merge pull request #9814 from overleaf/ds-server-pro-word-change
Added overleaf to the left menu

GitOrigin-RevId: 86ab6f338ed0026831b66898d479c9ffe3bb2e07
2022-10-04 08:03:27 +00:00
Tim Down
de7eb43f51 Merge pull request #9792 from overleaf/ds-jpa-remove-stoponfirsterror-split-test
Split Test removal - removed stop-on-first-error split test code

GitOrigin-RevId: 4a5663397d0a967e0fa957453b36d466aa530630
2022-10-04 08:03:24 +00:00
Jessica Lawshe
07a68a5a57 Merge pull request #9760 from overleaf/ab-dash-toolbar-tags-dropdown
[web] Add tags dropdown to the React dashboard toolbar

GitOrigin-RevId: 8f949d925e1ba0ef68dde508c0dbbaac5828625e
2022-10-04 08:03:07 +00:00
Jessica Lawshe
94038e1b04 Merge pull request #9748 from overleaf/ii-dashboard-mobile-view-improvements
[web] Projects dashboard improvements

GitOrigin-RevId: 60bf3bd81fbdcb9d43bdb2ab3e2cf77bf02dddc8
2022-10-04 08:03:00 +00:00
Jessica Lawshe
f68d0d1e5f Merge pull request #9784 from overleaf/jel-project-tools-copy
[web] Add copy option to project tools dropdown

GitOrigin-RevId: 028ba62ed858376e472a5e4e5520079cd5f60ec5
2022-10-04 08:02:55 +00:00
Alf Eaton
91bf3378a5 Add "whole word" option to CM6 search (#9140)
GitOrigin-RevId: bb56c38adca601856a505ad435cc2728efd2b40d
2022-09-29 08:04:32 +00:00
June Kelly
3288f87dbe [web] Password set/reset: reject current password (redux) (#8956)
* [web] set-password: reject same as current password

* [web] Add 'peek' operation on tokens

This allows us to improve the UX of the reset-password form,
by not invalidating the token in the case where the new
password will be rejected by validation logic.

We give up to three attempts before invalidating the token.

* [web] Add hide-on-error feature to async forms

This allows us to hide the form elements when certain
named error conditions occur.

* [web] reset-password: handle same-password rejection

We also change the implementation to use the new
peekValueFromToken API, and to expire the token explicitely
after it has been used to set the new password.

* [web] Validate OneTimeToken when loading password reset form

* [web] Rate limit GET: /user/password/set

Now that we are peeking at OneTimeToken when accessing this page,
we add rate to the GET request, matching that of the POST request.

* [web] Tidy up pug layout and mongo query for token peeking

Co-authored-by: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
GitOrigin-RevId: 835205cc7c7ebe1209ee8e5b693efeb939a3056a
2022-09-28 08:06:54 +00:00
Davinder Singh
9232a0bfa6 Merge pull request #9730 from overleaf/as-remove-duplicate-translations
Remove duplicate translations, possibly breaking OneSky upload

GitOrigin-RevId: de9232d184f046caa8960be25ede8761cc3a0ed7
2022-09-28 08:05:50 +00:00
Alexandre Bourdin
9f4df9c0f4 Merge pull request #9636 from overleaf/ab-prevent-create-rename-tag-existing-name
[web] Prevent creating/renaming a tag to an existing name

GitOrigin-RevId: 44bb35a4152238ce21fa6e0d4d211cc5b25481e8
2022-09-27 08:04:04 +00:00
Alexandre Bourdin
fe164ec6fd Merge pull request #9545 from overleaf/mf-project-list-load-more
Implement Load More functionality on Project List

GitOrigin-RevId: 9981d5ef9d3b29683164152812f9315c74680c20
2022-09-27 08:03:53 +00:00
ilkin-overleaf
e12c93c537 Merge pull request #9700 from overleaf/ii-dashboard-mobile-view
[web] Projects dashboard mobile view

GitOrigin-RevId: 84894e19c814a2cc1ce751181952c0ade6b62044
2022-09-26 08:04:38 +00:00
Davinder Singh
2c497bfc6d Merge pull request #9610 from overleaf/ds-deleted-projects-table-heading
Admin Panel- Deleted projects table migration to react

GitOrigin-RevId: 0a7c8b34add8eeb30724b955da7e7db1289c9812
2022-09-23 08:04:21 +00:00
June Kelly
73e8fd115b Merge pull request #9466 from overleaf/jk-add-labs-program-for-galileo
[web] Add a new "Overleaf Labs" program, for Galileo

GitOrigin-RevId: 8f6c79c37c1719a59bd8405998cc3de2fd29960d
2022-09-22 08:03:59 +00:00
Tim Down
8388d808a5 Merge pull request #9678 from overleaf/ta-td-galileo-week6
Galileo Integration Banch Week 6

GitOrigin-RevId: 78fffeefdf350042a4c2400823fb2a668ee0f592
2022-09-22 08:03:55 +00:00
Davinder Singh
70e63ca0e3 Merge pull request #9614 from overleaf/ab-limit-tag-length
[web] Restrict the length of tags to 50 characters

GitOrigin-RevId: fc20227e3e2171bf9e27c983105ecc7b198cf882
2022-09-16 08:04:41 +00:00
Davinder Singh
d19cce89c1 Merge pull request #9477 from overleaf/ds-delete-projects
Admin panel user projects list - Delete projects

GitOrigin-RevId: 5d5f5ac8d83afbdad633a7f17000a80841bac0b6
2022-09-16 08:04:00 +00:00
Thomas
db9fad7cf8 Merge onboarding experiments integration branch (#9571)
* Add onboarding survey page

* Add onboarding new analytics events to mixpanel allowlist

* [web] Try Premium prompt

* moved try-premium code to overleaf-integration

* fixed sheet styling

* Add onboarding flow redirect handling to registration handlers (#9462)

* Add redirect logic for onboarding flow after registration

* Update UPGRADE_PROMPT_URL

* Cleanup style of OverleafAuthenticationController

* Refactor finishLogin calls to call wrapped function in OverleafAuthenticationController

* Refactor user properties/onboarding flow redirect into finishLogin wrapper

* Fix async/await calls after refactoring

* Update tests for finishLogin refactoring

* Don't redirect to upgrade prompt if user has premium via commons

Co-authored-by: Miguel Serrano <mserranom@users.noreply.github.com>
GitOrigin-RevId: 7c392aa6949f99fa909f9ca4e4baad4c4d4ff6be
2022-09-15 08:04:06 +00:00
Alexandre Bourdin
a0fabee3b4 Merge pull request #9245 from overleaf/integration-project-dashboard-react-migration
[Integration branch] Project Dashboard React Migration

GitOrigin-RevId: 3c3db39109a8137c57995f5f7c0ff8c800f04c4e
2022-09-14 08:04:03 +00:00
Timothée Alby
2c5d7bde8b Merge pull request #9388 from overleaf/ds-change-word-university
changed university to institution

GitOrigin-RevId: 1fdcdb07ae5351322e8c69b55b8afc3d4c53758c
2022-09-13 08:06:33 +00:00
Timothée Alby
687ce143f3 Merge pull request #9538 from overleaf/ta-galileo-week5
Galileo Week5 Pack

GitOrigin-RevId: 8a72efd15ec59955c2fa3a0f1e5d38fb200f018f
2022-09-13 08:05:57 +00:00
Davinder Singh
ceb000eb2b Merge pull request #9446 from overleaf/ds-projects-table-sorting
Admin Panel- user projects sorting

GitOrigin-RevId: 8ff9b858f72f016f6a6b7e903150a8fbc5431066
2022-09-13 08:05:44 +00:00
Thomas
d1a2868fab Implement checkout page 'refreshed' split test with Recurly Elements (#8320)
* Implement checkout page 'refreshed' split test with Recurly Elements

Co-authored-by: Timothée Alby <timothee.alby@gmail.com>
GitOrigin-RevId: 586a94c7969530f4d2246e9105ef48e868e9510e
2022-09-05 08:03:51 +00:00
Timothée Alby
c074e7acf8 Merge pull request #9432 from overleaf/ta-galileo-bibtex-copy-hint
Show Bibtex Copy Hint After Selecting Galileo Suggestion

GitOrigin-RevId: 879598d7a949f99c248b6536ca86542b63906be1
2022-09-02 08:04:02 +00:00
Miguel Serrano
c908c0c07d Merge pull request #9334 from overleaf/msm-tweak-tooltip-wording
[web] tweak misleading wording on tooltip

GitOrigin-RevId: 3dbbd733076724c385e79b48ff22649d22163e72
2022-09-01 08:03:45 +00:00
Eric Mc Sween
10c9b26f8e Merge pull request #9390 from overleaf/em-history-origin
Show change origin in history display

GitOrigin-RevId: ead64bf3b936bf4915dbee226adf7782806fe53a
2022-08-26 08:03:34 +00:00
Davinder Singh
2432b265eb Merge pull request #9363 from overleaf/ds-change-team-word
changed the team keyword to group subscription

GitOrigin-RevId: 92fbb59c2129c5194368e6b71d904ee5c34d7036
2022-08-25 08:03:58 +00:00
Davinder Singh
d538d28f3e Merge pull request #9246 from overleaf/ds-user-duplicate-projects-banner
Admin panel- Duplicate projects banner

GitOrigin-RevId: 53b4a64ecf36e8e03fa2e7cd1554c779502c9937
2022-08-22 08:04:08 +00:00
Davinder Singh
ac9fd0513f Admin Panel user projects table (#9186)
GitOrigin-RevId: 3f4e42ad67189a80cddc4241528375cbbfc81400
2022-08-22 08:03:55 +00:00
Davinder Singh
3538590559 Merge pull request #9264 from overleaf/ds-tooltip-information-plans-page
Changed the tooltip message on old plans page

GitOrigin-RevId: 24824faf4a165e9bf43db616d5112496c59a3824
2022-08-18 08:03:16 +00:00
Davinder Singh
884a432681 Merge pull request #9114 from overleaf/ds-history-page-word-change
Changing wording on history page for binaries

GitOrigin-RevId: e6ba5f586c195e166b215d35fd3b78c605035b0b
2022-08-08 08:04:27 +00:00
ilkin-overleaf
46b5d57cb8 Merge pull request #8799 from overleaf/ii-cm6-search-tests
[web] CM6 Search tests

GitOrigin-RevId: 9f6172050b5a35d67c8d28f5bb2cfa22606309c7
2022-08-05 08:03:55 +00:00
Timothée Alby
b44bf48282 Merge pull request #9037 from overleaf/ta-beta-copy-fix
Remove Extra Period on Beta Page

GitOrigin-RevId: 49e9154e962aecf68da4024e6f62df63b7ee38ff
2022-07-29 08:03:52 +00:00
Timothée Alby
7f722a006c Merge pull request #8571 from overleaf/ta-token-access-page
Require User Interaction on Token Access Page

GitOrigin-RevId: 2f4c00ba75ebd6bd87d3e770ec8223d736344f5b
2022-07-29 08:03:39 +00:00
Jessica Lawshe
bbc04ac4c5 Merge pull request #8734 from overleaf/jel-translation-sso
[web] Remove "portal" from SSO translations and remove unused translations

GitOrigin-RevId: f03a7f04c2909b4589bda5237e7686383a50d0b8
2022-07-28 08:03:37 +00:00
Miguel Serrano
d2ccd3a3c0 Merge pull request #8958 from overleaf/msm-sp-license-tab
[web] Activity column and license info for Server Pro admin

GitOrigin-RevId: cea736e23440a5d455aacd5c0cf29820604ff29b
2022-07-27 12:18:31 +00:00
Mathias Jakobsen
b01f839831 Merge pull request #8864 from overleaf/td-orcid-deny-access-error
Handle case where user has denied access to Overleaf in ORCID and Twitter when logging in

GitOrigin-RevId: 73dfe1228463aca22b525649cb4249ef606bc3c2
2022-07-27 12:17:37 +00:00
Alf Eaton
9d55859419 Merge pull request #8932 from overleaf/ae-file-upload-translation
Add missing "a" to upload throttled message

GitOrigin-RevId: 0279548f04ee31e7f9d1251a9c0e6a66f8616559
2022-07-22 08:03:40 +00:00
Timothée Alby
7b8d277437 Merge pull request #8898 from overleaf/ta-change-redundant-controls
Change Redundant Layout Controls

GitOrigin-RevId: b50d71b1f75d202334442b3f6cb5037ed0d8a411
2022-07-21 08:04:25 +00:00
M Fahru
574d0eab12 Improve error message when a collaborator tries to refresh a linked file without access to the project (#8884)
* Improve error message when a collaborator tries to refresh a linked file without access to the project

* Move the AccessDeniedError hardcoded error message to translation file

* apply prettier

* remove period (dot) in test hardcoded string

* revert unintended changes

GitOrigin-RevId: 50a5bf46428a96e629e9091cc18068f3ee7084e3
2022-07-21 08:03:32 +00:00
Henry Oswald
5f1abee345 Merge pull request #8939 from overleaf/revert-8882-jk-web-reject-same-password
Revert "[web] Password set/reset: reject current password"

GitOrigin-RevId: f14f970fe93064658a8659537c5cb417e34e2751
2022-07-20 08:04:00 +00:00
June Kelly
d04ea76081 Merge pull request #8882 from overleaf/jk-web-reject-same-password
[web] Password set/reset: reject current password

GitOrigin-RevId: 2c40dda4926d9c68564ae5126b3393b9286bb661
2022-07-20 08:03:36 +00:00
Thomas
7705acfa1f Merge pull request #8874 from overleaf/tm-revert-personal-price-experiment
Revert personal plan discount experiment to original pricing

GitOrigin-RevId: 3134a187e4900570580c3717fe0e19077399eb4d
2022-07-18 08:05:15 +00:00
M Fahru
a2e2dcccda Add new Link sharing upgrade prompt in project page (#8775)
GitOrigin-RevId: 984ab0770b3b920daa945ed8b190e7debf9e4a1d
2022-07-18 08:04:50 +00:00
Alf Eaton
451c910fe3 Merge pull request #8837 from overleaf/mj-fix-default-group-account-translation
Rephrase "Group Account" to "Group Subscription" on subscription management page

GitOrigin-RevId: 899a6f27fbe7533b93345b7c27a4d427d40c5e1a
2022-07-18 08:04:23 +00:00
Alexandre Bourdin
d501bc4820 [web] Compile time warning split test (#8813)
* Implement compile time warning split test

* Add i18n for compile time warning

* Memoize CompileTimeWarning component

* Reuse startFreeTrial() function from account-upgrade

* Improve usage of react bootstrap native properties

* Cleanup compile-time-warning

* Move all logic into CompileTimeWarning component

* Only show compile time warning to project owners

* Handle compile time warning in detached mode and while switching layout

GitOrigin-RevId: 4fc40acfc113f91c81a6744c14c0f8b3ef766e39
2022-07-14 08:03:50 +00:00
M Fahru
cc92f264d2 Improve new plans page university info styling and change its copy (#8822)
GitOrigin-RevId: ebb0e3677cce862f22757a5a7236591d98f39078
2022-07-13 08:05:47 +00:00
M Fahru
3b4968e263 Change number of users in group plan to have a dynamic value in the new plans page (#8592)
GitOrigin-RevId: 008c0a1120e5b99945f18f0b4eee60bfcb08a331
2022-07-13 08:05:33 +00:00
M Fahru
6c7fd1dad0 Add new university info card in the new plans page (#8676)
GitOrigin-RevId: 7d9ec211930afc2536df36665d6cfc6f2cd7b46b
2022-07-13 08:05:13 +00:00
Timothée Alby
e6b681838b Merge pull request #8706 from overleaf/ta-beta-program-copy
Update Beta Program Copy

GitOrigin-RevId: 49afa2ca394bee3d48aeb37bbe909f666ff845a2
2022-07-08 08:03:36 +00:00
Timothée Alby
e48c23546e Merge pull request #8724 from overleaf/ta-subscription-contact-link
Link to Contact Page in Subscription Translations

GitOrigin-RevId: f255b0408cf4cf1e6e19cf8d3eebbe996327a598
2022-07-08 08:03:18 +00:00
Timothée Alby
22e24b1763 Merge pull request #8627 from overleaf/ta-a-an-overleaf
Fix Wording with appName Translations

GitOrigin-RevId: 435719fa4428ffba06bc80db91bca2e6dcaf295f
2022-07-08 08:03:06 +00:00
Timothée Alby
75a41e7f94 Merge pull request #8626 from overleaf/ta-register-copy
Change Copy of Login Link on Registration Page

GitOrigin-RevId: 55bad0b2f7fc3074c3db6fba025b5cc995569ff3
2022-07-08 08:03:03 +00:00
Timothée Alby
c92278a8e5 Merge pull request #8609 from overleaf/ta-preview-error-message-copy
Update Preview Errors Copy

GitOrigin-RevId: 0e7f7a4237a80c3fa2efc8ae87fc2011f4bc879d
2022-07-07 08:03:48 +00:00
Timothée Alby
1ffd5a70ef Merge pull request #8547 from overleaf/ta-github-error-detail
Display GitHub Sync Error Detail

GitOrigin-RevId: 89f1c7d3cce38aece49e8c68aa2187283054fb19
2022-07-07 08:03:42 +00:00
Thomas
34ccf343d4 Add sales contact form element type for Contentful CMS pages (#8711)
* Add sales contact form element type for Contentful CMS pages

GitOrigin-RevId: f9e2c0fac84434e473019aaacda4e06a03a97dbd
2022-07-07 08:03:31 +00:00
ilkin-overleaf
b372a20002 Merge pull request #8580 from overleaf/ii-cm6-advanced-reference-search
[cm6] Advanced reference search keyboard shortcuts

GitOrigin-RevId: 7921aab8abeda1742b73cf0127b28a2166762ec2
2022-06-29 08:03:53 +00:00