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

14517 commits

Author SHA1 Message Date
Domagoj Kriskovic
c3c97d9fb9 [web] return file type in revertFile (#18995) 
* [web] return file type in revertFile

* fix revertFile unit test

* fix formatting

GitOrigin-RevId: e4ac0500ff6c72c7f7fa23a5f61b09ed31a28da0
 2024-06-28 08:04:45 +00:00
Antoine Clausse
ebec84540f Add waitForDb in scripts/resync_subscriptions.js (#19154) 
GitOrigin-RevId: 608bce2654d2b6dbeb662ad0da8bb5c5ce3d68f3
 2024-06-28 08:04:29 +00:00
Antoine Clausse
01188589f8 Add some JSDoc types to @overleaf/logger (#19153) 
* Add some JSDoc types to `@overleaf/logger`

* Update `logger.error` calls

* Fixup `logger.err` JSDoc

* Update `logger.err` calls

* Fix `args` type

* Remove "Error message" description

* Replace `arguments` by actual arguments of the method

* Fix: "ESLint: Unnecessary '.apply()'.(no-useless-call)"

* Add JSDoc params to `debug` `info` `warn`

* Remove extra `args` param in JSDoc so developers aren't invited to use it

Not sure if this is the best thing to do because it creates a warning in the IDE: "Parameter args is not described in JSDoc"

* Add comment about serialization of `err` `req` `res`

* Allow strings as first param in `debug` `info` `warn`

* Fix syntax for optional parameters in JSDoc

* Add 2 signatures, to avoid "string, string" params

* Fix `@signature` names copy-pastes

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>

* Revert the double `@param attributes`. It doesn't work

---------

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
GitOrigin-RevId: 086dee8bbf30d577c5e1f844a9df5e518c46aca7
 2024-06-28 08:04:25 +00:00
Antoine Clausse
1dbbe5af9d [web] Promisify TemplatesController (#18849) 
* Promisify TemplatesController

* Update TemplatesControllerTests

* Fix `templateVersionId` in `getV1Template` (!!)

GitOrigin-RevId: bdaa59ed3cff81d919a8b3d19d5be555a2790f55
 2024-06-28 08:04:17 +00:00
Jessica Lawshe
0ed123aebd Merge pull request #19085 from overleaf/jel-light-touch-table-updates 
[web] Update background color CSS for light touch redesign

GitOrigin-RevId: 574f813a9964a272742507817732c1b45bbdc2fe
 2024-06-27 08:04:56 +00:00
Jessica Lawshe
07d1f26731 Merge pull request #19084 from overleaf/jel-light-touch-rename-css 
[web] Rename CSS variables for light touch redesign

GitOrigin-RevId: c84eb75a45af8270895795ceffef944696037881
 2024-06-27 08:04:52 +00:00
Jessica Lawshe
90d7925a02 Merge pull request #18961 from overleaf/jel-new-plans-spacing 
[web] Update main container spacing for new plans page

GitOrigin-RevId: b6c8fa852ba2025c78f6daa22146854fc6a13789
 2024-06-27 08:04:48 +00:00
Jessica Lawshe
fbc9a557c7 Merge pull request #18959 from overleaf/jel-faq-tabs 
[web] New tab and accordion more reusable

GitOrigin-RevId: ed8340bc4b6312c4270edf1edf53c74a067aaccf
 2024-06-27 08:04:44 +00:00
Jimmy Domagala-Tang
c04fea0fd3 Merge pull request #19162 from overleaf/jpa-flaky-admin-test 
[web] refresh system message cache after creating/deleting message

GitOrigin-RevId: f7155e94a8bf08b527e7ae69d9d6a41e54c01282
 2024-06-27 08:04:39 +00:00
Jimmy Domagala-Tang
2e1dcee22b Merge pull request #19128 from overleaf/jdt-latex-2024-release 
updating to remove alpha only and release 2024 latex

GitOrigin-RevId: 4333b5d4331213206d273a6cbb0cb790ad2778f6
 2024-06-27 08:04:35 +00:00
Mathias Jakobsen
abaf07a8bb Merge pull request #19158 from overleaf/mj-commands-autocomplete-optional-args 
[web] Avoid double counting optional arguments for autocomplete

GitOrigin-RevId: 7abdc73657791b945bd5a7a9e29f5cd127c7882b
 2024-06-27 08:04:31 +00:00
David
1844603a2d Merge pull request #19124 from overleaf/dp-light-hover-bug 
Refactor pdf toolbar button styles to fix bug with hovering over active logs button

GitOrigin-RevId: f8034c9daade32cda7c4f08ccd292c86ef6b8454
 2024-06-27 08:04:27 +00:00
David
74b1ebac02 Merge pull request #19064 from overleaf/dp-create-project-dropdown-ui 
Add spacing above create-new-project-dropdown and make thinner

GitOrigin-RevId: a1f3a27512e04ec6e4383493d5ceaf39e5ad9eee
 2024-06-27 08:04:22 +00:00
Thomas
94be372b24 Add new interstitial 'Join project' consent page for existing link sharing editors when opening a project (#19066) 
* Add helpers for checking and removing user readwrite token membership

* Add sharing-updates page and handlers

* Redirect read write token members to sharing-updates on project load

GitOrigin-RevId: d552a2cd74a9843c6103923b03f137131a48877a
 2024-06-26 11:12:42 +00:00
Thomas
260fdf1307 Add read write token join interstitial variation for link sharing changes (#19060) 
* Add read write join interstitial variation for link sharing changes

GitOrigin-RevId: 41661f43f4ab0f18f6ada5bec0b6af2407f65f07
 2024-06-26 11:12:37 +00:00
Thomas
70bf7b2aab Merge pull request #19109 from overleaf/tm-project-joined-add-project-id 
Add projectId to project-joined event

GitOrigin-RevId: 222e0acc8764592344e384d1a6a5a2327d4161f5
 2024-06-26 11:12:33 +00:00
Mathias Jakobsen
d21da7d084 Merge pull request #19157 from overleaf/mj-separate-unknowncommands 
[lezer] Separate unknown commands for definition fragments

GitOrigin-RevId: 21ce8d03e68f4af13c3937b4b5fd6f7ed0e50995
 2024-06-26 11:11:53 +00:00
Mathias Jakobsen
3b5af94404 Merge pull request #19119 from overleaf/mj-lezer-definition-unknown-commands 
[lezer] Parse unknown commands in definitions

GitOrigin-RevId: 586bf9e0de8e1d9e7903dd2fad8638cb2624ed9e
 2024-06-26 11:11:48 +00:00
Alf Eaton
26d7524c93 Updates to the AI error assistant (#19107) 
GitOrigin-RevId: 7ffc1e32d331fa8bab1ea25919e706bf8b59800f
 2024-06-26 11:11:44 +00:00
Alf Eaton
dfaed70297 Replace symbol palette tabs with a custom tablist (#19034) 
GitOrigin-RevId: 69d8a8dd8980e287b484b915b1f92e57af5324cb
 2024-06-26 11:11:35 +00:00
Antoine Clausse
de959fb7b9 Fix institution metrics sendAll cron (#19127) 
* Don't send status 200 in the beginning: we may throw later

This was causing `Error [ERR_HTTP_HEADERS_SENT]: Cannot set headers after they are sent to the client`
https://cloudlogging.app.goo.gl/Bchegw2iCYLxhPNk8

* Continue when failing to send one email, but log the error

* Revert "Don't send status 200...", log error instead

This reverts commit 3e13559704f822e330a18a68567f46491649f222.

* Fix `logger.error` params

* Fixup: good syntax for `logger.error`

* Remove useless `OError` import

* Update services/web/modules/metrics/app/src/MetricsEmailController.js

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>

* Update services/web/modules/metrics/app/src/MetricsEmailController.js

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>

* Update services/web/modules/metrics/app/src/MetricsEmailController.js

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>

* Update services/web/scripts/recurly/collect_paypal_past_due_invoice.js

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>

---------

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
GitOrigin-RevId: c68bc677326729fc6c39b7c2f027e35ebb776bd2
 2024-06-26 08:05:11 +00:00
CloudBuild
375ff968c5 auto update translation 
GitOrigin-RevId: c597b7ebda7a250220e7227211d7f3cd64816b90
 2024-06-26 08:05:02 +00:00
Jimmy Domagala-Tang
50b19c7793 Merge pull request #18850 from overleaf/ac-promisify-resync-subscriptions 
Promisify resync_subscriptions

GitOrigin-RevId: c23a99683a22104815525b179d4e46d3ad568f94
 2024-06-26 08:04:57 +00:00
Jimmy Domagala-Tang
86e2abc90b Merge pull request #19106 from overleaf/jdt-center-labels 
vertically align text within spans

GitOrigin-RevId: 820313b179751a1a7c538712cf9dfd6b9ce0ff3d
 2024-06-26 08:04:52 +00:00
Jimmy Domagala-Tang
b0344ec550 Merge pull request #19132 from overleaf/jdt-ai-policy-migration 
feat: add migration for adding new policy to all existing groupPolicies
GitOrigin-RevId: ea3188b6059c2e96afd0058a191d18b26d68adbd
 2024-06-26 08:04:48 +00:00
roo hutton
e0c879bd9a Merge pull request #19120 from overleaf/rh-link-share-styles 
[web] Fix share modal styling regressions

GitOrigin-RevId: efeffa3d6451ed47137106e0ad296c518a5c0608
 2024-06-26 08:04:43 +00:00
roo hutton
bf90932f40 Merge pull request #18936 from overleaf/rh-viewer-no-comment 
[web] Remove access to commenting/chat for collaborators with Viewer permission

GitOrigin-RevId: 03957cb8c04866318a4b94bdb72843e7d7a5a003
 2024-06-26 08:04:38 +00:00
Tim Down
956aad7e43 Merge pull request #18764 from overleaf/td-bs5-dashboard-feature-flag 
Create new feature flag for BS5 project dashboard page

GitOrigin-RevId: a523bd7df94c411805ac2f5234135bc7a56d25bb
 2024-06-25 11:12:35 +00:00
Tim Down
8897e439ae Merge pull request #18928 from overleaf/td-bs5-nav-admin-missing-href 
Bootstrap 5: add missing href to nav admin link

GitOrigin-RevId: 5339fa2ef465a6319d87cba6201e682dea1a98a6
 2024-06-25 11:12:31 +00:00
David
62c432b997 Merge pull request #19101 from overleaf/dp-presentation-additional-keys 
Add PageUp/PageDown/Backspace options for presentation page navigation

GitOrigin-RevId: 59b8c3b22ff205c8fe1009c120358c913db3cbe5
 2024-06-25 11:12:27 +00:00
David
b2e3002992 Merge pull request #19103 from overleaf/dp-presentation-events 
Add event for entering presentation mode

GitOrigin-RevId: 6d9006005264f69d1a37baa363b338caf0d29c6c
 2024-06-25 11:12:23 +00:00
Mathias Jakobsen
ddfdafd54c Merge pull request #19050 from overleaf/mj-lezer-parse-comments-in-unknown-commands 
[lezer] Introduce hasMoreArguments token for argument parsing

GitOrigin-RevId: a5898a2be01c19a39de15c784f184fe61140799a
 2024-06-25 11:12:18 +00:00
Mathias Jakobsen
46a160f127 Merge pull request #19072 from overleaf/mj-known-commands-reuse 
[web] Parse known commands in math mode

GitOrigin-RevId: e7937fc46320f13c716d1612eca36aa67c8fb967
 2024-06-25 11:12:14 +00:00
Mathias Jakobsen
283c972842 Merge pull request #19032 from overleaf/mj-lezer-mathdelim 
[lezer] Remove custom tokeniser for MathDelimiter

GitOrigin-RevId: acbbbe439d51a8a9d5b30b91c55c8f8ef8c3b9fb
 2024-06-25 11:12:10 +00:00
Mathias Jakobsen
884eebd82d Merge pull request #19102 from overleaf/mj-more-cite-ref 
[lezer] Add more cite and ref command variants

GitOrigin-RevId: e402f92d9948eba857dbe0851f039f4d7313df81
 2024-06-25 11:12:06 +00:00
Mathias Jakobsen
e48e4293a6 Merge pull request #19090 from overleaf/mj-web-metadata 
[web] Ignore commented content when parsing metadata

GitOrigin-RevId: 78f9b0d6549e60fca4ba8929beb677341d885655
 2024-06-25 11:12:02 +00:00
roo hutton
64d9792fe3 Merge pull request #18861 from overleaf/rh-editor-limit-exceeded 
[web]: Handle exceeded editor limit in share modal

GitOrigin-RevId: 23a15805ca98327ae4a7fc731bbca3982c90bad5
 2024-06-25 08:04:46 +00:00
Jimmy Domagala-Tang
04432478e1 Merge pull request #19053 from overleaf/ab-split-tests-first-time-assignments 
[web] Return isFirstTimeAssignment flag with split test assignments

GitOrigin-RevId: 70954470fbd9430749d83d8d1e08a3969d4a09e6
 2024-06-25 08:04:37 +00:00
Alf Eaton
6db455d63e Show modal for error renaming project (#19040) 
GitOrigin-RevId: 229e64775897d646ed8c13f12d3bcc9400f2a3b9
 2024-06-24 12:05:59 +00:00
Alf Eaton
bee698c01d Updates to the AI error assistant (#19065) 
* Only show the AI error assistant to users with write permission on the project
* Fix line number in searchDocLines
* Abort the request after 60 seconds
* Move comment
* Jump to file + line when suggestion line number is clicked
* Set tool_choice: 'required'
* Fix handling of suggestLineChange
* Tidy up getDocLines
* Avoid showing Suggest Fix button in gutter marker for typesetting warnings
* Log request errors
* Fix prefixed function name
* Update tool description
* Tweak the prompt in an attempt to improve the line number
* Reject if the total message content is too large
* Change the structure of the suggested change
* Reduce line highlight
* Fix change highlighting on deletion

GitOrigin-RevId: afde096e547050b8518195ef51b68983bc3b0be3
 2024-06-24 12:05:51 +00:00
Miguel Serrano
1697087425 Merge pull request #18970 from overleaf/msm-clean-features-templates 
[web] Cleanup `features.templates`

GitOrigin-RevId: 7c9f7bc827700e4255a5ba8a46de70318afdaae4
 2024-06-24 12:05:43 +00:00
David
8d2b006d60 Merge pull request #19070 from overleaf/dp-remove-useWaitForGrammarlyCheck 
Remove grammarly check in writefull  promo

GitOrigin-RevId: 30994c1960232afe3bede1fd6649606e191dd3d4
 2024-06-24 12:05:35 +00:00
Davinder Singh
c70e676cbc Merge pull request #19035 from overleaf/plans-list-mobile 
[web] Begin configured features list for new plans page mobile view

GitOrigin-RevId: ba09f1a2e24f3a2eec4b20e55a0afada9e359264
 2024-06-24 12:05:30 +00:00
Mathias Jakobsen
23a7e19e8e Merge pull request #18991 from overleaf/mj-table-generator-promotion-teardown 
[web] Tear down table generator promotion

GitOrigin-RevId: 361215bdd792042ae68762fa20ae60286db5bab3
 2024-06-24 12:05:18 +00:00
Mathias Jakobsen
bc9bb05c8f Merge pull request #19033 from overleaf/mj-lezer-unused-rule 
[lezer] Remove unused rule

GitOrigin-RevId: 53402a3004d0ca781b29f16eaf4e7eae086450d3
 2024-06-24 12:05:14 +00:00
Mathias Jakobsen
40bddf72dc Merge pull request #18937 from overleaf/mj-lezer-upgrade 
[web] Update lezer packages

GitOrigin-RevId: 349b18e7f03c12aae736c6a8c4d3234c828b14ca
 2024-06-24 12:05:09 +00:00
CloudBuild
a0d2d30b48 auto update translation 
GitOrigin-RevId: 3c003f3e221c7186d5a944791caae8027d65cd05
 2024-06-24 12:05:00 +00:00
Jimmy Domagala-Tang
790f90e97d Merge pull request #19036 from overleaf/jdt-labs-alpha-only 
feat: only allow alpha users on labs page currently
GitOrigin-RevId: 5136d77789fa27a0bd9fe6f17c8937998bc74259
 2024-06-24 12:04:51 +00:00
Mathias Jakobsen
94694a6385 Merge pull request #19057 from overleaf/mj-benchmark-seed-random 
[web] Add quick and dirty PRNG for seeding benchmark runs

GitOrigin-RevId: 079f9b565f17b44d7062f6b93c26f694e486c6b9
 2024-06-24 12:04:46 +00:00
David
a8cb423078 Merge pull request #19030 from overleaf/dp-presentation-mode-flag 
Add separate feature flag for presentation mode

GitOrigin-RevId: a996fa313c101dd822ad83109ba77fa95f99f644
 2024-06-24 12:04:34 +00:00
Antoine Clausse
3d5418611b Add an ESLint rule enforcing kebab-case in URL paths (#18913) 
* Add a tsconfig.json to the eslint-plugin folder so it can be linted too

* Create eslint rule `prefer-kebab-url`

* Add prefer-kebab-url to service/web

* Ignore lowercased strings

Prevents from trying to change `v0` to `v-0`

* Ignore parts between brackets or parenthesis

* Record in URL paths by case

lower: 241
kebab: 60
snake: 43
camel: 22
other: 5

* Revert "Record in URL paths by case"

This reverts commit 262f483aafb0daa1a01e9025488cdc33f31ef67c.

* Showcase how the autofix would change the code

* Revert "Showcase how the autofix would change the code"

This reverts commit f045292bf01623de2df5b89fc0d68737a39913dc.

* Add ignored words so we don't have to update old code

* Change the rule so it suggests instead of fixing

This prevents eslint autofix from creating bugs

* Move list of ignored words to its own file

Per https://github.com/overleaf/internal/pull/18913#discussion_r1644204034

* Add comment explaining the ignore list

GitOrigin-RevId: d13918b0bcba9d77120f1b61b354a79dc8fb4b4e
 2024-06-24 12:04:26 +00:00
Antoine Clausse
2c7df10b9a [web] Refactor ProjectController.loadEditor p-props promises (#18823) 
* Move unawaited promises out of `p-props`: `User.updateOne`

* Move unawaited promises out of `p-props`: `sessionMaintenance`

* Move unawaited promises out of `p-props`: `reactivateProjectIfRequired`

* Move unawaited promises out of `p-props`: `markAsOpened`

* Move unawaited promises out of `p-props`: `flushProjectToTpdsIfNeeded`

This was actually awaited, but is it necessary?

* Use `getUserValues`: `user`

* Use `getUserValues`: `learnedWords`

* Use `getUserValues`: `projectTags`

* Use `getUserValues`: `userHasInstitutionLicence`

* Use `getUserValues`: `subscription`

* Use `getUserValues`: `isTokenMember`

* Use `getUserValues`: `isInvitedMember`

* Update `splitTestAssignments` syntax

* Remove `mapValues` in `pProps`

* Await unused promises again: `flushProjectToTpdsIfNeeded` and `reactivateProjectIfRequired`

* Remove error page file committed by mistake 🤦

GitOrigin-RevId: 6529445c364a6af660bc8ab6dfc836a4ddf7a040
 2024-06-24 12:04:18 +00:00
Jimmy Domagala-Tang
271700893a Merge pull request #18784 from overleaf/bg-allow-combined-group-policies 
allow combined group policies

GitOrigin-RevId: b23fb0454f794e9094e8e15e732b4322a48ac1ee
 2024-06-24 12:04:13 +00:00
Jimmy Domagala-Tang
e5aa917f54 Merge pull request #18682 from overleaf/jdt-ai-labs 
Re-Release Labs Page for AI Error-Correction

GitOrigin-RevId: 2eef85dd3b5f86bedcf3339559a5fbbae2d4da87
 2024-06-24 12:04:08 +00:00
Jakob Ackermann
ac7916fb29 Merge pull request #19023 from overleaf/jpa-issue-19016 
[web] lock down legacy endpoint for creating projects from zip

GitOrigin-RevId: 0c6b29d34c601d316b184d50d93e8e17f59bfcfb
 2024-06-24 12:04:00 +00:00
Mathias Jakobsen
922822d487 Merge pull request #18997 from overleaf/mj-fix-uncategorized-title 
[web] Correct title when viewing uncategorized projects

GitOrigin-RevId: 6f284c437563f10125974eac7f6da6c92526e436
 2024-06-24 12:03:51 +00:00
Mathias Jakobsen
69205629bf Merge pull request #19024 from overleaf/mj-mobile-rename-modal 
[web] Update project name in rename modal when project name changes

GitOrigin-RevId: 080d97b4d279fe54cc9530cea3efb1212da3041c
 2024-06-24 12:03:47 +00:00
M Fahru
381795c5a2 Create an organizations icon section on the new plans page 
GitOrigin-RevId: 9c58fa1dadb66a8ab91102484bc6b937e568c40b
 2024-06-24 12:03:42 +00:00
M Fahru
b197aee92e Merge pull request #18879 from overleaf/ds-plans-page-new-design-mobile-plans-2 
Website redesign - Plans page new-design mobile screen plans card (2)

GitOrigin-RevId: d74f4d0769ae7a248226d2369a5419e26946e26d
 2024-06-24 12:03:37 +00:00
Jessica Lawshe
900f11dae2 Merge pull request #18949 from overleaf/jel-faq-spacing 
[web] Add spacing to left of FAQ accordion icon

GitOrigin-RevId: 71004270bbc9725b63c92dfb685b759057049265
 2024-06-24 12:03:33 +00:00
Jessica Lawshe
2547294353 Merge pull request #18909 from overleaf/mf-new-plans-page-table-highlighted-column 
[web] Implement highlighted column based on hardcoded column id on new plans page table

GitOrigin-RevId: 241913c81670ea158f436c29060bd9e1836ed4fc
 2024-06-24 12:03:24 +00:00
Mathias Jakobsen
46d687855e Merge pull request #18981 from overleaf/mj-mobile-dropdown 
[web] Add rename button to project list mobile view

GitOrigin-RevId: 4ca3c68dcaf4e0d5e97f501084b9f850f9a4e867
 2024-06-24 12:03:20 +00:00
ilkin-overleaf
7b47acc486 Merge pull request #18763 from overleaf/ii-bs5-projects-notifications 
[web] BS5 notifications in projects and welcome pages

GitOrigin-RevId: 25780bb64660ef41c41c007f94f70df273cac716
 2024-06-24 12:03:15 +00:00
ilkin-overleaf
34311ce0dc Merge pull request #18789 from overleaf/ii-invite-token-lookup-by-hmac-token 
[web] Lookup project invitations by HMAC token

GitOrigin-RevId: b631445e18f83ddb5e7708388a57a0fac0f73bd2
 2024-06-24 12:03:10 +00:00
David
2a6b84596e Merge pull request #19006 from overleaf/dp-pdf-click 
Add click listener to pdf presentation mode to go to next page

GitOrigin-RevId: add7ddb18ef63774bbb78f6337088bd59b087db1
 2024-06-24 12:03:06 +00:00
Jakob Ackermann
bd9f3cb07a Merge pull request #19017 from overleaf/jpa-server-pro-footer 
[web] fix spacing for thin-footer as used in Server Pro/CE

GitOrigin-RevId: 8a20d93f10c5bce156647f67de991ff41a8a2017
 2024-06-24 12:03:01 +00:00
Alf Eaton
b66d45784a Merge pull request #19007 from overleaf/ai-error-assistant-updates 
Updates to the AI error assistant

GitOrigin-RevId: 6ca708b97a7eda81618abf3006b4bcc8d46f3dd4
 2024-06-24 12:02:56 +00:00
Alf Eaton
3453f4cb94 Remove trailing slash from log hint (#18998) 
GitOrigin-RevId: d95ffde59c5a7c58aed14a542b8dad3085405c2d
 2024-06-24 12:02:52 +00:00
CloudBuild
c90d01afa2 auto update translation 
GitOrigin-RevId: 42dc0835bfeea53ebb45bb58f8ccd6392861ca9c
 2024-06-20 08:05:36 +00:00
ilkin-overleaf
ea6f627490 Merge pull request #18912 from overleaf/ii-remove-deleted-users-from-token-access-refs-script-fix 
[web] Improve the removal of deleted users from token access refs

GitOrigin-RevId: 7b79e327388e37603a6c4f227f1d4bba743d4730
 2024-06-20 08:05:22 +00:00
Eric Mc Sween
8d35177b52 Merge pull request #18985 from overleaf/em-migrate-bulk 
Bulk history ranges migration

GitOrigin-RevId: 0d1846b412cfcddead63a7bc15bd06a82fbb47f3
 2024-06-20 08:05:05 +00:00
David
8c3c9fe53f Merge pull request #18979 from overleaf/dp-pdf-split-test-badge 
Add SplitTestBadge to pdf controls toolbar

GitOrigin-RevId: ebbd2f8983aa2168fe03beb8ce69d7da91871a74
 2024-06-20 08:05:01 +00:00
David
a4f398b852 Merge pull request #18975 from overleaf/dp-rename-present-presentation-mode 
Rename present button to "Presentation mode"

GitOrigin-RevId: 15bfe5b2f360929b2cc507f0f15342ffdbefe73b
 2024-06-20 08:04:57 +00:00
Brian Gough
be23b7e73b Merge pull request #18744 from overleaf/jpa-ce-no-events 
[web] avoid sending events in Server Pro/CE

GitOrigin-RevId: 04d2fa7939c448bc00757c5015e22a46b6b07bb5
 2024-06-20 08:04:41 +00:00
Brian Gough
d43292cfe6 Merge pull request #18146 from overleaf/ab-one-time-assignments 
[web] Handle one-time assignments for split tests

GitOrigin-RevId: 2d7ec2a878055fdc96475db2129aad308abb2fff
 2024-06-20 08:04:34 +00:00
Miguel Serrano
f181dfe74f Merge pull request #18549 from overleaf/msm-system-messages-redirect 
[web] return redirect on admin actions

GitOrigin-RevId: d6273c01d90230c786cc9d0808f866524e57bc19
 2024-06-20 08:04:20 +00:00
Alf Eaton
5e77052b3b Use DOMPurify for AI error assistant output (#18944) 
GitOrigin-RevId: 06c5b7720668d77b5750f90daa568bd38d22e150
 2024-06-20 08:04:16 +00:00
Alf Eaton
231f7778c3 Update AI error assistant (#18968) 
* Update styles to match designs
* Use Notification for errors and update error message
* Add feedback stories and update styles
* Update prompt
* Accept terms after suggest fix started
* Add translations for AI error assistant
* Add tooltips for feedback buttons
* Allow empty file extension
* Handle rate limit response

GitOrigin-RevId: e75c949f3a1b39594e94e300df717de414fdf70c
 2024-06-20 08:04:11 +00:00
CloudBuild
6adade191f auto update translation 
GitOrigin-RevId: 1d8ec2514af0da765314e63720f22b23cdd6ccd1
 2024-06-19 08:05:18 +00:00
M Fahru
34781dce81 Merge pull request #18963 from overleaf/mf-new-plans-page-very-small-screen-fix-tab 
[web] Fix new plans page tabs overflow on mobile view

GitOrigin-RevId: f40efa386b15c921a17c7c046866c7f54aee083e
 2024-06-19 08:05:10 +00:00
M Fahru
5e560e4376 Merge pull request #18908 from overleaf/mf-fix-spacing-page-new-plans-page 
[web] Change new plans page vertical main heading spacing value to 96px

GitOrigin-RevId: c9746446a15bd0dd2e64a76615cd979654c8609e
 2024-06-19 08:05:06 +00:00
Eric Mc Sween
e73fdfba63 Merge pull request #18906 from overleaf/em-migrate-existing-histories-2 
History ranges migration script - second attempt

GitOrigin-RevId: 60a2c04e2a72e76a58e9e179fefc4186a96fde32
 2024-06-19 08:05:02 +00:00
David
c342dc70a5 Merge pull request #18927 from overleaf/dp-remove-grammarly-promo 
Remove Grammarly advert

GitOrigin-RevId: 6652cfafc47f8a42efc9acc1745a50e4ab8cc208
 2024-06-19 08:04:46 +00:00
David
0b4d9aebe4 Merge pull request #18925 from overleaf/dp-pdf-scroll-bars 
Remove scroll bar on pdf presentation mode

GitOrigin-RevId: 3d67586859e15a0e3ca77183c9f39bb4ccb38527
 2024-06-19 08:04:38 +00:00
David
c16c806002 Merge pull request #18697 from overleaf/dp-ai-rate-limit 
Add a rate limiter for the AI Error Assistant

GitOrigin-RevId: d23abc4b3477d13b1bfd4d69db168458ac8c2e51
 2024-06-19 08:04:34 +00:00
David
7722c44414 Merge pull request #18918 from overleaf/dp-swap-search-arrows 
Swap order of next/previous arrows in editor search

GitOrigin-RevId: 2c402e177fcd679ebff8e96812faf09d493e9726
 2024-06-19 08:04:26 +00:00
Jakob Ackermann
aa480a2663 Merge pull request #18898 from overleaf/jpa-no-window 
[web] migrate from window attributes to getMeta

GitOrigin-RevId: 3dcf1ab6b01155e5e4abeb3e78d0fa9053e055bc
 2024-06-19 08:04:21 +00:00
Mathias Jakobsen
9b1c703f6b Merge pull request #18901 from overleaf/mj-math-mode-args 
[lezer] Parse command arguments in math mode

GitOrigin-RevId: 85a35f412de4c7238d735253c2642066ebffb393
 2024-06-19 08:04:16 +00:00
Mathias Jakobsen
d2ae97427d Merge pull request #18782 from overleaf/mj-symbol-palette-inline 
[web] Move symbol palette icon inline

GitOrigin-RevId: 8d05cbf5211009870b8107c3c620af0e701a04dd
 2024-06-19 08:04:12 +00:00
Jakob Ackermann
4087345a2a Merge pull request #18941 from overleaf/jpa-fix-some-ts-ignore 
[web] fix a few ts-ignore statements

GitOrigin-RevId: 447a070a8268cffa6ef298b0fe158232c3f6fe8f
 2024-06-19 08:04:07 +00:00
Antoine Clausse
aa7839876a [web] Promisify MetricsEmailController and InstitutionHubsController (attempt 2) (#18805) 
* Reapply "[web] Promisify MetricsEmailController and InstitutionHubsController …"

This reverts commit ea14df1395f1dc2fa7d41fc7837849f9686425b5.

* Fix changes to node-fetch: `statusCode` -> `status` (!!)

* Update test

* Handle no-content without throwing (!)

Avoid error `Unexpected end of JSON input` when doing `response.json()` on an empty response when status is 204

Related: https://github.com/node-fetch/node-fetch/issues/165

* Also return `204` when no data in departments_data and roles_data

* Revert "Handle no-content without throwing (!)", and return null instead

This reverts commits 3baa779f7a9e64804e54a276faf865ab9252f336 and 51507a3d763d7006c8b01414a7c79bd3f3b6948b.

* Update tests: `assert_nil`

* Fixup: Update tests: assert null

* Use `fetchJSON` in Institution.fetchV1Data

* Proxy errors from server without throwing 500

GitOrigin-RevId: 9c13e293f3fed3abd2accddd1a9060ed02b96ba2
 2024-06-19 08:04:02 +00:00
M Fahru
e549e44ca7 Merge pull request #18889 from overleaf/mf-plans-new-tab-active-green 
[web] Change text and icon color to green when new plans page tab is active

GitOrigin-RevId: 745b15538aa89afdb35a642f6927ecce0f1b40ee
 2024-06-18 08:05:25 +00:00
M Fahru
bdf8927cdf Fix new plans page table header does not occupy full height for all of its children on Chrome 
GitOrigin-RevId: a69c20057ff1563e6f6e93c87e4ac3a0c010885d
 2024-06-18 08:05:21 +00:00
M Fahru
9309df9a13 Merge pull request #18870 from overleaf/mf-new-plans-page-table-individual 
[web] Create new plans page table for individual plans

GitOrigin-RevId: 82bfcf5a5e7886517bab9b67dfb4a712350f8c33
 2024-06-18 08:05:16 +00:00
Jessica Lawshe
c117a64ebb Merge pull request #18902 from overleaf/ar-web-script-for-salesforce-data 
[web] Add script for loading v2 salesforce data

GitOrigin-RevId: 15d3c30be166d011702d1a2d4a1d960cd4b2fa8c
 2024-06-18 08:05:11 +00:00
Jessica Lawshe
a343ec1578 Merge pull request #18932 from overleaf/jel-rename-css-light-touch 
[web] Rename CSS classes for light touch redesign

GitOrigin-RevId: 2e415dcffd04f8783f5b7145827031fdbfc83baf
 2024-06-18 08:05:07 +00:00
Jessica Lawshe
1db5593c5a Merge pull request #18931 from overleaf/jel-new-files-for-light-touch 
[web] New files for plans light touch redesign

GitOrigin-RevId: beb517543c8341bbd8124fab87b532f62c5a0c11
 2024-06-18 08:05:02 +00:00
Jessica Lawshe
a7adfc12da Merge pull request #18907 from overleaf/jel-faq-css 
[web] CSS updates to new plans FAQ

GitOrigin-RevId: b00d8b22f62d9a3774eb673501c0b2074dd15d81
 2024-06-18 08:04:57 +00:00
Jessica Lawshe
092e49d6ec Merge pull request #18905 from overleaf/jel-plans-faq 
[web] Add new plans FAQ to light touch redesign variant

GitOrigin-RevId: a4140a09c94e0374792acb789b4f36ad104841f2
 2024-06-18 08:04:53 +00:00
Jessica Lawshe
6e084f389a Merge pull request #18885 from overleaf/jel-plans-page-quotes 
[web] Handle hiding/showing quote rows on new plans page variants

GitOrigin-RevId: dd88cce9acdc2ca07d5df1afa7278028820e673d
 2024-06-18 08:04:48 +00:00
Domagoj Kriskovic
4aa746a759 [web] show file restored change in history (#18792) 
* add RestoreFileOrigin in overleaf-editor-core

* support source to be an object

* use sourceOrOrigin as param

* rename to originOrSource so the priority is more clear

* get timestamp from version

* fix test

* include version and min_count in getUpdatesFromHistory

* extractOriginOrSource util function

* fix RestoreManagerTests

* [web] show restore file change in history

* make sure two restore operations are not merged

* dont summarize updates for different paths

GitOrigin-RevId: d890484760a7379716e8bd65dd28e353d293492f
 2024-06-18 08:04:43 +00:00
Domagoj Kriskovic
7e8e2b0585 Send origin metadata through docupdater and project-history when restoring files (#18721) 
* add RestoreFileOrigin in overleaf-editor-core

* support source to be an object

* use sourceOrOrigin as param

* rename to originOrSource so the priority is more clear

* get timestamp from version

* fix test

* include version and min_count in getUpdatesFromHistory

* extractOriginOrSource util function

* fix RestoreManagerTests

GitOrigin-RevId: 0ace05a6ade2794c753a9d0bffb4f858ecc6899a
 2024-06-18 08:04:34 +00:00
Alf Eaton
5a5defee69 Merge pull request #18943 from overleaf/ae-jquery-revert 
Revert "Upgrade jQuery to v3 (#18796)"

GitOrigin-RevId: fa7815b7bfe28239c86900b62bdcd3c4dac3a65f
 2024-06-18 08:04:29 +00:00
Alf Eaton
9cb313d687 Merge pull request #18847 from overleaf/ls-remove-crypto-js 
remove npm package crypto-js

GitOrigin-RevId: c6f3bc2275a4757e6fb17e82f98ee5f8ca119e15
 2024-06-18 08:04:19 +00:00
Alf Eaton
46f878c42f Upgrade jQuery to v3 (#18796) 
GitOrigin-RevId: c5d1e280784480911de8ec11af618f5eadc6a846
 2024-06-18 08:04:14 +00:00
Alf Eaton
b9a8a7f7ec Move AI provider usage to the backend (#18562) 
GitOrigin-RevId: 4f66c6576571c4fbb7381d8d0e34f2e468d6f34f
 2024-06-18 08:04:09 +00:00
Jakob Ackermann
e36de5a62d Merge pull request #18856 from overleaf/jpa-server-ce-shutdown 
[server-ce] improve shutdown procedure

GitOrigin-RevId: 5a99868d17f597c366e42625cd39f05146dcb682
 2024-06-18 08:04:04 +00:00
CloudBuild
6980a44f8b auto update translation 
GitOrigin-RevId: bae1485e0792582f6a3bee3a791c193c8c7a5bee
 2024-06-17 08:04:34 +00:00
David
dcb7944b05 Merge pull request #18895 from overleaf/dp-presentation-mode 
Add pdf presentation mode

GitOrigin-RevId: e6ac1ae339e9690a733a110c6f0a33149e869dd6
 2024-06-17 08:04:30 +00:00
Rebeka Dekany
805ec8c2e0 Merge pull request #18808 from overleaf/rd-ejs-upgrade 
Upgrading ejs package version from 3.1.8 to 3.1.10

GitOrigin-RevId: 2e2ad7c3d74a2c6e929a030ddbc8735235346804
 2024-06-17 08:04:26 +00:00
ilkin-overleaf
b34be6bea4 Merge pull request #18653 from overleaf/ii-invite-token-create-hmac 
[web] Add HMAC tokens for project invitations

GitOrigin-RevId: 02fa01e24790c9a87f57ff9346f5346658d4dd46
 2024-06-17 08:04:17 +00:00
ilkin-overleaf
bb2a3b091d Merge pull request #18911 from overleaf/ii-new-project-modal-fix 
[web] Allow creating new project by submitting the form with keyboard

GitOrigin-RevId: e04e70a0713299d6d8459755359d16ea7755c67e
 2024-06-17 08:04:13 +00:00
andrew rumble
81b0eb7eb5 Remove obsolete comment 
GitOrigin-RevId: 73da65c200d19ed4b389423e3d9f983c90ea1885
 2024-06-17 08:04:09 +00:00
Alf Eaton
e3fcbb4e79 Unpin async dependency 
GitOrigin-RevId: 2fd885030ebda5cd4e1e8faad0ba5f57926e38a3
 2024-06-17 08:03:51 +00:00
CloudBuild
658be2e7e1 auto update translation 
GitOrigin-RevId: dfd486e1ad6b88c5b9d7b22492563b660c0e0b9a
 2024-06-14 08:05:30 +00:00
Davinder Singh
df2898a911 Merge pull request #18868 from overleaf/ds-plans-page-new-design-mobile-plans-1 
Website redesign - Plans page `new-design` mobile screen plans card (1)

GitOrigin-RevId: 5a3be0f0a5f0a41b934e0c3489883c65450a0076
 2024-06-14 08:05:17 +00:00
M Fahru
a0f90bd971 Merge pull request #18860 from overleaf/mf-new-plans-page-student-desktop-header 
[web] Create a table header for student plans with static data

GitOrigin-RevId: 29e787509521b6249a97f858b715b482214a9ab0
 2024-06-14 08:05:12 +00:00
M Fahru
65592194ec Merge pull request #18862 from overleaf/mf-simplify-non-discounted-text-new-plans-page 
[web] Improve the structure of the price elements on the new plans table by using grid display

GitOrigin-RevId: 08052aec5037432af7ad4d4c554e529582d4acfc
 2024-06-14 08:05:07 +00:00
M Fahru
d80046c757 Delete unused code: planFeatures.js, this config should have been deleted on the first plans page redesign. 
This config is superseded by `plansFeatures.js` that is imported by `plansConfig.js` which is directly used in the pug template.

GitOrigin-RevId: ae0a0e1ff7c8a64022ab378d17943fe4a7ed3b35
 2024-06-14 08:05:03 +00:00
Davinder Singh
05c0cbfd6d Merge pull request #18883 from overleaf/jel-eyebrow-text 
[web] Add mixin for eyebrow headline

GitOrigin-RevId: 992acd11e6c22c35499329bb53917a2b1ac79ac5
 2024-06-14 08:04:55 +00:00
Davinder Singh
9ff03e9245 Merge pull request #18877 from overleaf/jel-sales-ad 
[web] Remove 2 sales ad variants and increase probability of FOMO variant

GitOrigin-RevId: 6045dd4255313ae53f255afa528695583171d55b
 2024-06-14 08:04:46 +00:00
Davinder Singh
6f39e41461 Website Redesign - Plans page main heading section (#18837) 
* adding the main heading of the plans page

* removing some extra CSS and adding a max-width

GitOrigin-RevId: 78e8ab57826171505bb37e89e950dbd44ea1b3d1
 2024-06-14 08:04:42 +00:00
Davinder Singh
8018bc7249 Website redesign - Plans page FQA's tabs Section (new-design) (#18696) 
* running git reset head

* renaming the local-mixins file to _plans_faq

* removed js to rotate the icon

* format:fix

* adding aria-hidden for curly braces

* removing extra tab space

* removing .card.card-body extra class

* introducing accordions-container so that we can use the last-child property to remove the border of the last questions

* creating new website-redesign-ol-tabs class and adding new styles in this class

* adding content for managingYourSubscription and overleafIndividualPlans sections

* adding content in overleaf group plans section

* removing extra section

* running make cleanup_unused_locales

* cleaning after rebase

* deleting extra variable projectLimits

* fixing spaces around curly brackets and some additional changes after rebase

GitOrigin-RevId: 3c2267080825d853e680a0a207cb640226262be2
 2024-06-14 08:04:37 +00:00
ilkin-overleaf
182e9859ec Merge pull request #18690 from overleaf/ii-bs5-projects-welcome 
[web] Welcome page migration

GitOrigin-RevId: 2469786372df24d579d1987cf5bb1113450e9d78
 2024-06-14 08:04:32 +00:00
CloudBuild
196cf2f190 auto update translation 
GitOrigin-RevId: 9c86718bcd0a64cbe44852344a34e80be794e87a
 2024-06-13 08:04:57 +00:00
Jessica Lawshe
87bc0b2aa9 Merge pull request #18857 from overleaf/jel-plans-page-css 
[web] Add quotes to new plans page variants

GitOrigin-RevId: 794692730a7a6846bf4e43021c34798e9a2605da
 2024-06-13 08:04:45 +00:00
Jessica Lawshe
0361299764 Merge pull request #18859 from overleaf/jel-greens 
[web] Update greens across website for new site design

GitOrigin-RevId: ff7ca877f1bcdbd9b5e80a87b48f8d375fd8ea5a
 2024-06-13 08:04:41 +00:00
Jessica Lawshe
cd9dc12059 Merge pull request #18683 from overleaf/jel-new-styles-quote 
[web] New quote style for plans page and CMS pages using `Element | Quote`

GitOrigin-RevId: c4a089727f023d5d28a036c6babbdc773d7fc06a
 2024-06-13 08:04:36 +00:00
Brian Gough
38ac00ba13 Merge pull request #18775 from overleaf/bg-cookie-session-metrics-middleware 
add middleware to record session cookie metrics in web

GitOrigin-RevId: f4404455e219d2071d6f0b39e657e9219b7d1c70
 2024-06-13 08:04:16 +00:00
Brian Gough
97956856ca Merge pull request #18741 from overleaf/bg-cookie-session-test-rotation-support 
test session key rotation in cookie-session module

GitOrigin-RevId: 57486b3df527a9998da3b93981c9d45f510802b8
 2024-06-13 08:04:06 +00:00
M Fahru
c8e8c5213c Merge pull request #18845 from overleaf/mf-line-height-rem 
[web] Create a new standardized font-size and line-height and use that in new plans page

GitOrigin-RevId: 7c9c92e58e55dd03d0459f5e7314a2832bc769ce
 2024-06-12 08:05:54 +00:00
M Fahru
f8e899b026 Merge pull request #18843 from overleaf/mf-new-plans-page-header-padding-fix 
[web] New plans page table spacing issues

GitOrigin-RevId: db36694a76acd1a4fa03c64af90ad6fb90c4705f
 2024-06-12 08:05:49 +00:00
M Fahru
17ca5b22c5 Merge pull request #18840 from overleaf/mf-new-plans-page-max-height-th 
Make new plans table head row (thead > tr) have a dynamic height depending on the maximum value of one of the `th`

GitOrigin-RevId: 1aad2f023a3e83f3037a41b061d63a9351eb1ae8
 2024-06-12 08:05:45 +00:00
M Fahru
17110168e2 Merge pull request #18811 from overleaf/mf-new-plans-page-group-desktop-header 
[web] Create table header for group table with static data

GitOrigin-RevId: 42a5bda96b3bb4434b6c39c5b35512550ea7157a
 2024-06-12 08:05:41 +00:00
M Fahru
2001146a38 Merge pull request #18783 from overleaf/mf-new-plans-page-individual-desktop-header 
[web] Create new plans page table header (individual table with static data)

GitOrigin-RevId: fd831d1546eb561ab150007c72bd3c1ca8afd6db
 2024-06-12 08:05:36 +00:00
Jakob Ackermann
fcdae173fb Merge pull request #18765 from overleaf/jpa-upgrade-pug 
[web] upgrade pug to latest patch version

GitOrigin-RevId: 9ca79904e3ff746423ce6de0e3ef7d58a3558554
 2024-06-12 08:05:23 +00:00
M Fahru
d35e11eaef Merge pull request #18720 from overleaf/jel-begin-light-touch-plans 
[web] Begin light touch redesign of plans page

GitOrigin-RevId: dda5ab1c0817371400f30f2e4d230f5c3a5728f4
 2024-06-12 08:05:19 +00:00
M Fahru
7f6a1e3bf7 Merge pull request #18814 from overleaf/mf-new-plans-table-fading-border-radius-plans-tab 
[web] Implement gradient border on new plans page table

GitOrigin-RevId: 6ce3047fcd54c1aa3776029d82f16b81484fd03b
 2024-06-12 08:05:14 +00:00
Davinder Singh
9e0bf6c626 Merge pull request #18597 from overleaf/ds-delete-sales-contact-form-pug 
Website redesign - Sales contact form clean up (Removing extra files)

GitOrigin-RevId: 0bc443ec705a749b3dfae330ebec8f7a489ede94
 2024-06-12 08:04:40 +00:00
Alf Eaton
826d7822e0 Fix tooltip for last updated date in projects list (#18715) 
GitOrigin-RevId: 55feb364a108397a672cb7c118805988f3335e69
 2024-06-12 08:04:36 +00:00
Alf Eaton
5f60158e99 Add closing bracket to selector (#18723) 
GitOrigin-RevId: ca0966efdd7051d703ab3a6a6eaf6f421f6b7cef
 2024-06-12 08:04:31 +00:00
Alf Eaton
af78b914df Merge pull request #18729 from overleaf/ae-ng-non-bindable 
Remove unused Angular attributes from Pug templates

GitOrigin-RevId: ab3ed4105ea02994924c6dd190dad65fff106c11
 2024-06-12 08:04:27 +00:00
Alf Eaton
1cb5d1ddce Remove Angular CVV tooltip template (#18730) 
GitOrigin-RevId: 239a180b1704d5cbd9bac8d1c27147caf1c0e4a5
 2024-06-12 08:04:22 +00:00
Alf Eaton
7cb0e8c4ea Remove a few remaining references to the ide-page split test (#18735) 
GitOrigin-RevId: 4f1c6332f8bf49ed1c3fcee153590d0acf72b26f
 2024-06-12 08:04:18 +00:00
Alf Eaton
4971afd527 Improve MathJax filtering of font-family attribute (#18819) 
GitOrigin-RevId: 04460c9549c33dbf76efba0e72bed8694072de9d
 2024-06-12 08:04:13 +00:00
Jimmy Domagala-Tang
d3c270369d Merge pull request #18593 from overleaf/jdt-mailchimp-tagging 
allow adding and removing tags from users in mailchimp

GitOrigin-RevId: 15e491d3346877e86d55fb6eccb45813daa41e88
 2024-06-11 08:05:30 +00:00
M Fahru
49b38c7075 Merge pull request #18750 from overleaf/mf-new-plans-page-content-border 
[web] Add border around new plans page main content

GitOrigin-RevId: fb09e8b97b60281d0776f237eec0cf0e3e7c44f4
 2024-06-11 08:05:22 +00:00
M Fahru
bdf6820136 Merge pull request #18421 from overleaf/mf-fix-optional-text-form-marketing 
Fix "(Optional)" text style in contact form: 14px font size and no bold.

GitOrigin-RevId: 6257136ea3ff74731d6cec6b7a8873128ccd823f
 2024-06-11 08:05:17 +00:00
andrew rumble
3311066363 Add new fields to mongoose subscription schema 
GitOrigin-RevId: 6b28d7464482a8d5729709f99893b333c3d7f9c2
 2024-06-11 08:04:55 +00:00
Mathias Jakobsen
8c6c67564f Merge pull request #18778 from overleaf/mj-web-chat-restore-tests 
[chat+web] Add tests for revert functionality

GitOrigin-RevId: f10a5589d8ee1299949ef3decd8325d8fa1f7d41
 2024-06-11 08:04:51 +00:00