github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity
20172 commits 3 branches 7 tags 201 MiB
Commit graph

183 commits

Author SHA1 Message Date
Timothée Alby
411886ba94 Merge pull request #5902 from overleaf/ta-layout-local-storage 
Fix pdf.layout value in local storage

GitOrigin-RevId: 1ff6ab51f51d2895b6e7305a36af57fb205c0fa3
 2021-12-01 09:03:28 +00:00
Alf Eaton
830123df98 Merge pull request #5841 from overleaf/ae-deep-watch-rootfolder 
[web] Use deep option when watching scope.rootFolder

GitOrigin-RevId: a82a74fd3dad8aad833d14b3bde1e175b6c41895
 2021-11-25 09:02:57 +00:00
Alexandre Bourdin
cdaf55c7da Merge pull request #5808 from overleaf/revert-5736-ab-drop-ie11-polyfill 
Revert "Remove IE11 polyfills and update browser support policy"

GitOrigin-RevId: fa44a6bfa796d191446956e94d9e533a70e59da4
 2021-11-17 09:04:23 +00:00
Alf Eaton
ec31473f8f Merge pull request #5736 from overleaf/ab-drop-ie11-polyfill 
Remove IE11 polyfills and update browser support policy

GitOrigin-RevId: 9ab9513ecf97fc565a1d2620f9785a64bd16b766
 2021-11-17 09:03:32 +00:00
Timothée Alby
8ca159b4b9 Merge pull request #5797 from overleaf/ta-pdf-detach 
PDF Detach

GitOrigin-RevId: f69d8a87d1ba2115ad496a719106dfc7707a6ed5
 2021-11-16 09:02:57 +00:00
