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
Domagoj Kriskovic
3d5e8c9877
add 'Ace removal' notification ( #12800 )
...
* add 'Ace removal' notification
* prettier
* add memo, window.clearTimeout
* remove warning for server pro
* added tracking events
* useCallback for onClick
* fix: event rename
GitOrigin-RevId: 70bce8b93bae233e7183a941abaf2ec7a70ddfb6
2023-04-28 08:04:19 +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
Tim Down
afd1195902
Add infinite scrolling to history versions list ( #12752 )
...
* Add infinite scrolling to change list, add spinner while doing initial updates load, refactor updates state
* Update type in tests
* Update types
* Using LoadingSpinner component
* Remove redundant imports
GitOrigin-RevId: 98c7eae8edbc4d10d7107d825045edfc4159494f
2023-04-25 08:06:22 +00:00
Rebeka
b063495200
fix: fit text inside the circle shape
...
GitOrigin-RevId: 81167ee6ebc281a7a403ff2fdc3b19f4cc91d6be
2023-04-24 08:02:42 +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
M Fahru
08d2eea47a
Decouple history-file-tree styling out of editor file tree:
...
- Extract/duplicate the style from editor file tree (only extract styling that's being used in history file tree)
- Change some of the class name to avoid duplicated class name from the editor file tree
- Revert change to editor file tree since it has been moved to history file tree
GitOrigin-RevId: 6c3b20080c9b428363024db622f60e3540d919e6
2023-04-21 08:03:36 +00:00
Ilkin Ismailov
dd5509b16f
add sm size to badge
...
GitOrigin-RevId: 4e69d582ce770abcff10f3a6b34662f4873fc224
2023-04-21 08:03:33 +00:00
M Fahru
8212b686c6
Implement new style for history file tree badge
...
GitOrigin-RevId: 6221bc00e5aecf49fd3f2657128d1e9a2d4e648b
2023-04-21 08:03:30 +00:00
Tim Down
99e1ff0804
Merge pull request #12644 from overleaf/td-history-compare
...
Initial implementation of comparing history versions
GitOrigin-RevId: 890e270d6e41856a79689ab41ccfbde25c4703ba
2023-04-19 08:03:25 +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
Jakob Ackermann
3841177931
Merge pull request #12504 from overleaf/jel-cms-card-padding
...
[web] Option to set padding on CMS rows
GitOrigin-RevId: 297344c9bf6c04eae630f1ddbed59f9519d4e4c7
2023-04-14 08:03:19 +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
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
M Fahru
17a98d756e
Add badges UI to history react file tree ( #12479 )
...
GitOrigin-RevId: 52c45b72110e01bb193139654fa9385cb9b9e489
2023-04-05 08:03:05 +00:00
Jessica Lawshe
91ec3ca47e
Merge pull request #12425 from overleaf/jel-mobile-padding
...
[web] Option to add padding for mobile layout on CMS pages
GitOrigin-RevId: 33775905725710d7fc16d84c00af643c4adcc590
2023-04-04 08:04:46 +00:00
Jessica Lawshe
df8000fa83
Merge pull request #12414 from overleaf/jel-grid-in-card
...
[web] Option to render grid in a card on the CMS
GitOrigin-RevId: b65ee396915b4e8622384ab37a453d59b1d18c88
2023-04-04 08:04:38 +00:00
Tim Down
11f8905be4
Connect up document diff viewer to history state
...
GitOrigin-RevId: 610a254ea77c194969033d0791ecf1129e02c4bf
2023-03-31 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
Alf Eaton
4ccf67203b
Fix editor switcher colour transition ( #12328 )
...
GitOrigin-RevId: fc8caa34b12b9ef35422766023cdebf4bd36ff75
2023-03-30 08:03:20 +00:00
Jessica Lawshe
be6b89e9cf
Merge pull request #12356 from overleaf/revert-12354-revert-12330-jel-grid-3-and-4-col
...
Revert "Revert "[web] Add 3 and 4 column options to Layout | Grid on the CMS""
GitOrigin-RevId: b24230c5f4f34bf2baa01ea82d73af1346ad95c8
2023-03-30 08:03:00 +00:00
Tim Down
397fbd47c2
Merge pull request #12363 from overleaf/td-history-main-area-shell
...
Add CSS for main history view shell
GitOrigin-RevId: 9c455007bf8b177d59ea97cd73b608d48aba3907
2023-03-30 08:02:54 +00:00
ilkin-overleaf
d1d47b2767
Merge pull request #12339 from overleaf/ii-react-history-editor-and-change-list-init
...
[web] History editor and change list initialisation
GitOrigin-RevId: bb7800301d28c296bd524212cd27ddcd8defd149
2023-03-23 09:06:24 +00:00
Jessica Lawshe
e934e9af3d
Merge pull request #12354 from overleaf/revert-12330-jel-grid-3-and-4-col
...
Revert "[web] Add 3 and 4 column options to `Layout | Grid` on the CMS"
GitOrigin-RevId: fea5f87e74fe9915f4ee7653ed60ff4261b4d144
2023-03-23 09:05:48 +00:00
Jessica Lawshe
8a572673c3
Merge pull request #12330 from overleaf/jel-grid-3-and-4-col
...
[web] Add 3 and 4 column options to `Layout | Grid` on the CMS
GitOrigin-RevId: 6003907344bb84c16678ff4e4424b9348a4cb0df
2023-03-23 09:05:40 +00:00
Jakob Ackermann
c9513b79d3
Merge pull request #12155 from overleaf/ii-safari-project-title
...
[web] Adjust project checkboxes in project dash
GitOrigin-RevId: 42d40394eb1d933ba3c771ec7f5f873ead8cd770
2023-03-17 09:04:16 +00:00
Jessica Lawshe
b10b7b1f91
Merge pull request #12042 from overleaf/jel-change-plan
...
[web] Change plan UI now in a modal and update the style
GitOrigin-RevId: 1b501b4a972ca676cff32f531862c15c0c8f9e61
2023-03-09 09:05:05 +00:00
Tim Down
1f2c06b1d0
Position Grammarly button on top of CM6 editor
...
GitOrigin-RevId: f96d1897c38e8e14e9247690ee49972a2170f80e
2023-03-07 09:06:33 +00:00
M Fahru
20f8fc2dc0
Revert "Refactor project list notification by using onDismiss
on Alert
instead of custom Close
component ( #12043 )" ( #12133 )
...
This reverts commit 9a3f95c322a063b84094452c21cb734a379da978
GitOrigin-RevId: 31fb4b1d429e2e9c611178afc3dc3c662340be44
2023-03-07 09:06:25 +00:00
M Fahru
06b75ebee2
Refactor project list notification by using onDismiss
on Alert
instead of custom Close
component ( #12043 )
...
* Refactor project list notification by using `onDismiss` on `Alert` and not using the custom `Close` component
* Add dismissible alerts to storybook
GitOrigin-RevId: 9a3f95c322a063b84094452c21cb734a379da978
2023-03-07 09:05:48 +00:00
Davinder Singh
cc2d1a26e2
Merge pull request #11958 from overleaf/ds-td-documentation-btn-refactor
...
Styling and HTML structure of the documentation button
GitOrigin-RevId: e643edbe05579c037ca1ec27fab765974e74d2c5
2023-02-27 09:03:47 +00:00
M Fahru
b62cb86bf8
Create new SplitMenu
component and implement it for the pdf compile button (detached & non-detached) ( #11772 )
...
* Create a new shared `SplitMenu` component.
* Refactor the pdf compile button & detached compile button:
- Rename `detach-compile-button` to `detach-compile-button-wrapper`
- Rename `pdf-compile-button-inner` to `detach-compile-button`
- Move some of the logic from `detach-compile-button-wrapper` to `detach-compile-button`
- Create a new `compile-button.less` to centralize all of the compile button (detached/non-detached) custom styles rule.
- Extract the animated striped CSS definition to the dedicated CSS file, change the class from `btn-recompile-group-has-changes` to `btn-striped-animated`
- Refactor other className(s) appropriately according to the new component name
- Delete the unused `changes-to-autocompile` css rule since it has not been used anywhere
* Implement the new pdf compile button with the new `SplitMenu` component.
GitOrigin-RevId: d1d055bffd311923fc47b4681605ce8ba8e26f25
2023-02-22 09:04:42 +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
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
Davinder Singh
de245c288a
Merge pull request #11653 from overleaf/ds-documentation-btn-on-editor
...
Adding documentation button on the editor
GitOrigin-RevId: e03fd7b931eb0fe7273e6e9d0185c81c384df916
2023-02-15 09:04:37 +00:00
Eric Mc Sween
204e7a0c87
Merge pull request #11719 from overleaf/em-survey-sidebar
...
Make survey notification the width of the dashboard sidebar
GitOrigin-RevId: 754ec21692505107e683369628a2b5481e7cef9a
2023-02-09 09:06:29 +00:00
June Kelly
035b5cd456
Merge pull request #11263 from overleaf/ae-rich-text-available
...
Only enable the Rich Text option for supported file extensions
GitOrigin-RevId: ae67435b50701bb5be71bab94d8c3c4da4129d88
2023-02-09 09:05: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
M Fahru
5f3ef71e43
Implement 'Add Affiliation' UI on the mobile version of the new react dashboard ( #11606 )
...
* Refactor & change `add-affiliation.tsx` file:
* Change class from `user-profile` to `add-affiliation`
* Add new optional `className` props for custom styling
* Show affiliation widget on mobile screen:
* Fix bug on use add affiliation hooks: return type should be `boolean`, not `boolean | 0`
GitOrigin-RevId: 800b951e2a012797266b1780993b4ed9a918d565
2023-02-08 09:07:23 +00:00
Alf Eaton
85fbded781
Improve the Rich Text toolbar ( #11616 )
...
GitOrigin-RevId: d1999be629ac048058ffd82004865728796a3feb
2023-02-07 09:04:39 +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
781c1c97c7
Implement new three-way split test for the plans page ( #11493 )
...
* Update split test config and infrastructure for plans-page-layout-v3
* Implement view for `old-plans-page-annual` variant of the new split test:
- Make `annual` the default view for all elements on the old plans page
- Change the tooltip background to green for monthly/student view
* Implement a new design for the new plans page:
- switch annual and monthly locations (annual on the left now)
- change the tooltip background to green color for all choice
- make the monthly-annual switch has green background if annual is chosen
* Fix mobile view plans page header style
GitOrigin-RevId: b2b3c6ac6adbe26bf6def7e072493f503793cfcb
2023-01-30 09:02:45 +00:00
Jessica Lawshe
14039c6729
Merge pull request #11129 from overleaf/jel-survey-link-mobile
...
[web] Fix line height for survey text on mobile
GitOrigin-RevId: f96e682b8534d7404c89b45ad4264538bf8a0a2e
2023-01-27 09:05:14 +00:00
Alf Eaton
69fe1749ce
[rich-text] Improve toolbar button styles ( #11419 )
...
GitOrigin-RevId: 81def8f65591fe9f8f914384db971238faa4483f
2023-01-25 09:05:26 +00:00
Mathias Jakobsen
f3dac1aa95
[cm6+rt] Move CM6 formatting toolbar to panel ( #11395 )
...
GitOrigin-RevId: 97036c57d63fb7590dda7c98df3347ee83f41ae5
2023-01-25 09:05:05 +00:00
Alf Eaton
68a3b93eca
Merge pull request #11311 from overleaf/jpa-plans-page-tooltip-width
...
[web] plans page: allow tooltips to be slightly larger
GitOrigin-RevId: 17bb0c0a1ae6a88efe5e0d2df284bd28f6e5824b
2023-01-24 09:04:57 +00:00
Alf Eaton
cf8051dcad
Advertise CM6 Rich Text in the CM5 track changes panel ( #11361 )
...
GitOrigin-RevId: 3d2e43263528c64292a01afb3d032e11a6cbbfb9
2023-01-24 09:04:13 +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
Tim Down
467936e655
Merge pull request #11285 from overleaf/mf-fix-margin-bottom-dashboard
...
Add margin bottom to project dashboard search on mobile view
GitOrigin-RevId: e44d567d2848b23cbffc2b0dc487c468e3313bc4
2023-01-18 15:08:41 +00:00
Miguel Serrano
ed9bd54836
Merge pull request #11308 from overleaf/revert-11289-mj-right-toolbar
...
Revert "[web] Change pdf control toolbar alignment for CM6 RT"
GitOrigin-RevId: 71e7941afbdb3e77186760e3d2a0ce3655bdbc1a
2023-01-18 15:07:50 +00:00
Alf Eaton
a1aa65724a
Merge pull request #11289 from overleaf/mj-right-toolbar
...
[web] Change pdf control toolbar alignment for CM6 RT
GitOrigin-RevId: c3906df7ebf8da7097c680cdd58fc4bfb3f75704
2023-01-18 09:04:23 +00:00
Mathias Jakobsen
778aa45e96
Merge pull request #11247 from overleaf/mj-toolbar-overflow
...
[cm6+rt] Wrap formatting buttons if editor is too narrow
GitOrigin-RevId: d1b234c721f4bed67f1da567b90139f0c95895f0
2023-01-17 09:05:27 +00:00
M Fahru
19e1d50e2e
Fix editor overleaf logo on editor disappears if menu button is pressed in light theme
...
GitOrigin-RevId: a4f104cf988bfc267ba70cbe546e150bea773691
2023-01-13 09:05:07 +00:00
ilkin-overleaf
4f35333a39
Merge pull request #9536 from overleaf/ii-adjustable-project-dashboard-panel
...
[web] Adjustable project dashboard sidebar
GitOrigin-RevId: 1007ecb896bbe215af28fa92d295201b2457aeef
2023-01-10 09:05:44 +00:00
Jessica Lawshe
77c0802035
Merge pull request #10925 from overleaf/jel-vertical-align-css
...
[web] Better vertically align content in CMS pages
GitOrigin-RevId: 276cd3f4566bfbbc5a79b91d5f1567ae4d618280
2022-12-20 09:04:59 +00:00
Davinder Singh
306b2b7727
Merge pull request #10844 from overleaf/ds-editor-btn-info-to-secondary
...
Replacing `btn-info` with `btn-secondary-info btn-secondary` in the editor
GitOrigin-RevId: 1e348b0b09bfd08508a3dbee7df882f41fdc16eb
2022-12-19 09:04:17 +00:00
Davinder Singh
e7e1fcef3b
Merge pull request #10796 from overleaf/ds-plans-page-btn-tag
...
Replaced the a tag with button tag for plans page plans options
GitOrigin-RevId: 4717067ce0fc9209a65c0d323602d834a90951fc
2022-12-19 09:04:10 +00:00
M Fahru
55375c78bf
Fix tooltip and table header appearing on top of the navbar (z-index bug) ( #10873 )
...
GitOrigin-RevId: 88f88ff5b491356df8b34bfaf97ead28da2ff451
2022-12-13 09:05:01 +00:00
M Fahru
558cf0715a
Fix wrong border radius location on new plans page group and student table ( #10874 )
...
GitOrigin-RevId: 744b81b3e5a7b189dc1e86efd00680901a53b494
2022-12-13 09:04:54 +00:00
Jessica Lawshe
30a47a2bb5
Merge pull request #10872 from overleaf/jel-cms-vertically-center-fix
...
[web] Vertically center columns when option selected on CMS
GitOrigin-RevId: 55b4c0d6061dc400167cbbc2e7a7d15b1e40fb43
2022-12-13 09:04:41 +00:00
Jessica Lawshe
c7a10558bf
Merge pull request #10830 from overleaf/jel-remove-test-show-unified-navigation
...
[web] Remove `unified-navigation` references in code
GitOrigin-RevId: bbcea3c8013936a8e5eaed18e6121344a3c05e9a
2022-12-13 09:04:28 +00:00
Alf Eaton
9f1f62b9be
Add rich-text mode to CM6 ( #10775 )
...
Co-Authored-By: Mathias Jakobsen <3295293+hrjakobsen@users.noreply.github.com>
GitOrigin-RevId: 00e015cb216bb8a52d083e71b34dbe91a7cd6cc5
2022-12-13 09:03:54 +00:00
Davinder Singh
60dc53e685
Merge pull request #10790 from overleaf/ds-history-toggle-bug-fix
...
Fixed the bug with 2/3 way segmented control.
GitOrigin-RevId: d2e340c097d60ef47b4cf2817a413cc574a871de
2022-12-08 09:03:57 +00:00
Davinder Singh
4adfca52bf
Merge pull request #10682 from overleaf/ds-btn-default-to-secondary-in-editor-part-2
...
Replacing btn-default with btn-secondary in the editor Part-2
GitOrigin-RevId: 708aa29070bb3049afbc8ee1a282eaa1018594a8
2022-12-08 09:03:42 +00:00
Tim Down
08567c290e
Add second CM6 switch-away survey ( #10789 )
...
Restart CM6 switch-away survey
GitOrigin-RevId: 1d62aaf27834cb3919f6ca30c269a1ef3c2e9a5e
2022-12-07 09:04:35 +00:00
Jessica Lawshe
34d4987776
Merge pull request #10774 from overleaf/jel-new-page-style
...
[web] Updates to new page style
GitOrigin-RevId: 4d29b4642efef608164fb9fc6875c1618565d231
2022-12-06 09:05:04 +00:00
Jessica Lawshe
3d0d311584
Merge pull request #10754 from overleaf/jel-cms-vertically-center-col
...
[web] Only center columns when the vertically centered option selected on CMS grids
GitOrigin-RevId: 7890c870d5058ee927f66d7cd693b3cd35a2e117
2022-12-06 09:04:43 +00:00
June Kelly
4b856dbd70
Merge pull request #10116 from overleaf/jel-dash-action-checked-list
...
[web] Use other checked list class on dash action modal
GitOrigin-RevId: 22afaf805e57813e243543912811207a74ae85ed
2022-12-02 09:03:42 +00:00
Jessica Lawshe
be520e7bb0
Merge pull request #10744 from overleaf/revert-10726-ds-bug-fix-history-segmented-control
...
Revert "Bug fix- Fixed the 2 way segmented control on history panel."
GitOrigin-RevId: 58a2d9ebb1023f76ed87249722b749cc5062b2b9
2022-12-01 09:05:51 +00:00
Jessica Lawshe
8537a37020
Merge pull request #10726 from overleaf/ds-bug-fix-history-segmented-control
...
Bug fix- Fixed the 2 way segmented control on history panel.
GitOrigin-RevId: 6d514ed2f1fd9b8342e918089d3966c1a1a388ba
2022-12-01 09:05:36 +00:00
Jessica Lawshe
975b0200c3
Merge pull request #10550 from overleaf/jel-cms-btn-color-blocks
...
[web] Buttons in CMS color blocks for new CSS
GitOrigin-RevId: 162223c2bde95922c8619eb45b9c5e32d0c4084d
2022-12-01 09:05:30 +00:00
Jessica Lawshe
542dce8de0
Merge pull request #10573 from overleaf/jel-cms-vertically-center
...
[web] Vertically center columns on CMS pages when selected
GitOrigin-RevId: f4b5abd0f8549329bf5d0a6f0f90900b42674763
2022-12-01 09:05:16 +00:00
Davinder Singh
a5f19e6903
Merge pull request #10633 from overleaf/ds-login-page-css-new-builds
...
Add new CSS styling back to `login` and `Home` page
GitOrigin-RevId: da4d9bfd91373de52495e0624ada2a735dca23e4
2022-12-01 09:04:42 +00:00
Davinder Singh
9bda93fca0
Merge pull request #10616 from overleaf/ds-arrow-cms-btn
...
Adding arrow to the CMS buttons
GitOrigin-RevId: 9afc0117b29257f2ede7b973f0aff4e21089f572
2022-12-01 09:04:28 +00:00
Jessica Lawshe
0bb883a2c5
Merge pull request #10694 from overleaf/jel-link-color
...
[web] Remove not pseudo-class
GitOrigin-RevId: 6cb1abc45c01f408808672a47782d0769f442a20
2022-11-29 09:05:07 +00:00
Eric Mc Sween
d21fd77d54
Merge pull request #10691 from overleaf/jel-cms-style
...
[web] Limit to CMS pages
GitOrigin-RevId: e5f3f3cb72264b3ef6f01dbfe8071d8c970dd631
2022-11-29 09:04:54 +00:00
Davinder Singh
b84824776a
Merge pull request #10658 from overleaf/mf-fix-plans-v2-button-hover-color
...
Fix specific button color being overridden by default styling
GitOrigin-RevId: 103ae4b99adb5706089b9fd85b73a603be974450
2022-11-28 09:04:11 +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
Jessica Lawshe
22c9eff086
Merge pull request #10552 from overleaf/jel-cms-icon-with-content
...
[web] Add "Element | Icon with Content"
GitOrigin-RevId: 5fd2cc16b44612b70e3817c5ad21798ba58422d2
2022-11-21 09:04:15 +00:00
Jessica Lawshe
854c39d3f5
Merge pull request #10526 from overleaf/jel-btn-recompile
...
[web] `btn-recompile` and `log-btn` for new CSS
GitOrigin-RevId: b92724267a87f5dce8ed0e60e926c1939f64c4f9
2022-11-18 09:05:44 +00:00
Jessica Lawshe
0fe7e74343
Merge pull request #10520 from overleaf/jel-ds-cms-quote
...
[web] Add new quote layout option from CMS
GitOrigin-RevId: 63d72f7adf72da231093ab82876173082cd5851c
2022-11-18 09:05:09 +00:00
Jessica Lawshe
dc9b901508
Merge pull request #10497 from overleaf/jel-cms-new-style
...
[web] Add new CMS page style
GitOrigin-RevId: 320e02dc2ccfd211396548d7b813bd4c675e6f84
2022-11-18 09:05:02 +00:00
M Fahru
d70e0b1c0e
Implement grammarly warning alert on cm6 users
...
GitOrigin-RevId: ed272bbc385faa69811ec1891075906cdca1c984
2022-11-16 09:06:39 +00:00
Davinder Singh
f8fc0f5c73
Merge pull request #10484 from overleaf/ds-homepage-css-bug-fix
...
fixed the css bug on home page, removed the variable
GitOrigin-RevId: 5a2ca4aa75d15205d56e83d598535128643e6b39
2022-11-16 09:05:09 +00:00
Davinder Singh
c6f8b17647
Merge pull request #10286 from overleaf/jel-ds-toggle
...
Fix toggle and `Switch to PDF` aligment
GitOrigin-RevId: d3c77ff34829af875d2b8b9e3797e0e7db867631
2022-11-16 09:04:26 +00:00
Davinder Singh
966a151686
Merge pull request #10270 from overleaf/ds-toolbar-logo-background-color
...
Removed the background colour for branded logo in light theme
GitOrigin-RevId: 935fba12d306e55bb994ca1b7a376f11cb0bd5c1
2022-11-16 09:04:18 +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
Jessica Lawshe
62cf8c9d61
Merge pull request #10262 from overleaf/jel-ds-btn-secondary
...
[web] Buttons for new CSS build
GitOrigin-RevId: 9ae4284ba89296b77c37d61ba9b221bcab2f6458
2022-11-15 09:06:25 +00:00
Brian Gough
782294abae
Merge pull request #10212 from overleaf/ii-dashboard-shorten-text-in-dropdowns
...
[web] Project dashboard add ellipsis to long text in the project filter dropdown on mobile
GitOrigin-RevId: 4b0d4e097ff0f26820c158086d8b089cbf1e364f
2022-11-07 09:03:38 +00:00
M Fahru
19dd2f67e2
Implement "switch away survey" when users switching back to ace from cm6 ( #10201 )
...
Implement legacy source editor survey:
* Force user to switch to cm6 if they haven't seen switch away survey
* Only show user switch away survey if they open ace from another editor
* We need to wait 3 seconds until the survey is being shown
* Add comment to explain the reasoning of not showing cm6 switch away survey for rich text users
* Use localstorage `editor.has_seen_cm6_switch_away_survey` setter to not show the survey if user has seen the survey
* the `editor.has_seen_cm6_switch_away_survey` will have the value `true` even if user is not interacting with it, so update comment to reflect that
* Add `once: true` option to keydown event to avoid unnecessary callback invocation upon key presses
GitOrigin-RevId: c26be2bb39efac2dff112c821fca893e5993dcbf
2022-11-04 09:05:50 +00:00
Jessica Lawshe
c021b48824
Merge pull request #10073 from overleaf/jel-cleanup-imports
...
[web] Design system updates
GitOrigin-RevId: d5a9d8736083b076474e2a43f0200a6419f24a92
2022-11-02 09:04:29 +00:00
Tim Down
cd60d6719a
Merge pull request #10067 from overleaf/ds-design-segmented-control
...
Changed the css for segmented toggle switch animation
GitOrigin-RevId: e3c0dc496be9fedea5d9463f57b9844991f0c0eb
2022-11-02 09:04:14 +00:00
Tim Down
cbc3aef728
Merge pull request #10109 from overleaf/ds-switch-component
...
Modifying the Switch
GitOrigin-RevId: 93b8483aa4aa164ea0be5fc2b4ccc5cfb17eae3c
2022-11-02 09:04:07 +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
d98e32f38a
Remove unused class selector.
...
This is an artefact and should have been removed when we removed the rich text survey component.
GitOrigin-RevId: cdda625b02328b8c300a91178733321ecfcd7290
2022-10-28 08:05:07 +00:00
Jessica Lawshe
58ba814cd1
Merge pull request #10114 from overleaf/jel-dash-survey-container
...
[web] Fix desktop dash survey container click behavior
GitOrigin-RevId: 9e94ee572e348fca1f950698dd5a7449195a52da
2022-10-25 08:04:12 +00:00
ilkin-overleaf
f8e98cd5c6
Merge pull request #10030 from overleaf/ii-dashboard-survey-react-mobile-view
...
[web] Project dashboard survey mobile view
GitOrigin-RevId: 19612f75a9987625f10626f5f9ea9b53321d5fe2
2022-10-24 08:02:59 +00:00
Jessica Lawshe
9d31ea62b3
Merge pull request #9992 from overleaf/jel-react-dash-sidebar-buttons
...
[web] React dash - wrap text in sidebar buttons
GitOrigin-RevId: 68c037c93049468fd48104a151188fc20a643910
2022-10-18 08:03:39 +00:00
Jessica Lawshe
8323cb37e8
Merge pull request #9955 from overleaf/jel-actions-list
...
[web] Maintain project list in actions modal while processing and show processed
GitOrigin-RevId: c671b97646918e185d7989f539b44562a87873ee
2022-10-18 08:03:34 +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
Timothée Alby
48310f3715
Merge pull request #9990 from overleaf/jel-react-dash-dropdown
...
[web] React dash - Fix project dropdown overflow
GitOrigin-RevId: 30fc7cd270d393856c0f082f4638588260fefc13
2022-10-18 08:03:14 +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
Eric Mc Sween
7c812162a1
Merge pull request #9895 from overleaf/jel-react-dash-survey
...
[web] Fixed position survey at bottom left of viewport on React dash
GitOrigin-RevId: a48c50e0cb90ef7356b461c0a480f7b163692303
2022-10-12 08:04:44 +00:00
Eric Mc Sween
103351bc1f
Merge pull request #9909 from overleaf/jel-dash-sidebar-tag
...
[web] Fix tag name expanding React dash sidebar
GitOrigin-RevId: ed316e2219ed78a8a57e593507adac56ff55416e
2022-10-12 08:04:36 +00:00
Jessica Lawshe
0bf147b84c
Merge pull request #9842 from overleaf/jel-dash-filter-layout
...
[web] Dash filter margin handling
GitOrigin-RevId: bfd6b3e43231a28fe76aa5255b97a6e222500d62
2022-10-07 08:04:49 +00:00
Jessica Lawshe
6f007a9703
Merge pull request #9838 from overleaf/jel-dash-scrolling
...
[web] React dash scrolling
GitOrigin-RevId: 80d8fe8756df717c19c05e6ad848c32d03e487fc
2022-10-07 08:04:42 +00:00
Tim Down
5aa325cf51
Merge pull request #9712 from overleaf/td-galileo-notification-close-button
...
Improve styling of Galileo notification close button
GitOrigin-RevId: faf0a4180f4f3e837bd4f2302e2689aa4dd1564e
2022-10-04 08:03:19 +00:00
Jessica Lawshe
6095e63c7d
Merge pull request #9833 from overleaf/revert-9559-jel-dash-scroll
...
Revert "[web] Project dashboard scrolling"
GitOrigin-RevId: dc18d2717714b8c044a5c2bd04c3bef0b579663d
2022-10-04 08:03:09 +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
c65e3ac26c
Merge pull request #9772 from overleaf/ii-dashboard-row-spacing
...
[web] Project dashboard adjust row-spaced for mobile view
GitOrigin-RevId: d615372551647f8ac77d9a6b1068d5e87c88c695
2022-10-04 08:02:57 +00:00
Jessica Lawshe
9b09f8426d
Merge pull request #9559 from overleaf/jel-dash-scroll
...
[web] Project dashboard scrolling
GitOrigin-RevId: bd427f29e411d57dbc7c5e79c79195cee664ff88
2022-10-04 08:02:44 +00:00
Davinder Singh
855adb73ef
Merge pull request #9747 from overleaf/ii-cm6-grammarly-dark-theme-css-fix
...
[web] Grammarly suggestions underline css fix
GitOrigin-RevId: 195cf787cf9b3c8a7843ba15e2ed59320942a64e
2022-09-28 08:06:08 +00:00
Davinder Singh
b51c35d8b4
Merge pull request #9721 from overleaf/ii-cm6-grammarly-dark-theme
...
[web] Grammarly suggestions underline
GitOrigin-RevId: 37d3117e8465052f26e81c58b7f07eefee8e0fe7
2022-09-28 08:05:39 +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
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
Jessica Lawshe
6ff77971ad
Merge pull request #9601 from overleaf/jel-no-projects-row
...
[web] Fix no projects row styling
GitOrigin-RevId: 6ad5b28c436287465c34f59a2d6e5d74d59e06f6
2022-09-19 08:04:17 +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
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
Alf Eaton
25725bd79f
Add Rich Text survey message in PDF preview pane ( #9423 )
...
GitOrigin-RevId: e190ae569d5e2390e8bcf52672757cc7f269ea56
2022-09-02 08:04:41 +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
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
Alf Eaton
d905863002
Merge pull request #8747 from overleaf/ae-error-boundary-fallback
...
Create a generic ErrorBoundaryFallback component
GitOrigin-RevId: 0c9200ddef2be3b90030a32eb8c36a59047cf2b4
2022-08-10 08:03:51 +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
Timothée Alby
0e2245930d
Merge pull request #8910 from overleaf/ta-add-email-wider
...
Wider Add Email Input
GitOrigin-RevId: e0b3a8577754205ac12fbfb17e56eb1f844a5273
2022-07-21 08:03:58 +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
M Fahru
d0d1791b04
New plans page: Remove the "group admin" part of student table ( #8881 )
...
GitOrigin-RevId: 3319891aa0f4c0bf0343a7a98e5f8e24c00925cd
2022-07-18 08:04:44 +00:00
M Fahru
2173821121
Make the text on new plans page content benefit have a hyphen on word break for small screen
...
GitOrigin-RevId: 6a2cae2cfabc60d112a31cebf6263730f962224d
2022-07-15 08:04:00 +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
8603fcac6c
Add correct link to the university support button ( #8797 )
...
GitOrigin-RevId: 1ecb591ff9dd99d195eed0fa2ae4b5702ef53b7e
2022-07-13 08:05:27 +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
M Fahru
f3118771fe
Add new limited discount information on personal plan in the new plans page ( #8715 )
...
GitOrigin-RevId: 7f4e91179ba767ff8b88df7787eaf9d4fe6a5f05
2022-07-13 08:05:06 +00:00
M Fahru
ebbe14e1a7
Remove university section from the Student Plans in the new plans page
...
GitOrigin-RevId: 00917ab8cd5190721036baab9ea8ab5fca9a3665
2022-07-13 08:04:59 +00:00
M Fahru
c95c96a1d4
Fix big spacing on the bottom and the right side of the new plans page ( #8767 )
...
GitOrigin-RevId: c30ed0e7733eb48048162ed55d0359b449e4f10b
2022-07-11 08:04:53 +00:00
ilkin-overleaf
f2e6cf7a3b
Merge pull request #8700 from overleaf/ii-cm6-source-editor-switch-toggle
...
[cm6] Prevent hopping to rich text when clicking the source button
GitOrigin-RevId: 2359e157c12026a1c5ceb8b6e40cd45956d75d1d
2022-07-08 08:05:10 +00:00
Alf Eaton
c8b0e81550
[cm6] Tidy up advanced references search banner code ( #8674 )
...
GitOrigin-RevId: a0044b9328af03a77ac3c3e5d5caa594bbd5fe6b
2022-07-08 08:04:49 +00:00
M Fahru
bbaac83b82
Refactor plans v2 sticky header to use dedicated config instead of hardcode ( #8659 )
...
GitOrigin-RevId: 3ea56ad5c6b9b5f6556e97429cf3e67a0b0d56bc
2022-07-06 08:03:02 +00:00
M Fahru
361f6f245a
Refactor new plans page ( #8493 )
...
* [web] hide the monthly/annual switch for small screens via css
Co-Authored-By: Jakob Ackermann <jakob.ackermann@overleaf.com>
* [web] merge logic for hiding elements shown in a subset of view
Co-Authored-By: M Fahru <m.fahru@overleaf.com>
* [web] hide the monthly/annual switch for small screens via css
Co-Authored-By: M Fahru <m.fahru@overleaf.com>
* [web] merge logic for hiding elements shown in a subset of view
Co-Authored-By: M Fahru <m.fahru@overleaf.com>
* fix inverted logic on monthly annual checking
* delete some duplicated logic and refactor
* merge switch functions
* move global variable into the main module
* simplify the enable and disable switch
* remove unused parseFloat
* simplify group plan pricing calculation
* simplify discount group plan logic
* simplify sticky header logic
* merge view and period switching
* fix underlining of switch text
* simplify class list toggling
* merging two function of the group plan
Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
GitOrigin-RevId: 5e51690514bbf1dee2639011748c6a8470e1c19a
2022-06-23 08:02:56 +00:00
Alexandre Bourdin
3d26c4bb6f
[web] Add new admin tool for surveys ( #8356 )
...
* Setup survey module and admin page skeleton
* Replace survey staff access permission with admin-only
* Manage survey config with admin tool
* Display configurable survey in project list + add preview in admin
* Fix linting errors and unit tests
* Add acceptance tests for survey module
* Move survey-form to survey components
* Add configuration option for Recurly group subscription users on surveys
* Change survey pre-link text to a lighter gray for accessibility
* Cleanup survey options implementation after review
GitOrigin-RevId: 8f621951efeae458d1ab081fe98b8d0d539cca1a
2022-06-23 08:02:37 +00:00
Alexandre Bourdin
21c8b9a47a
Merge pull request #8426 from overleaf/ta-error-pages-style
...
Update General Error Pages Style
GitOrigin-RevId: 04346784c94d5ce6bf3257fd128a3f00da4c4e9e
2022-06-23 08:02:34 +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
Alexandre Bourdin
57114c4503
[web] Display the current plan in the project list dashboard ( #8293 )
...
* Display the current plan in the project list dashboard
* Add unit tests for SubscriptionViewModelBuilder#getBestSubscription
* Handle free trial for group subscriptions
* Reuse the info-badge icon for the plan labels
* Do not display subscription status when projects are selected
* Custom tooltip for group subscriptions with team name
GitOrigin-RevId: 40982f70cf9fb7c92058e417b73c84af1648c33e
2022-06-17 08:03:40 +00:00
Davinder Singh
eba2fe9a3e
Merge pull request #8212 from overleaf/ds-remove-registration-field-home-page
...
Remove registration from home page
GitOrigin-RevId: 3bd04f2f2aa62ef5f3fa8a0cdd09e461c38a27e9
2022-06-17 08:03:10 +00:00