Commit graph

317 commits

Author SHA1 Message Date
Alexandre Bourdin
2ef48be496 Merge pull request #13448 from overleaf/ab-sub-dash-wording-changes
[web] Wording changes on the subscription dashboard buttons

GitOrigin-RevId: 9b5be3a39b2a4c6f92041aab1478f8a87e3a74cf
2023-07-17 10:41:51 +00:00
Alexandre Bourdin
39bc601826 Merge pull request #13482 from overleaf/ab-group-settings-page
[web] Group settings button and page enabled based on env var

GitOrigin-RevId: 77574a3705b3f1301935b72010022af61f7fe552
2023-07-17 10:41:41 +00:00
ilkin-overleaf
423f2604db Merge pull request #13500 from overleaf/ii-review-panel-migration-nav
[web] Create review panel navigation

GitOrigin-RevId: abed4171e9fd52de2f137a6cf7456791bc2ca161
2023-07-17 10:39:20 +00:00
Domagoj Kriskovic
2ab0779374 [cm6] rename to Code Editor | Visual Editor (#13513)
* [cm6] rename to Code Editor | Visual Editor

* showLegacySourceEditor change

* show info badge

* remove info badge

* display info badge

* use "Visual Editor" in example project

GitOrigin-RevId: 549e25aa4bcfe58522eadc70e35ca35f822317b1
2023-07-17 10:39:10 +00:00
M Fahru
0a22412d31 Improve error message when users try to import empty github repo (#13334)
* Improve error message when a user is trying to import an empty repo with github

* Only show GitHub organization footer link after the user is successfully connected to github

This link should only be shown for users that have some of their repos missing because of their organization's access restriction

See this ticket for more detail: https://github.com/overleaf/web-internal/pull/1591

GitOrigin-RevId: 3235d63b94b952b93f7a1cfe0d551d38a2783eb3
2023-07-17 10:36:30 +00:00
ilkin-overleaf
e514e97305 Merge pull request #13438 from overleaf/ii-review-panel-toolbar-shell
[web] Create review panel toolbar shell

GitOrigin-RevId: 561fb18e1239c9b96b52944716a83cf3b8606677
2023-07-17 10:34:04 +00:00
M Fahru
2e77d4ab65 Teardown onboarding video tour test (#13351)
GitOrigin-RevId: 215c26fe047ec037f8d1d878eac406c36dbb656b
2023-07-17 10:32:51 +00:00
Davinder Singh
88d0254dde Merge pull request #13390 from overleaf/ab-managers-page-styling
[web] Full-row links styling for group subscription links in dash

GitOrigin-RevId: f3b2dd67e9c14cf8fde1df41d74d380c06cc3d4c
2023-07-17 10:31:18 +00:00
Jakob Ackermann
d98d882cb6 Merge pull request #13188 from overleaf/jpa-admin-panel-i18n
[web] admin-panel: delete-projects: avoid concatenation of locales

GitOrigin-RevId: cb737356755fc9a5d5d39ccea5c9a28f3680a402
2023-07-17 10:25:25 +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
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
Tim Down
76103eb77f Merge pull request #12874 from overleaf/td-history-binary-file
History migration: Show alert for binary file preview

GitOrigin-RevId: f30e4946ce9f873661055b8a096c6aba7ab08e2d
2023-05-02 19:45:22 +00:00
Tim Down
70bae34bd8 Add paywall to React history view (#12849)
* Implement history view paywall

* Add tests and some CSS fallbacks

* Make additional faded version above paywall non-clickable

* Change isFaded to faded for consistency

* Remove unused import

* Add missing attribute

* SHow all labels in free tier

* Address review comments

* Change Boolean conversion

Co-authored-by: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>

* Make adding or deleting a label show up in version list again

* Refactor to use visibleUpdateCount rather than maintaining two separate update arrays

* Removed unused import

* Use data-testid instead on class

* Round gradient values

* Correct test selector

---------

Co-authored-by: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
GitOrigin-RevId: a2b021f3f4d3b9eb1358edb2ee4aa7db1bc7240e
2023-05-02 19:44:39 +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
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
Alf Eaton
f205d1f31d Merge pull request #12621 from overleaf/ii-history-react-delete-labels
[web] Delete history tags

GitOrigin-RevId: 0a2846bbb3e99ef632b9192a9f8c04f702645506
2023-04-19 08:02:47 +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
ilkin-overleaf
867b37b76f Merge pull request #12417 from overleaf/ii-history-react-toggle-switch
[web] Toggle switch history migration

GitOrigin-RevId: c0812d03d576bc66dd8878fa80d4ac18dd8576d0
2023-03-30 08:04:22 +00:00
M Fahru
5ae698ec6c Migrate "Manage Template" in editor left menu to react (#10609)
This feature is only available on server pro

GitOrigin-RevId: 7fc508c8039c2e3afd1a5fca469fce411e9d913a
2023-03-21 09:05:29 +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
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
48587a7a62 Merge pull request #12007 from overleaf/ii-react-subscription-dash-thank-you
[web] Successful subscription react migration

GitOrigin-RevId: 1d7d849415f4b7a7f60ddf8a4e18570ff5142196
2023-03-02 09:04:04 +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
7469f01acd Merge pull request #11981 from overleaf/jel-downgrade-when-cancel
[web] Migrate downgrade plan option when cancelling in React subscription dash

GitOrigin-RevId: 11a4b39deb58493f3f56e65e8760d71527a8e8fc
2023-02-28 09:03:54 +00:00
Jessica Lawshe
68e61d7bb7 Merge pull request #11973 from overleaf/ii-react-canceled-subscription
[web] Subscription page canceled subscription react migration

GitOrigin-RevId: dd127d753e72c194cd6bbb90b1ca1557742896d9
2023-02-24 09:05:28 +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
f86eeac522 Merge pull request #11862 from overleaf/ab-group-subscription-memberships-dash-react
[web] Migrate group subscription memberships to React dash

GitOrigin-RevId: d5ff3ae4e5d8c422530502af22edda6c24c9a593
2023-02-23 09:04:49 +00:00
Alexandre Bourdin
a928fd20e6 Merge pull request #11906 from overleaf/ii-react-subscription-dash-active-coupons
[web] Subscription dash show active coupons react migration

GitOrigin-RevId: 7a63505b31d828491b6ea812482376882354b4ee
2023-02-23 09:04:13 +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
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
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
Jessica Lawshe
c7d8e4867d Merge pull request #11560 from overleaf/jel-react-personal-subscription-dash-pt-5
[web] Continue migration of personal subscription dash to React

GitOrigin-RevId: fb327592ad5031bff20b2a95a83edee4735112e8
2023-02-08 09:06:29 +00:00
Jessica Lawshe
c36b872ae3 Merge pull request #11509 from overleaf/jel-react-personal-subscription-dash-pt-4
[web] Continue migration of personal subscription dash to React

GitOrigin-RevId: f2d913099d727725f04697003516c90616faf014
2023-02-08 09:06:21 +00:00
ilkin-overleaf
c70fa150b5 Merge pull request #11668 from overleaf/ii-payment-page-migration-add-translations-back
[web] Add missing translations for checkout payment

GitOrigin-RevId: 8f552587c8d8628f19ae3b44cb79b6a596059f8f
2023-02-07 09:05:01 +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
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
Jessica Lawshe
c8ef5e6f65 Merge pull request #11231 from overleaf/jel-react-subscriptions-dash-commons
[web] Migrate institution memberships dash to React

GitOrigin-RevId: 75bb8e7d7338418733a836a8e654fe5b0a9fceff
2023-01-18 15:09:28 +00:00
Davinder Singh
073645d929 Again => Admin panel- Sessions tab react migration (#11137)
GitOrigin-RevId: 338d2e372de4a827e585c24a3ac09b07e77e6a30
2023-01-11 09:05:08 +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
7650e06074 Merge pull request #10802 from overleaf/ii-dashboard-leave-button
[web] Project dashboard leave button

GitOrigin-RevId: 6c472ffe9b3d07f103f32e07fec9996a6d45caef
2022-12-09 09:04:01 +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
M Fahru
5eff354971 Create settings menu react elements in editor left menu for editor left menu react migration
GitOrigin-RevId: e75581a43a8694398b20bee3dc5ec69b60db86ab
2022-11-15 09:07:01 +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
M Fahru
2b1e2be7ca Migrate git bridge menu to react
GitOrigin-RevId: cc54209dd88b6f730c3c8540a30d3d98d53b110f
2022-11-09 09:03:21 +00:00
M Fahru
fc936123db Migrate dropbox menu to react
GitOrigin-RevId: f06ce85c32f2615e14552a1379bcef94cee4f31d
2022-11-09 09:03:16 +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
M Fahru
a30e934692 Migrate "help menu" in editor left menu to react
GitOrigin-RevId: 7ebbfa693205de1f57b1d54e25c46cfb1851acc8
2022-11-03 09:03:49 +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
M Fahru
b85ae6e58e Migrate actions menu in editor left menu to react (#10102)
* Migrate actions menu in editor left menu to react

* Move margin from inline style to css file

* remove focus selector to avoid "highlighting" the button after closing modal and regain focus

* Add disabled state on word count button when the compiling is loading or failed

* Use div instead of button for disabled word count button

* Add accessibility text props when LeftMenuButton is disabled

* Add actions menu test cases and storybook components

* use util assign function and wrap function prop in usecallback

GitOrigin-RevId: 81ab104be21fbcf5dfbc72c07d29eeb32976c61f
2022-10-28 08:05:14 +00:00
M Fahru
797b9b2532 Migrate download menu in editor left menu to react (#10046)
* Initialize left menu react migration and migration download menu UI to react

* Add test case to DownloadMenu react component

* Update test description and add an href check to one of the download link

* Extract storybook document mock to its own fixture file

* Add mockCompileOnLoad config on storybook editor scope
  - if mockCompileOnLoad: true (default), then the default compile mock will be used
  - If mockCompileOnLoad: false, then we have to provide a compile mock on the storybook component

* Create download menu storybook component

* Use a single "editor-left-menu" controller on the editor left menu migrations

* Remove the form import from the react version of the left menu

* Change inline style to utility class name

GitOrigin-RevId: 5357c7bfc78bf40f52b9b308df8f2b60d793fbf7
2022-10-25 08:04:19 +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
Alexandre Bourdin
af90c5adc8 Merge pull request #9912 from overleaf/ab-current-plan-group-tooltip-i18n-fix
[web] Fix translation for group plan tooltip

GitOrigin-RevId: c0a71c0379dea511f68d65b65b1673948b9451e0
2022-10-13 08:04:47 +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
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
Jessica Lawshe
8b19b6107a Merge pull request #9764 from overleaf/jel-project-tools-rename
[web] Add rename option to project tools

GitOrigin-RevId: 5bf622609e612e27c77c4e5e11d64fdad1bb47b4
2022-10-04 08:02:50 +00:00
Alf Eaton
91bf3378a5 Add "whole word" option to CM6 search (#9140)
GitOrigin-RevId: bb56c38adca601856a505ad435cc2728efd2b40d
2022-09-29 08:04:32 +00:00
Davinder Singh
f031aba162 Merge pull request #9682 from overleaf/ds-deleted-projects-sorting
Admin Panel- deleted projects sorting

GitOrigin-RevId: 2a320a2bd060ff455d97adc4d4e6f40a36d19373
2022-09-28 08:05:29 +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
7608d37c0a Merge pull request #9622 from overleaf/mf-add-portal-templates-2
Add institution templates to the react version of the new project dropdown

GitOrigin-RevId: 32bf0b1b559ea3da744430902cc016e7c2a918d9
2022-09-27 08:04:00 +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
bac4ea525d Merge pull request #9653 from overleaf/as-fix-extract-translations-round-2
Fix extract translations round 2

GitOrigin-RevId: f0117b9dc7c2d7829a59ac5ba050461bca85e39d
2022-09-23 08:04:40 +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
Jessica Lawshe
4c02db777b Merge pull request #9565 from overleaf/jel-dash-btn-delete
[web] Add delete project modal

GitOrigin-RevId: 4ff408aeeac5c96dc8982ded699f3ef355999a9d
2022-09-19 08:04:13 +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
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
4bfab1a41a Merge pull request #9503 from overleaf/ta-extracted-translations
Run extract-translations

GitOrigin-RevId: 2e6c14689c1d2118a293963d8d788eef97ace68d
2022-09-13 08:06:19 +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
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
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
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
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
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
M Fahru
a2e2dcccda Add new Link sharing upgrade prompt in project page (#8775)
GitOrigin-RevId: 984ab0770b3b920daa945ed8b190e7debf9e4a1d
2022-07-18 08:04:50 +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
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
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
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
Jakob Ackermann
bfad0841a4 Merge pull request #8483 from overleaf/jpa-faster-compiles-feedback-ui
[web] faster compiles feedback UI

GitOrigin-RevId: 9feea47503aa6bddf51adb73b8c9fbef394fda14
2022-06-22 08:05:14 +00:00
Eric Mc Sween
e365a6cbaf Merge pull request #8346 from overleaf/em-halt-on-error-logs-2
Stop on first error: logs pane prompts

GitOrigin-RevId: a246a7e5d302ad3104e15f7fd78344992b4e011b
2022-06-10 08:03:55 +00:00
Eric Mc Sween
cb657d1f1c Merge pull request #8297 from overleaf/em-halt-on-error-logs
Stop on first error info box in logs pane

GitOrigin-RevId: cf11f65d582d98bea93c6506393940d9a6144c0d
2022-06-08 08:03:12 +00:00
Eric Mc Sween
2ab5189771 Merge pull request #8237 from overleaf/em-halt-on-error
Stop on first error dropdown UI

GitOrigin-RevId: 5191a37f6c227ff5a91c10ce965832e1702c3931
2022-06-03 08:03:39 +00:00
Timothée Alby
666c2c3b47 Merge pull request #8178 from overleaf/ta-settings-reconfirmation
[SettingsPage] Add Reconfirmation Prompt

GitOrigin-RevId: 2e03ba7f459b32faf6d66f21ba692ca54f62a320
2022-06-01 08:03:53 +00:00
Miguel Serrano
0e782d3fb6 [Settings] "Start by adding your email address" hint (#8173)
* [Settings] "Start by adding your email address" hint

GitOrigin-RevId: 19d432c70b173752ee7c6d8978dd6be16b042921
2022-05-31 08:04:50 +00:00
Timothée Alby
32741c07e0 Merge pull request #8218 from overleaf/ta-pdf-detach-safari-warnings
PDF Detach Safari Warning

GitOrigin-RevId: e6f8942d8c8c141d887c44921a09716c4e4c85ae
2022-05-31 08:04:36 +00:00
Miguel Serrano
430b7528b2 Merge pull request #8073 from overleaf/ta-td-dictionary
Add UI to Remove Words from Dictionary

GitOrigin-RevId: a28d865e3c968d6fff113237fcf4143b77af046e
2022-05-25 08:09:45 +00:00
Miguel Serrano
f81c52e6c7 Merge pull request #8076 from overleaf/msm-settings-sso-journey-fixes
[ReactSettings] Added missing affiliation scenarios

GitOrigin-RevId: 15c9e8d7557d9d75034ad1c485f17b35ae952a13
2022-05-25 08:09:32 +00:00
Timothée Alby
3580ec6db3 Merge pull request #8029 from overleaf/ta-settings-fix-7
[SettingsPage] Small Fixes 7

GitOrigin-RevId: 2716fe13af3f5f6b56d6bba47505fad75ba1adbf
2022-05-24 08:04:47 +00:00
Alf Eaton
1770cdc8fc Handle pdf.js loading errors (#7824)
GitOrigin-RevId: a4893dd66ceb9e9f8266cf720ab2b3507bf6aef1
2022-05-24 08:04:05 +00:00
Alf Eaton
5e1be2c03d Disable "PDF in separate tab" menu item when native BroadcastChannel is missing (#7954)
GitOrigin-RevId: a90c89296caeb5333c62150249dc4125a47a899a
2022-05-17 08:05:06 +00:00
Timothée Alby
cb065e7f12 Merge pull request #7820 from overleaf/msm-settings-leavers-survey
[Settings] Institutional Leavers Survey

GitOrigin-RevId: 1774af7fc4bb90cb39c9fc188323c44a1256bb3d
2022-05-17 08:04:00 +00:00
Timothée Alby
426aaa8b4b Merge pull request #7833 from overleaf/ta-settings-fixes-5
[SettingsPage] Small Fixes 5

GitOrigin-RevId: a0d02be246ff5128fa382bd7a9723f01377855b9
2022-05-17 08:03:36 +00:00
Alf Eaton
6025d3571c Add support for groups when importing references from Zotero (#6204)
* Add Zotero groups support to third-party-references
* Return 400 response with { relink: true } if remote response was 403
* Handle Zotero groups in tpr-webmodule
* Handle Zotero groups in the frontend
* Handle JSON OAuth token error response from Mendeley API

GitOrigin-RevId: 8011d71a5596f7671aca16a228f9ef40be4a02d0
2022-05-12 08:04:37 +00:00
Alf Eaton
12369b9f9a Merge pull request #7809 from overleaf/jpa-more-references-search-results
[misc] show more references search results

GitOrigin-RevId: e3edc78b85a13e663f692ab90b7bf8cd0246a34f
2022-05-12 08:04:12 +00:00
Miguel Serrano
23d1bfd11e [Settings] Link SSO email (#7778)
* [Settings] Link SSO email

GitOrigin-RevId: c46ed1709ceedd74df52e02a87f22614d024afea
2022-04-28 08:04:43 +00:00