github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-29 19:53:41 -05:00
Code Issues Projects Releases Packages Wiki Activity
23635 commits 3 branches 7 tags 206 MiB
Commit graph

283 commits

Author SHA1 Message Date
Alf Eaton
9f969d07e0 Delete unused PDF-related code (#6334) 
* Remove new logs UI code
* Remove unused preview components
* Move metrics file
* Remove Angular PDF controllers
* Move the service worker util functions
* Remove the ide/pdfng folder
* Remove vendored pdf.js
* Remove showNewPdfPreview
* Use mockCompile
* Remove split test code

GitOrigin-RevId: 723b7440c62cda51f6ad8bb9c691900882166d21
 2022-03-16 09:03:04 +00:00
Alf Eaton
95eb69c268 Set default props in style guide story (#6865) 
GitOrigin-RevId: b5292e644804ba12a72f0513844c64495031c9e5
 2022-03-01 09:04:03 +00:00
Brian Gough
fde4f72adf Merge pull request #6779 from overleaf/ae-cm-editor-switch 
[web] [cm6] Add a three-way switch for editor choice

GitOrigin-RevId: fff788ddad8d10488e8446de7f1503702da0985f
 2022-02-22 09:03:05 +00:00
Alf Eaton
f065a7a909 Improve the Icon component (#6245) 
GitOrigin-RevId: fbb23b32c47edbe5a22badc627318accbd09e82a
 2022-01-20 09:03:58 +00:00
Timothée Alby
392410390e Merge pull request #6209 from overleaf/ta-file-tree-rework 
File Tree Misc Code Changes

GitOrigin-RevId: dce64a5378ecee5c8a2e25e02502ae631d87f36b
 2022-01-11 09:04:50 +00:00
Alf Eaton
50df230846 [web] Upgrade Prettier to match version in monorepo root (#6231) 
GitOrigin-RevId: 02f97af1b9704782eee77a0b7dfc477ada23e34d
 2022-01-11 09:03:23 +00:00
Alf Eaton
41c034b5fc [web] Add advanced references search to CodeMirror 6 (#5939) 
GitOrigin-RevId: 5731ec63565fc1b9c048e89bca21eb3303624133
 2021-12-13 09:03:59 +00:00
Alf Eaton
9e331d1176 Fix CodeMirror 6 stories (#5834) 
GitOrigin-RevId: 76f17bc02844dde61545b15e6a2e4f7c1bbcfdc7
 2021-11-23 09:02:59 +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
Alf Eaton
913a62fbc8 Migrate synctex controls to React (#5503) 
GitOrigin-RevId: 80362a00ae6b73616a6fa9b3193b9b9974b5fd35
 2021-10-22 08:03:43 +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
e26d47cb41 Add hybrid toolbar to migrated PDF preview (#5414) 
GitOrigin-RevId: 6266028091229c819aee3c8d4bd3bff2e2417125
 2021-10-13 08:03:01 +00:00
Alf Eaton
adf8828860 Fix a few minor test issues (#5415) 
* Remove signal.abort()
* Fix usage of .toString
* Fix requests for files
* Fix story

GitOrigin-RevId: 37ab4be34a8975881aed2329d4b67f8df74837d8
 2021-10-12 08:03:58 +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
b902bd9265 Refactor compile-related code from PDF preview context provider into a separate class (#5341) 
GitOrigin-RevId: 96b8bb527fa3d60a5fb84eee2b8f4fabc1726875
 2021-10-11 08:02:56 +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
73bc3418a2 Add React version of the PDF preview pane (#5135) 
GitOrigin-RevId: fcc88a362c3e97c9fddf85d47c3a83a0a0b89432
 2021-10-01 08:03:12 +00:00
Hugh O'Brien
f7900b474b Merge pull request #4799 from overleaf/hb-eslint-rules 
Re-enable some eslint rules

GitOrigin-RevId: 16153adb839bb61784bb40fbc8e43da281fe090d
 2021-09-15 08:03:43 +00:00
Alf Eaton
69482d9d3c Refactor Clone Project modal (#4748) 
GitOrigin-RevId: 03f5164d117713efd78c9806bdda6e6d5c90f6dc
 2021-09-15 08:03:33 +00:00
Alf Eaton
1d55af6e75 Refactor WordCountModalController (#4747) 
GitOrigin-RevId: d32d84a96743cd104f7d5fcd6ec66fc2c0b61c45
 2021-09-15 08:03:29 +00:00
Miguel Serrano
660af3e345 Merge pull request #4259 from overleaf/ae-file-view-stories 
Tidy up file view stories

GitOrigin-RevId: 3f7bb45c32e233c4f45e9222ab8e0132043255ef
 2021-06-26 02:05:57 +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
Shane Kilkelly
46c00c13ba Merge pull request #4241 from overleaf/ae-style-guide 
Move the style guide into Storybook

GitOrigin-RevId: 34de190e7b16213344e64e4e8b066b976d81e4f4
 2021-06-25 02:06:03 +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
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
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
Alf Eaton
ad3c66b36e Add IdeProvider (#4161) 
GitOrigin-RevId: cab09354cf4b325a1ea3814a8c4c49fac7c831be
 2021-06-17 02:09:29 +00:00
Alf Eaton
fe6970f30f Improve bibliography import error handling (#4145) 
GitOrigin-RevId: 3b379580635e1f6f2f518d416b8c72e0dadc0df6
 2021-06-11 02:06:56 +00:00
Alf Eaton
764234e42b Merge pull request #4158 from overleaf/ae-rename-file-view 
Rename `binary-file` components to `file-view`

GitOrigin-RevId: b960d4e6f154ee1a5847782a1fcb1e4e61159603
 2021-06-11 02:06:38 +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
Alf Eaton
d5f7b1169f Add info link to symbol palette (#4086) 
GitOrigin-RevId: 4950dd1a7b15e965ffc4d2651017f491ce9ecf99
 2021-05-26 02:05:23 +00:00
Jakob Ackermann
8f0a0439cd Merge pull request #4069 from overleaf/as-file-views-use-context 
Pull project id from `EditorContext` instead of `window` in file views

GitOrigin-RevId: 78c2686d8bcd1e95414631ca77143fd9ae3edbc6
 2021-05-22 02:05:56 +00:00
Miguel Serrano
73c47fa0e0 Layout divider for Symbol Palette (#4036) 
Co-authored-by: Alf Eaton <alf.eaton@overleaf.com>
GitOrigin-RevId: e22635978c16646060c80ceb8376a560bfbf6527
 2021-05-18 02:08:12 +00:00
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
0360d01aeb Add Symbol Palette component, data and stories (#4027) 
GitOrigin-RevId: b00128bc087e2ebe9911fa19b7e62fd4bb492226
 2021-05-14 02:09:50 +00:00
Miguel Serrano
bb88af80cf Merge pull request #3947 from overleaf/msm-reenable-eslint-rules 
Reenable `eslint` rules

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

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

GitOrigin-RevId: 4eb1c5edf2f94dc6ad51358e109e29c9f62d2058
 2021-05-12 02:10:04 +00:00
Alf Eaton
e832c9ed70 Add StartFreeTrialButton 
GitOrigin-RevId: dd9ab4bb12e8b9071b2a869e2d452945b49d9cd7
 2021-05-08 02:09:50 +00:00
Alf Eaton
1173c5c2da Merge pull request #3983 from overleaf/ae-github-sync-modal 
Move GitHub Sync Modal stories under Modals

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

GitOrigin-RevId: 59ea6372517308a31e5b104b25d09a59627feaf2
 2021-05-05 02:09:53 +00:00
Shane Kilkelly
3c9cd69bfa Merge pull request #3956 from overleaf/ae-icon-story 
Add a story for the Icon component

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

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

GitOrigin-RevId: c0cabf4eb03785c6232abe417e34bd7916b97046
 2021-04-29 02:09:17 +00:00
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
Chrystal Maria Griffiths
4e9d7c36ff Merge pull request #3952 from overleaf/revert-cmg-binary-file 
Revert "Merge pull request #3526 from overleaf/cmg-binary-file"

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

GitOrigin-RevId: e229ad8ec3781607b5ca28387927b84d4af95060
 2021-04-24 02:10:07 +00:00
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
Hugh O'Brien
0aba0300d1 GitHub sync modal react port (#3711) 
* GH-sync React - initial left menu github sync react skeleton

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

* GH-sync react - message for link sharing users

* GH-sync react: link gh account from modal

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

* GH-sync react: display commits and merge buttons

* GH-sync react: merge logic

* GH-sync React: merge endpoint error handling

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

* GH-sync React: handle ignoring external updates

* GH-sync React: main switcher modal tests

* GH-sync React: tests for export and merge

* GH-sync react: error handling and error boundary

* GH-sync React: put behind alpha flag

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

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

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

GitOrigin-RevId: 37261966683112b399ef180ec6bc4036bc689fd9
 2021-04-07 02:05:06 +00:00
Miguel Serrano
f9962fefe8 React git-bridge modal (#3869) 
GitOrigin-RevId: 5b2609ed9ad7909a10cb08342053e955447688f5
 2021-04-01 02:06:05 +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
116f167a6f Merge pull request #3813 from overleaf/ae-user-has-feature-follow-up 
Fix React attributes for Add Files modal

GitOrigin-RevId: 8254cdd14accdd8ead710d75a3ad4df75fc05134
 2021-03-26 03:04:52 +00:00
Alf Eaton
989aeca7f2 Organise modal stories into a "Modals" folder (#3814) 
GitOrigin-RevId: bced6f0591d14c9d56ce5875acd5598216285487
 2021-03-26 03:04:49 +00:00
Alf Eaton
ee79728bf9 Only check a user's features for importing from reference provider (#3797) 
GitOrigin-RevId: cc5a36be20c673f8941a2694eaeba80eebb4db6a
 2021-03-25 03:04:57 +00:00
Alf Eaton
ba4300d9e1 Merge pull request #3518 from overleaf/ae-react-create-file-modal 
Migrate "Add Files" modal to React

GitOrigin-RevId: fc5235108ee65294e3176da9c327791c34aa5b3c
 2021-03-19 03:04:46 +00:00
Alf Eaton
d9576189a3 Merge pull request #3636 from overleaf/ae-share-modal-split 
Migrate Share modal to React

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

* Added PropTypes check to `useChatContext()`

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

* Hide PDF button when pdfLayout != 'flat'

GitOrigin-RevId: 3f4a1b072259df7148d3417cd22116702bdd79ac
 2021-03-11 03:05:33 +00:00
Alf Eaton
59f6f34083 Merge pull request #3710 from overleaf/ae-refactor-hotkeys-modal 
Refactor "HotKeys" modal

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

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

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

GitOrigin-RevId: 7a36d9649486c203ba9334a18e380a595014e646
 2021-03-05 03:04:53 +00:00
Eric Mc Sween
2138bd2a80 Merge pull request #3680 from overleaf/as-em-tm-remove-uiconfig 
Remove unused uiConfig global variable from frontend and tests

GitOrigin-RevId: 390abdc097cd9904f7a1c1849e58baf70bea5c72
 2021-02-23 03:04:39 +00:00
Jakob Ackermann
da641ba039 Merge pull request #3649 from overleaf/as-chat-test-cleanup 
Chat test cleanup

GitOrigin-RevId: 4323d93f64f0e51efd2931acbc77fc9b43a216cd
 2021-02-18 03:04:51 +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
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
Eric Mc Sween
94e65f16a8 Merge pull request #3588 from overleaf/msm-fix-outline-chat-stories 
Fixed Chat and Outline stories

GitOrigin-RevId: ff0b0d8c733e7f3fc9a355ecc81c628d15497059
 2021-01-22 03:05:05 +00:00
Eric Mc Sween
78b7c8de9b Merge pull request #3558 from overleaf/pr-logs-ui-beta-icon 
Logs UI beta icons

GitOrigin-RevId: 2d22dea3625ed24b87a1ae9e48cbbe77ad8a1827
 2021-01-22 03:04:55 +00:00
Eric Mc Sween
3afaa258f1 Merge pull request #3481 from overleaf/msm-add-chat-story 
Add Chat to storybook

GitOrigin-RevId: be8a9c7a22982eb8a83830cfcdf22b012afb79fa
 2021-01-15 03:05:39 +00:00
Eric Mc Sween
dc48ba1d61 Merge pull request #3550 from overleaf/ta-disconected-overlay 
Add Disconnected Overlay Over File Tree

GitOrigin-RevId: bdcd4f58effe841eb223abbb852e0b0f574efefd
 2021-01-15 03:05:29 +00:00
Alf Eaton
669c72ed2c Merge pull request #3445 from overleaf/ae-wordcount-modal 
Migrate word count modal to React

GitOrigin-RevId: cfb5beceec7ba3a992a808b9e7417170d580b392
 2021-01-07 03:04:59 +00:00
Alf Eaton
0135236df8 Merge pull request #3446 from overleaf/ae-clone-project-modal 
Migrate left menu Clone Project modal to React

GitOrigin-RevId: ad113e2b40de4007def513d40551d55bb0c913db
 2021-01-07 03:04:54 +00:00
Alasdair Smith
2c556366e2 Merge pull request #3464 from overleaf/as-import-from-settings-macro 
Load modules in React using importOverleafModules Babel macro

GitOrigin-RevId: 5553ede59d75306a7085424b5e0a20dabe0792f5
 2020-12-17 03:07:42 +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
Alf Eaton
771a39f267 Merge pull request #3441 from overleaf/3803-hotkeys-modal 
Migrate hotkeys modal to React

GitOrigin-RevId: 78399d3d62771cd296bdc2f4f8b1083263d31551
 2020-12-11 03:04:42 +00:00
Hugh O'Brien
3fe462f06f Merge pull request #3439 from overleaf/fix-file-tree-stories 
Add missing onInit prop to file-tree stories

GitOrigin-RevId: 161977a1051eb437999c1af7aa73d3b4a60d4a56
 2020-12-10 03:04:48 +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
Paulo Jorge Reis
081f4212a8 Add error and validation issues (#3400) 
* Remove references to the duplicatePaths validation

* Make the log entries more generic, to support validation and CLSI errors

* Add validation issues to the new logs UI

* Add CLSI errors to the new logs UI

* Update tests; accessibility fixes

* Disable PDF viewing when compile fails; address PR feedback.

* Add accessible description for error and validation failed compiles

GitOrigin-RevId: 8b0597af8857712d47c20e4915470e8e745bb315
 2020-11-27 03:04:38 +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
Alasdair Smith
49d5bb0591 Merge pull request #3223 from overleaf/ta-dropdown-stories 
Dropdowns: A File Tree Storybook
GitOrigin-RevId: 0a5e911032accac1f5632de26b7ec69524ea04f9
 2020-09-27 02:05:43 +00:00
Alasdair Smith
f5449dc4b0 Merge pull request #3191 from overleaf/as-storybook 
Set up Storybook and add Outline stories

GitOrigin-RevId: 2635ad142ef152a5ee8023c10cf31f344fbd7e8d
 2020-09-27 02:05:38 +00:00