Alf Eaton
f351a7af0a Render log entry annotations in the CodeMirror 6 gutter (#5654) 
GitOrigin-RevId: e68c913a572a24c037167fe8b3418ec9ac4ce6ab
 2021-11-16 09:02:46 +00:00
Alf Eaton
efcc15d5b5 Add CodeMirror 6 cursor/scroll position handling (#5653) 
GitOrigin-RevId: bf756a415dbf1e4b5bbd9f580700bdc799c6b1d6
 2021-11-16 09:02:41 +00:00
Alf Eaton
3feca1ffc6 Move symbol palette to module and add overlay (#5396) 
GitOrigin-RevId: 649dd56aaecd60662bd2bf534bda323ee541874f
 2021-11-11 09:03:05 +00:00
Miguel Serrano
8b85ef36eb added check of compilation result status before setting pdfUrl/pdfDownloadUrl (#5697) 
GitOrigin-RevId: ebf78bc2f98a952411875740fe912e275f83b224
 2021-11-09 09:03:48 +00:00
Alf Eaton
ed825e3170 Mark defaultValue as optional for useScopeValueSetterOnly (#5695) 
GitOrigin-RevId: e42cc48f3762e1a0369fe80ab1b9d7ccb237b3f1
 2021-11-05 09:03:08 +00:00
Miguel Serrano
26eb5d7cdc Cleanup compile results on compilation error (#5663) 
- pdfUrl, pdfDownloadUrl and log entries are now cleared up after a compilation error.

- Added a new hook, useScopeValueSetterOnly that limits how changes in React components are propagated to Angular. Since the compilation process happens entirely within compile-context it make sense that compilation results are solely managed by compile-context itself.

GitOrigin-RevId: 2003be03bab6753bb9a88194c7a6163cfd36f9c2
 2021-11-04 09:04:05 +00:00
Jessica Lawshe
3ad686c30b Merge pull request #5630 from overleaf/jel-layout-dropdown 
New project layout dropdown

GitOrigin-RevId: 8d7f4ff6649fe249b762642e70522597e5e78dd4
 2021-11-04 09:03:44 +00:00
Alf Eaton
be809a0de8 Reinstate uses of useScopeValue (#5544) 
GitOrigin-RevId: d1eac1b18b042fbd4203cd37c79abef10cec626c
 2021-10-22 08:04:13 +00:00
Alf Eaton
913a62fbc8 Migrate synctex controls to React (#5503) 
GitOrigin-RevId: 80362a00ae6b73616a6fa9b3193b9b9974b5fd35
 2021-10-22 08:03:43 +00:00
Alf Eaton
2bf422b76d Merge pull request #5522 from overleaf/ae-compile-feature-flag 
Only use the React compiler when showNewPdfPreview is set

GitOrigin-RevId: 24bf8dc6a830e670ee8dc30b8e0329127de1a1a8
 2021-10-22 08:03:31 +00:00
June Kelly
4f29ca5cbd Merge pull request #5395 from overleaf/msm-pdf-metrics 
Added PdfJsMetrics to React PDF Viewer

GitOrigin-RevId: ff749d67baec243ca2c8e51409754716f4cef62c
 2021-10-21 08:03:07 +00:00
Alf Eaton
9ffe28649c Improve rendering of errors from pdf.js (#5448) 
GitOrigin-RevId: 69836ba213b124e2442b2d0083531dd95be2bf4e
 2021-10-18 08:04:06 +00:00
Alf Eaton
f7ef2532e0 Handle PDF preview on toggle between split and full-width views (#5470) 
* Only hide the compile logs pane when toggled off
* Handle PDF preview on toggle between split and full-width views

GitOrigin-RevId: 9ceca8a06a22abfa78f245e1ae5d24af98215906
 2021-10-18 08:03:26 +00:00
Alf Eaton
845b2fbc04 Move useScopeValue hook to shared hooks folder and wrap setValue in a function (#5386) 
GitOrigin-RevId: b1a6a4e871af3b52fb3d100a83b479c834cb75ca
 2021-10-11 08:03:29 +00:00
Alf Eaton
165520a6f2 Refactor scoped layout values into LayoutContext (#5356) 
GitOrigin-RevId: b0b07ddd078bfc5acd944cac14bc00dc83d09d21
 2021-10-11 08:03:17 +00:00
June Kelly
03e1daa038 Merge pull request #5201 from overleaf/msm-pdf-viewer-error-boundaries 
Error boundaries for React PDF viewer

GitOrigin-RevId: 90052fc183f7ece8125ecfb0410a529cf905c13b
 2021-10-07 08:03:43 +00:00
Alf Eaton
e76b7696da Add listen parameter to usePersistedState hook (#5134) 
GitOrigin-RevId: d40f942164403a31ffbb10336227eef59a57febf
 2021-09-30 08:04:25 +00:00
Alf Eaton
c5c727f552 Move useResizeObserver into features/preview (#5188) 
GitOrigin-RevId: c12dfc30b07e4a214990b7e80ce11364edb6137a
 2021-09-24 08:04:28 +00:00
Alf Eaton
233ceb5356 Allow function as value for usePersistedState hook (#5131) 
* Allow function value in usePersistedState
* Add tests for usePersistedState
* Use nullish coalescing to avoid calling getItem twice

GitOrigin-RevId: e0351addea904aefb7a402bff32689792b49fbbb
 2021-09-24 08:04:21 +00:00
Timothée Alby
c5f883ad83 Merge pull request #5031 from overleaf/ab-paywall-events 
Merge paywall-prompt and paywall-click events

GitOrigin-RevId: d567631d08b89565f9a3049f9b88cc2d14a799c1
 2021-09-17 08:03:12 +00:00
Alexandre Bourdin
7e6839b0af Merge pull request #4715 from overleaf/ab-project-members-modal-split-test 
Share modal split test

GitOrigin-RevId: 274450564e1cbfc3ba3ec7c2ca60dfeda552a536
 2021-08-20 08:04:05 +00:00
June Kelly
b770feadc8 Merge pull request #4743 from overleaf/hb-recaptcha-branding 
add recaptcha branding on login, registration, pw reset and share modal

GitOrigin-RevId: dcdf3e7987a25712601aed2426cce2467eaecea3
 2021-08-20 08:03:05 +00:00
June Kelly
4737982cdd Merge pull request #4675 from overleaf/msm-fix-review-button-ce 
Remove Track Changes button in CE

GitOrigin-RevId: 7e682ea9cce8d23ba0fffc95cfb379588f0fd42e
 2021-08-13 12:57:17 +00:00
Alexandre Bourdin
eb31e6ebed Merge pull request #4343 from overleaf/as-fix-publish-modal 
Fix publish modal showing incorrect view for various brands

GitOrigin-RevId: c1a71300b21d41d6566ae481c843b020e0ef84f1
 2021-07-28 02:06:38 +00:00
Miguel Serrano
9b59c0813c Replaced application-context with user-context (#4246) 
* Replaced `application-context` with `user-context`
* deleted `user` initialization with `window.user`
* fixed tests and storybook

GitOrigin-RevId: 0ed4b9070d7c6d370fee2112f310c4bcfea519e7
 2021-06-26 02:05:53 +00:00
Miguel Serrano
b7802674d5 Merge pull request #4245 from overleaf/msm-extract-project-context 
React `project-context`

GitOrigin-RevId: 6a23437d6e6a328ff5854622ff903d348db1f8b8
 2021-06-26 02:05:49 +00:00
Alf Eaton
7c97f8ab6e Switch to new JSX runtime (#4225) 
* Use new JSX runtime and update Babel Node target
* Update .eslintrc
* Remove React imports

GitOrigin-RevId: 559de0267f8f2934c56a860ea8701bb522aa861a
 2021-06-24 02:06:59 +00:00
Alf Eaton
bb55fc2e32 Add useDropdown hook (#4228) 
GitOrigin-RevId: a16762139049aed1e309b1330602c3b291d41f81
 2021-06-24 02:06:49 +00:00
Alf Eaton
2328dd1705 Add useAbortController hook (#4234) 
GitOrigin-RevId: 731f86a2b07cd2c3189e6ca86bba9fbbc913f429
 2021-06-24 02:06:45 +00:00
Alf Eaton
eebeffc1c5 Merge pull request #4188 from overleaf/ae-memo 
Improve React performance by memoizing components and values

GitOrigin-RevId: 805278b8b7ac04c3dc4b078fa53cc0e3770d261b
 2021-06-22 02:07:08 +00:00
Alf Eaton
1760d93fc4 Upgrade React to v17 (#4201) 
* Upgrade react and react-dom
* Fix test
* Ensure that the "history:toggle" event is broadcast when switching in or out of history view
* Add ControlledDropdown
* Remove DropdownButton stories

GitOrigin-RevId: 3810f6986bb60e59af31f960f431c31be16554f5
 2021-06-19 02:08:29 +00:00
Alasdair Smith
20b27116f8 Merge pull request #4218 from overleaf/ae-symbol-palette-beta 
Enable symbol palette for beta users

GitOrigin-RevId: 36840499b5732cc9087e0cc6e9aef861b16009f5
 2021-06-18 02:05:49 +00:00
Miguel Serrano
8856f3121d Merge pull request #4118 from overleaf/msm-fix-nav-toolbar-anonymous 
Fix problems with React Navigation Toolbar on anonymous access

GitOrigin-RevId: 29b652ac2765129e3adf2f9bca2309e8a18ac823
 2021-06-18 02:05:40 +00:00
Miguel Serrano
567d52c573 Merge pull request #4222 from overleaf/ae-project-owner-id-path 
Fix project owner id path in scope

GitOrigin-RevId: 5ea74a01d9feb584c4cb78b620d2f2854ee45e3f
 2021-06-18 02:05:36 +00:00
Jessica Lawshe
f8ab7c32ea Merge pull request #4202 from overleaf/jel-gallery-pagination 
Add pagination to the gallery

GitOrigin-RevId: 7107133da5e5ccf316235a6688070203c8bfa566
 2021-06-17 02:09:38 +00:00
Jessica Lawshe
c34d5997e9 Merge pull request #4157 from overleaf/jel-gallery-search-via-algolia 
Add gallery search via Algolia

GitOrigin-RevId: 82f306154c990e5ba047b7a7ab9e98f193995ede
 2021-06-17 02:09:33 +00:00
Alf Eaton
ad3c66b36e Add IdeProvider (#4161) 
GitOrigin-RevId: cab09354cf4b325a1ea3814a8c4c49fac7c831be
 2021-06-17 02:09:29 +00:00
Alexandre Bourdin
c634f51eee Merge pull request #4116 from overleaf/ab-paywall-prompt-events 
Add paywall prompt events

GitOrigin-RevId: 6b1b3b384590f14828f37210b2e14047e2ee33d6
 2021-06-11 02:05:54 +00:00
Alasdair Smith
3f4fa4c6cc Merge pull request #4099 from overleaf/as-clean-up-share-modal-window 
Pull `user` and `isRestrictedTokenMember` from `ApplicationContext`/`EditorContext` instead of `window`

GitOrigin-RevId: 9084d4f1b075123fe4b10b1156c7b844595827e2
 2021-06-04 02:08:24 +00:00
Jakob Ackermann
1c2314a854 Merge pull request #4095 from overleaf/msm-fix-react-navbar-history-toggle 
Fix history mode not being restored with React Nav Toolbar

GitOrigin-RevId: 0022153b24db015c6122f45ad7965830e0033540
 2021-06-01 02:05:27 +00:00
Jakob Ackermann
f5942f1a7b Merge pull request #4098 from overleaf/msm-fix-application-provider-required-user 
Fixed `isRequired` usages for `ApplicationProvider.value.user`

GitOrigin-RevId: 0f3db77fa5da1cb0aec29ef112d1044173df88e0
 2021-05-28 02:08:46 +00:00
Alf Eaton
d5f7b1169f Add info link to symbol palette (#4086) 
GitOrigin-RevId: 4950dd1a7b15e965ffc4d2651017f491ce9ecf99
 2021-05-26 02:05:23 +00:00
Timothée Alby
70952906c9 Merge pull request #4043 from overleaf/as-clean-up-exposed-settings 
Remove `exposedSettings` from `ApplicationContext`

GitOrigin-RevId: 02acd3a7cf36d184560ff6df13acff515da908fa
 2021-05-20 02:05:05 +00:00
Alf Eaton
ec3400c7cd Add useIsMounted hook (#4039) 
GitOrigin-RevId: 4ece1381fbfbed048fe46a399a60e9aab2f3526e
 2021-05-19 02:06:31 +00:00
Jessica Lawshe
2abc9fa0e8 Merge pull request #4042 from overleaf/as-prevent-set-title 
Prevent setting title on every render

GitOrigin-RevId: d9e5ad7d7a23099f153686f538ab3e733b3b7b07
 2021-05-19 02:06:19 +00:00
Jessica Lawshe
fefb588d71 Merge pull request #3973 from overleaf/as-clean-up-hue-generator 
Clean up hue generator

GitOrigin-RevId: 1b7fad05d7c2f6519efbbe0379f2449c273e4f4b
 2021-05-19 02:06:15 +00:00
Alf Eaton
8c3578e74b Merge pull request #4041 from overleaf/ae-use-ref-with-autofocus 
Rename hooks files and move to shared folder

GitOrigin-RevId: 9659247b5e767197c3e11acc9a3922ecaab49162
 2021-05-19 02:05:50 +00:00
Alf Eaton
01c8a8a04d Merge pull request #4025 from overleaf/ae-timeout-upgrade 
Only show upgrade message on timeout if not already premium

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

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

GitOrigin-RevId: c0392472f4d6603c147876c30def36f329994af5
 2021-05-13 02:08:56 +00:00
Alf Eaton
a1bc43d994 Rename plan to planCode 
GitOrigin-RevId: 401bcbe32e3f551d525ffb59fd548c153b82baca
 2021-05-08 02:09:55 +00:00
Alf Eaton
e832c9ed70 Add StartFreeTrialButton 
GitOrigin-RevId: dd9ab4bb12e8b9071b2a869e2d452945b49d9cd7
 2021-05-08 02:09:50 +00:00
Alf Eaton
e9b93a6ef2 Merge pull request #3979 from overleaf/ae-exposed-settings 
Remove exposed-settings.js

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

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

GitOrigin-RevId: 9b40e09f001b44bd2f5035469f0d0c852fea7199
 2021-04-20 02:10:19 +00:00
Alf Eaton
1ebc8a79cb Merge pull request #3495 from overleaf/ae-prettier-2 
Upgrade Prettier to v2

GitOrigin-RevId: 85aa3fa1acb6332c4f58c46165a43d1a51471f33
 2021-04-15 02:05:22 +00:00
Miguel Serrano
f9962fefe8 React git-bridge modal (#3869) 
GitOrigin-RevId: 5b2609ed9ad7909a10cb08342053e955447688f5
 2021-04-01 02:06:05 +00:00
Alf Eaton
be804b5fc1 Merge pull request #3832 from overleaf/ae-modal-beta 
* Add BetaBadge component
* Add beta_badge_tooltip translation
* Add beta badge to modal headers
* Enable Share and Add Files modals for beta users

GitOrigin-RevId: df0933830a0745c0ecf57db34f2cb75104a570cd
 2021-04-01 02:05:38 +00:00
Alf Eaton
d0d28524a2 Switch to useScopeValue for project data in Share modal (#3823) 
GitOrigin-RevId: f82170c241c59cf7b66fea7e1471004e46ab3547
 2021-04-01 02:05:30 +00:00
Miguel Serrano
445c850004 Revert "React Git Bridge Modal (#3757)" (#3867) 
This reverts commit cf883b776a9ddc7975977534dc453ece4b3ec431.

GitOrigin-RevId: 462d7282d2c706ef5395c25a335239bfac4787a6
 2021-04-01 02:05:27 +00:00
Miguel Serrano
835c60071d React Git Bridge Modal (#3757) 
* git-bridge-modal react component and stories
* added react git-bridge-modal to angular tree

GitOrigin-RevId: cf883b776a9ddc7975977534dc453ece4b3ec431
 2021-04-01 02:05:24 +00:00
Alf Eaton
d9576189a3 Merge pull request #3636 from overleaf/ae-share-modal-split 
Migrate Share modal to React

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

* Added PropTypes check to `useChatContext()`

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

* Hide PDF button when pdfLayout != 'flat'

GitOrigin-RevId: 3f4a1b072259df7148d3417cd22116702bdd79ac
 2021-03-11 03:05:33 +00:00
Miguel Serrano
d55e46d3c0 Merge pull request #3642 from overleaf/msm-history-track-changes-toggles 
[ReactNavToolbar] Track changes and History toggle buttons.

GitOrigin-RevId: a67a9a488c0960dba3f3d374cde4db0080ed2952
 2021-02-24 03:04:17 +00:00
Miguel Serrano
d78644e02c Merge pull request #3632 from overleaf/msm-navbar-collaborator-widget 
[ReactNavToolbar] Collaborators widget

GitOrigin-RevId: 65f2484962591103f02eb7624a974d0806b1abf0
 2021-02-11 03:04:36 +00:00
Miguel Serrano
77c35e3715 Merge pull request #3633 from overleaf/msm-react-context-validation 
Added PropTypes validation to react context

GitOrigin-RevId: 86950bdacf366035d1cfd923c7e7674d543b380f
 2021-02-11 03:04:33 +00:00
Miguel Serrano
260b878b7d [ReactNavToolbar] Chat Toggle Button + chat-context (#3625) 
* Added toggle chat button to navigation header

* new `useBrowserWindow` hook to work with browser title and focus

* react2angular chat toggle button plumbing

GitOrigin-RevId: 4380f1db9c7cc9a25bfb8d7a33e18d61b1d32993
 2021-02-10 03:04:39 +00:00
Miguel Serrano
37d45d64b3 [ReactNavToolbar] Integration branch (#3513) 
* Created ng-controller for react shared context and set editor.loading

* toolbar-header component with menu button (and story)

* Added editor-navigation-toolbar-root and react2angular plumbing

* Added eslint-disable exception to use <a/> instead of <button/>

* added 'menu' to extracted translation

* [ReactNavToolbar] Added cobranding and back to projects buttons (#3515)

GitOrigin-RevId: 27c3bba85cbc96a123d58c66a0bd5d6a2cfd8aca
 2021-01-28 03:05:28 +00:00
Paulo Jorge Reis
11e58b5844 Add timeout upgrade prompt to the new compile UI (#3528) 
* Uncouple account-upgrade and exposted-settings from Angular

* Mock socket shim with the correct methods

* Extract timeout upgrade prompt to a component

GitOrigin-RevId: ee8058b38bf5e20924a21f40d32c5bb0ee06c555
 2021-01-15 03:05:48 +00:00
Timothée Alby
aef02eb0a4 Merge pull request #3494 from overleaf/ae-eslint-hooks 
Re-enable react-hooks/exhaustive-deps

GitOrigin-RevId: 2a767596d2cfd41b8bfbd3928dc43c266ec7dc0c
 2021-01-08 03:05:08 +00:00
Timothée Alby
f36269ef0a Merge pull request #3466 from overleaf/ta-accessible-modal 
Fix Aria-Hidden Modals

GitOrigin-RevId: bcce61104220ebcf04e9c348d9f3ab84bff8804a
 2021-01-06 03:08:14 +00:00
Alf Eaton
2ff1cf43d6 Merge pull request #3470 from overleaf/eslint 
Upgrade and configure ESLint

GitOrigin-RevId: ad5aeaf85e72c847a125ff3a9db99a12855e38aa
 2020-12-16 03:08:28 +00:00
Miguel Serrano
1fcf94c3b9 Merge pull request #3436 from overleaf/msm-react-shared-context 
React shared context

GitOrigin-RevId: ebc6fa90dd8c65ddf803fd457c99a30f0e8e3c9c
 2020-12-15 03:05:07 +00:00
Paulo Jorge Reis
4e74fb2694 Log pane improvements (#3418) 
* Ordering of log entries in the new errors UI

* Don't show the expand-collapse widget when not needed; smaller font size in the raw log output

* Expose log actions in the log pane.

* Use "This project" instead of "Your project" in the new errors UI

* Better handling of long log messages; left-ellipsize the file/line number button

* Make log location more button-like; add tooltip when needed.

* Add a PDF expand button to the toolbar.

* Add a stop compilation button to the new compile UI

* Use aria-label for button accessible text; improve handling of long filenames in the log location button

* Set max-height correctly for the logs pane dropdown

* Avoid changing raw logs sizing when expanded and collapsed

* Add comment on the solution for right-to-left text and ellipsis

* Improve logs pane actions

GitOrigin-RevId: 4098d77a9ee6d333644906876b9ff27035b79319
 2020-12-03 03:04:28 +00:00
Timothée Alby
420aa4a657 Merge pull request #3232 from overleaf/ta-file-tree-react 
React File Tree

GitOrigin-RevId: fb3141ba8cd9ca0d68e87edb74764a360144c8fe
 2020-11-27 03:05:05 +00:00
Jessica Lawshe
21ffe27bdd Merge pull request #3330 from overleaf/jel-toolbar-btns 
Hide toolbar text and show tooltip when out of space

GitOrigin-RevId: 5a73b69e7d92695c4f8691a747307908550e3790
 2020-11-10 03:04:35 +00:00
Jakob Ackermann
c6a853c7ed Merge pull request #3332 from overleaf/pr-new-log-entries-ui 
New log entries ui

GitOrigin-RevId: a13ccac04197e7c8f3777750b956d550c95c8f0d
 2020-11-06 03:04:59 +00:00
Jessica Lawshe
d87ad11719 Merge pull request #3210 from overleaf/ta-icon-component 
Create Icon Component in React

GitOrigin-RevId: 34161b3afa2c00dbca2423b1e5a42b29846fa6e4
 2020-09-22 02:05:09 +00:00