Brian Gough
b9e7f6ab5e
Merge pull request #5384 from overleaf/bg-add-symbol-palette-feature-flag
...
[web] add symbol palette feature flag
GitOrigin-RevId: 154499aaef72b677f28d85c501d0015811081887
2021-10-14 08:03:11 +00:00
Jakob Ackermann
13b8321986
Merge pull request #5375 from overleaf/jpa-401-failed-login
...
[web] send a non success status code for failed logins in Server CE/Pro
GitOrigin-RevId: 1aace4456c8602af26a362346bfc462e1476b0f7
2021-10-07 08:04:49 +00:00
Timothée Alby
1425d96deb
Merge pull request #5319 from overleaf/ta-split-test-assignment-date
...
Validate User's Split Tests Schema
GitOrigin-RevId: 0e37a833696359838c7133cd7cd9411ec520993a
2021-10-05 08:03:30 +00:00
Jakob Ackermann
b58ba2299a
Merge pull request #5277 from overleaf/jpa-handle-missing-file-during-refresh
...
[web] fix handling of missing source file when refreshing a linked file
GitOrigin-RevId: 775bf08a37adb20e71a1492d27bce9a41b959d27
2021-09-30 08:04:06 +00:00
Eric Mc Sween
2fdff8288b
Merge pull request #5088 from overleaf/em-queue-feature-refreshes
...
Perform some user refreshes in the background
GitOrigin-RevId: 3aec73c827bf0f7de7bd9caa369dfc653eac5dd0
2021-09-21 08:03:13 +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
Eric Mc Sween
a10c042e20
Merge pull request #4947 from overleaf/em-project-rename-for-owners-only
...
Prevent collaborators from renaming a project
GitOrigin-RevId: 94d12e25592fea55b84427aeae78f7bb2a544a58
2021-09-14 08:03:38 +00:00
Jakob Ackermann
827768be92
Merge pull request #5008 from overleaf/jpa-drop-ie11-for-real
...
[web] redirect IE11 from all the pages to the unsupported browsers page
GitOrigin-RevId: 9124ca6feef4e82125d7948543a8bdb1d7702c3b
2021-09-09 08:03:17 +00:00
Jessica Lawshe
c14437d2dd
Merge pull request #4795 from overleaf/jel-project-title-regex
...
Escape project title for regular expression
GitOrigin-RevId: 495b96720de6d09cda905edc6464b55a5c85e21d
2021-08-24 08:03:19 +00:00
June Kelly
af9a3d4fb7
Merge pull request #4818 from overleaf/ab-clean-example-project-split-test
...
Cleanup example project split test and set variant as new template
GitOrigin-RevId: 6d023233077b856f0f9a755eb1a0b60b66b4335f
2021-08-20 08:03:09 +00:00
Thomas
77bcd4c39e
Revert "Initialise full project history for old projects when project opened ( #4687 )" ( #4740 )
...
This reverts commit ac263dca8cf0d80186fee916a76e5572ec5649d4.
GitOrigin-RevId: cc82e9c7d51966a7be0e8bef06ae4afe3f73170c
2021-08-13 12:59:04 +00:00
Thomas
7517a818b2
Initialise full project history for old projects when project opened ( #4687 )
...
* Initialise full project history for old projects when project opened
This begins a second attempt at initialising the full project history in
the background for projects without a full project history id.
The original web-internal#4345 was reverted in web-internal#4353. This
commit reverts the revert, and adds an additional flush of the project
before initialising full project history.
GitOrigin-RevId: ac263dca8cf0d80186fee916a76e5572ec5649d4
2021-08-13 12:58:56 +00:00
June Kelly
99fe2eca51
Merge pull request #4352 from overleaf/sk-add-ce-sp-migration-deleted-files
...
Add migrations for CE/SP, run scripts for deleted files and docs
GitOrigin-RevId: e425a8d929a4aefdc6f61cff636fb5a1b4c67dce
2021-08-04 11:13:55 +00:00
Shane Kilkelly
10deaf5aec
Merge pull request #4332 from overleaf/sk-import-server-pro-acceptance-tests
...
Migrate server-pro acceptance tests to modules
GitOrigin-RevId: 7caf5719d21bbd7fb30901f3e52225fe4cbc9832
2021-07-28 02:06:46 +00:00
Alexandre Bourdin
d28c1941c2
Merge pull request #4344 from overleaf/revert-4304-ab-configurable-split-test
...
Revert "Configurable split tests system"
GitOrigin-RevId: dcaf79d074949c0c28b06515278a873c89b5aecb
2021-07-28 02:06:42 +00:00
Alexandre Bourdin
daf2ee57dc
Merge pull request #4304 from overleaf/ab-configurable-split-test
...
Configurable split tests system
GitOrigin-RevId: 908dc4f681668b32e95204314ac0d5727f269e65
2021-07-28 02:06:33 +00:00
Shane Kilkelly
4b9aa97ea1
Merge pull request #4303 from overleaf/sk-tag-saas-migrations
...
Migrations: tag migrations with relevant environment
GitOrigin-RevId: ad6c3bea19d3c21a1fdae58e09c861a3173c792b
2021-07-28 02:05:49 +00:00
Jakob Ackermann
fe4c48b7fb
Merge pull request #4325 from overleaf/jpa-core-tests-in-saas-ce-pro
...
[misc] run core tests in SAAS/Server CE/Server Pro environment
GitOrigin-RevId: 6278ae1eb760a4c0c16da1b71efdde844764a526
2021-07-20 11:33:46 +00:00
Jakob Ackermann
411a12cb2d
Merge pull request #4322 from overleaf/jpa-custom-base-config-for-tests
...
[misc] set up custom base config for acceptance tests
GitOrigin-RevId: bd49c705360488fd75c6ad311afd13f22f81de61
2021-07-20 11:33:41 +00:00
Jakob Ackermann
cebad4a774
Merge pull request #4307 from overleaf/jpa-migrate-google-ops-config
...
[misc] migrate google ops config into saas overrides
GitOrigin-RevId: 949fc610a8a79b780b590d66d25bc21bd9615ab2
2021-07-14 12:40:58 +00:00
Jakob Ackermann
611019d718
Merge pull request #4297 from overleaf/jpa-prepare-separate-defaults-per-env
...
[config] prepare separate overrides per env
GitOrigin-RevId: fc000c023e7cc8383075c633c2882ab8e6b36c4b
2021-07-08 12:54:01 +00:00
Jakob Ackermann
5e773ce950
Merge pull request #4101 from overleaf/ae-settings-module
...
Migrate from `settings-sharelatex` to `@overleaf/settings`
GitOrigin-RevId: 9a298ba26382180c1351683c5fddc9004418c1e6
2021-07-08 02:08:28 +00:00
Alexandre Bourdin
40c7f2dae1
Merge pull request #4219 from overleaf/ab-group-subscription-user-property
...
Send group subscription user property
GitOrigin-RevId: d1033ab4e0b5061b9d4a781e319d6b690f7e6154
2021-07-06 02:05:54 +00:00
Shane Kilkelly
9dc44de7f0
Merge pull request #4191 from overleaf/sk-token-v1-fix
...
TokenAccess: Fix handling of deleted projects
GitOrigin-RevId: a602da335567d36b5e674ada69c1e1ab4a909d4a
2021-06-25 02:05:48 +00:00
Alexandre Bourdin
ca1e828ea7
Merge pull request #4138 from overleaf/ab-recurly-webhook-analytics
...
Send analytics events and user properties from Recurly webhook
GitOrigin-RevId: 3227dd9e42bad61e17d2ca471f6d68adb7212dab
2021-06-11 02:05:59 +00:00
Thomas
d56d4c3b4a
Add HTTP Basic Auth to Recurly webhook endpoint ( #4054 )
...
* Add HTTP authentication to Recurly webhook endpoint
Co-authored-by: Eric Mc Sween <eric.mcsween@overleaf.com>
GitOrigin-RevId: 81c32459d643895c096bc195ae6aef53248418da
2021-06-09 02:05:31 +00:00
Alf Eaton
3a45d270ec
Upgrade settings-sharelatex to 1.3.0 ( #4065 )
...
GitOrigin-RevId: bd24ba44203cf559758f2ff7291723af98b489aa
2021-05-20 02:05:18 +00:00
Alf Eaton
b777e958d4
Merge pull request #3926 from overleaf/ae-decaffeinate
...
Decaffeinate settings files
GitOrigin-RevId: e9eed42864d537bb1ff5a46c05d990c819afc8eb
2021-05-20 02:05:15 +00:00
Jessica Lawshe
3af7b2da30
Merge pull request #4049 from overleaf/jel-featuresUpdatedAt
...
Set featuresUpdatedAt
GitOrigin-RevId: 87d53e5ff27a8ebce2ba8c7223d498b291d05a23
2021-05-19 02:06:10 +00:00
Jessica Lawshe
9b29fa7cbc
Merge pull request #4035 from overleaf/jel-reconfirmation-dropbox-notification
...
Notification for Dropbox unlinked due to reconfirmation lapse
GitOrigin-RevId: 03d2bed922e1d3dd993f9227b8e7675af42eda4b
2021-05-19 02:06:06 +00:00
Jakob Ackermann
1d95137e13
Merge pull request #4016 from overleaf/jpa-faster-ci-4288
...
[perf] faster CI
GitOrigin-RevId: 858c0c4947e41961dae35cb20e0fcc2e2f723787
2021-05-18 02:07:44 +00:00
Jessica Lawshe
5d7faa7977
Merge pull request #4006 from overleaf/jel-refresh-features-reason
...
Pass reason to refreshFeatures
GitOrigin-RevId: 400e3081333239248e3408f93b0517b9bbdbc90c
2021-05-12 02:09:55 +00:00
Jessica Lawshe
2bf126af68
Merge pull request #3993 from overleaf/jel-reconfirmation-script
...
Add script to refresh features for users not reconfirmed
GitOrigin-RevId: d49f496dc6f1997763d54c6d8f41f7c3634b8b2d
2021-05-12 02:09:51 +00:00
Miguel Serrano
c081db1ddf
Merge pull request #3989 from overleaf/jel-reconfirm-tests
...
Fix reconfirm tests
GitOrigin-RevId: bbcaf97f339dc563a7b49db14252cc8de601878d
2021-05-06 02:09:29 +00:00
Miguel Serrano
219f9ec39e
Merge pull request #3966 from overleaf/jpa-acceptance-tests-rate-limiter
...
[misc] replace RateLimiter unit tests with acceptance tests on /metrics
GitOrigin-RevId: c4ef502b38bb4b300c6b9812e1c97858e93a38fe
2021-05-06 02:09:22 +00:00
Miguel Serrano
f9871103bf
Merge pull request #3949 from overleaf/msm-reenable-eslint-const-rule
...
Reenable eslint `prefer-const` rule
GitOrigin-RevId: 4f3825be8b8dff381095209085a36eaab76260d5
2021-05-06 02:09:14 +00:00
Jakob Ackermann
23c73b9bf1
Merge pull request #3959 from overleaf/jpa-take-note-of-past-url
...
[UnsupportedBrowserMiddleware] take note of the past URL in redirect
GitOrigin-RevId: d80ed876f87e54c181f00669a11795a2ce44e5a5
2021-04-29 02:09:33 +00:00
Jakob Ackermann
cf496e1fd2
Merge pull request #3958 from overleaf/jpa-script-delete-orphaned-docs-online
...
[scripts] add a script for deleting orphaned docs
GitOrigin-RevId: f3b16d900cc162852491bd7a83fe1ba61a0579d8
2021-04-29 02:09:29 +00:00
Jakob Ackermann
adfde7d26b
Merge pull request #3950 from overleaf/msm-reenable-lint-prefer-regex-literals
...
Reenable `prefer-regex-literals` eslint rule
GitOrigin-RevId: 3c576d92a08dfcb745d447b1bf8c7b828753010d
2021-04-29 02:09:10 +00:00
Alexandre Bourdin
affaae14b7
Merge pull request #3917 from overleaf/ab-example-project-ab-test
...
Example Project Split Test
GitOrigin-RevId: a9d68811c878e32b92e0547311c9e477e4096135
2021-04-28 02:10:08 +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
Shane Kilkelly
07ec567b07
Merge pull request #3902 from overleaf/sk-ref-providers-hide
...
Editor: don't leak encrypted tokens to frontend
GitOrigin-RevId: 245c1e9d479f7eec2979b46a5959bd3eb9f08363
2021-04-22 02:09:31 +00:00
Jakob Ackermann
58fbbf6269
Merge pull request #3925 from overleaf/jpa-cache-deleted-project
...
[scripts] back_fill_dummy_doc_meta: add a cache for deletedProjects
GitOrigin-RevId: 3d24c9fc4985f33b2e18f8f63f0b690d65476d1b
2021-04-21 02:09:23 +00:00
Jakob Ackermann
35e9d4ea0b
Merge pull request #3923 from overleaf/ta-format-fix
...
Fix formatting after Prettier 2 upgrade
GitOrigin-RevId: c06462c321f8586e442710e9a1186b3643ae6153
2021-04-20 02:10:25 +00:00
Timothée Alby
f7166c5c1b
Merge pull request #3922 from overleaf/jpa-fix-project-restore-deleted-files
...
[ProjectDeleter] undeleteProject: deletedFiles.projectId is an ObjectId
GitOrigin-RevId: 53bdc7c2a20269ef22ec7ca55a6ccf9339209cdd
2021-04-20 02:10:14 +00:00
Timothée Alby
97f89f132c
Merge pull request #3920 from overleaf/as-fix-unsupported-middleware
...
Fix unsupported browser middleware
GitOrigin-RevId: 27dc8cef4747abba85a985c28865340bc5116ab7
2021-04-20 02:10:05 +00:00
Timothée Alby
5520553e34
Merge pull request #3877 from overleaf/jpa-script-regenerate-referreal-ids-optimize-queries
...
[scripts] regenerate_duplicate_referral_ids: optimize queries, add tests
GitOrigin-RevId: 5b6881b857b20a80bc8db6e01fb7668dc0377675
2021-04-20 02:09:59 +00:00
Jakob Ackermann
e47237f350
Merge pull request #3915 from overleaf/jpa-script-back-fill-dummy-doc-meta
...
[scripts] back_fill_dummy_doc_meta: bug fixes and limit result size
GitOrigin-RevId: 6823cf626ba7e0e6733a317866512745bb1e5206
2021-04-16 02:05:36 +00:00
Jakob Ackermann
70841f4b3b
Merge pull request #3907 from overleaf/jpa-script-back-fill-dummy-doc-meta
...
[scripts] add a new script for back filling dummy doc meta data
GitOrigin-RevId: d3cb0900f08d4d3264cb1e8a0b3f7e8acdd6eb6c
2021-04-16 02:05:21 +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
Shane Kilkelly
04fa863f9f
Merge pull request #3892 from overleaf/sk-reroll-csrf
...
Regenerate CSRF token on login
GitOrigin-RevId: 501582b34794a822f4c9fe3af2575b5756511e06
2021-04-10 02:05:13 +00:00
Jessica Lawshe
66105d6937
Merge pull request #3782 from overleaf/revert-3773-revert-3718-jel-emailHasLicence
...
Revert "Revert "Update emailHasLicence for reconfirmation and SAML""
GitOrigin-RevId: 120ee0ca2f59573578e6279477c6e62972b5fb4a
2021-04-09 02:05:17 +00:00
Jakob Ackermann
ec7cd9fc3e
Merge pull request #3656 from overleaf/jpa-script-back-fill-doc-name
...
[scripts] add new script for back filling the names of deleted docs
GitOrigin-RevId: c3a7ad8ba1306728bc1a433bec5dc847651bf94d
2021-04-07 02:05:03 +00:00
Jakob Ackermann
76b1cdff51
Merge pull request #3754 from overleaf/jpa-project-restore-handle-deleted-docs
...
[ProjectDeleter] restore project.deletedDocs meta data into docstore
GitOrigin-RevId: 570543d2cb9c5c790ac49328382ed88ef6ac3129
2021-04-07 02:05:00 +00:00
Jakob Ackermann
3bdf7afbbf
Merge pull request #3653 from overleaf/jpa-merge-deleted-docs-sources
...
[EditorHttpController] fetch deletedDocs from docstore, merge w/ project
GitOrigin-RevId: 5cf46aa7ded034285051ddae21b5c80d8c806693
2021-04-07 02:04:52 +00:00
Jakob Ackermann
92194202d7
Merge pull request #3652 from overleaf/jpa-tell-docstore-doc-name-on-delete
...
[DocStoreManager] pass doc name as part of DELETE request
GitOrigin-RevId: cdb5fb21580a95aa8a78e0a44ca1e4db4da7f934
2021-04-07 02:04:49 +00:00
Jakob Ackermann
23be656aec
Merge pull request #3746 from overleaf/jpa-hard-deletion-from-deleted-files
...
[ProjectDeleter] hard deletion of project deletes deletedFiles entries
GitOrigin-RevId: b514c34465d5fdc66b40aae5bcdb8b66975bc350
2021-04-02 02:04:58 +00:00
Shane Kilkelly
ae212feec4
Merge pull request #3701 from overleaf/jpa-script-back-fill-deleted-files-stage-2
...
[scripts] back_fill_deleted_files: optionally fix partial inserts
GitOrigin-RevId: 7d48d311db1af0b38222725ca86cdba8951b16b3
2021-04-02 02:04:52 +00:00
Eric Mc Sween
9ddaa8c9f6
Merge pull request #3830 from overleaf/em-upgrade-node-12
...
Upgrade to Node 12
GitOrigin-RevId: 19870922884b7c98e7e5f2c94df21829672d2db5
2021-04-01 02:05:52 +00:00
Miguel Serrano
d65db1acf0
Merge pull request #3824 from overleaf/jpa-password-reset-email-forwarding
...
[misc] fix passing around of users email as part of password reset
GitOrigin-RevId: 54e8cde9867a2ce735bc7ebe281ead19ef49e6cd
2021-04-01 02:05:04 +00:00
Miguel Serrano
80dff8d42c
Merge pull request #3800 from overleaf/ab-queue-onboarding-emails
...
Implement queuing for onboarding emails
GitOrigin-RevId: f1eca149a6a2cab35b4cf9c3889dc384372fd453
2021-04-01 02:04:48 +00:00
Timothée Alby
8ec7ebe645
Merge pull request #3713 from overleaf/jpa-login-event-drop-pii
...
[AuthenticationController] do not include PII as part of login event
GitOrigin-RevId: 274378b3a21945637dc33d2cfb39a53e9aaad9b7
2021-03-30 02:05:09 +00:00
Jakob Ackermann
4280a96b2c
Merge pull request #3749 from overleaf/jpa-refactor-audit-log-access-in-tests
...
[misc] test/acceptance: refactor access on user audit log
GitOrigin-RevId: fab5b81a7469ef4fa0daa553169a47e3427c49fd
2021-03-27 03:05:06 +00:00
Jakob Ackermann
f66fa58a7c
Merge pull request #3745 from overleaf/jpa-project-restore-handle-deleted-files
...
[ProjectDeleter] restore project.deletedFiles into own collection
GitOrigin-RevId: cb34e0e22609a49c676ebfe0753e650699b96f5d
2021-03-27 03:05:01 +00:00
Thomas
001f7f0cc2
Merge pull request #3773 from overleaf/revert-3718-jel-emailHasLicence
...
Revert "Update emailHasLicence for reconfirmation and SAML"
GitOrigin-RevId: 637b85d10fc0c79e8d55e51b43952e956d73baa6
2021-03-16 03:04:44 +00:00
Thomas
fee245b570
Merge pull request #3732 from overleaf/tm-recurly-create-admin-link
...
Create link to Recurly in admin panel
GitOrigin-RevId: 214802e9fbe16954d455ac04eb176ff27890769c
2021-03-16 03:04:40 +00:00
Thomas
1c54a15e42
Merge pull request #3718 from overleaf/jel-emailHasLicence
...
Update emailHasLicence for reconfirmation and SAML
GitOrigin-RevId: 58daf538d9f0a7db46bb3c1e21f8ca04df095446
2021-03-16 03:04:36 +00:00
Alasdair Smith
1e07b5d14e
Merge pull request #3714 from overleaf/jel-tests
...
Update tests for domain handling
GitOrigin-RevId: d7902a7c55d36a35a436e5ac3adad174ea69e9f4
2021-03-05 03:04:46 +00:00
Jakob Ackermann
a2000cb171
Merge pull request #3703 from overleaf/jpa-spd-mocks-reset-is-optional
...
[tests] mocks: .reset() is optional
GitOrigin-RevId: ad2db1ecc69f57fa9deea0ff124e3f0be212f0ee
2021-02-26 03:04:37 +00:00
Jakob Ackermann
6f2fdb268c
Merge pull request #3696 from overleaf/jpa-spd-mocks-tpr-webmodule
...
Update tpr-webmodule tests to use new mocks framework
GitOrigin-RevId: 7dc280f586de748ddcf73ec5b1802e15a84abe65
2021-02-26 03:04:29 +00:00
Jakob Ackermann
c6b0cd0127
Merge pull request #3687 from overleaf/jpa-spd-mocks-init
...
Move app initialisation logic to separate file
GitOrigin-RevId: 858d22b56a42bc1ab53fef54bc209daae4e0fb07
2021-02-26 03:04:16 +00:00
Jakob Ackermann
4a6af88760
Merge pull request #3686 from overleaf/jpa-spd-mocks-core
...
[tests] rebased refactoring of acceptance test mocks
GitOrigin-RevId: dd8b7d69c507aa1270b6fb165b1339bc8a7d6415
2021-02-26 03:04:12 +00:00
Eric Mc Sween
e5c49ea19a
Merge pull request #3681 from overleaf/em-group-plans
...
Configure group plans for additional licenses
GitOrigin-RevId: 57822de9f490505c4b083afa80220e4d5b4c7d23
2021-02-23 03:04:43 +00:00
Jakob Ackermann
30cf22c8a9
Merge pull request #3678 from overleaf/jpa-back-fill-deleted-files-handle-duplicates
...
[scripts] back_fill_deleted_files: handle duplicate deleted files
GitOrigin-RevId: 3f2f1b662727d61d2da2800ad0d635b65562164b
2021-02-20 03:04:25 +00:00
Jakob Ackermann
58b8ac3775
[BackFillDeletedFilesTests] fix flaky assertion -- sort db entries ( #3674 )
...
The projects are processed in parallel, so the entries are potentially
not sorted.
GitOrigin-RevId: 6523a4e3f738e1ce8b84ae0f7bd9bacb2abf39c4
2021-02-18 03:05:25 +00:00
Eric Mc Sween
1c0b897835
Merge pull request #3638 from overleaf/em-dropbox-duplicate-projects
...
Unlink Dropbox when two projects have the same name
GitOrigin-RevId: b16dbeb6841eaebd8553884eebc87e681d17a9c8
2021-02-18 03:05:12 +00:00
Jakob Ackermann
6443e00e34
Merge pull request #3668 from overleaf/jpa-move-deleted-files
...
[scripts] add new script for back filling deletedFiles in own collection
GitOrigin-RevId: 82d48e60192ca90a7cd169b95d43187ef7febff5
2021-02-18 03:04:59 +00:00
Jakob Ackermann
f5965217c4
Merge pull request #3651 from overleaf/jpa-hide-deleted-at-field
...
[misc] joinProject: hide deletedAt field in public deletedDocs array
GitOrigin-RevId: 0ee11c2a8222304d5d1c4edafa2105b7ad43d5d8
2021-02-18 03:04:33 +00:00
Jakob Ackermann
7f6d439302
Merge pull request #3571 from overleaf/jpa-ask-docstore-is-doc-deleted
...
[ProjectEntityUpdateHandler] ask docstore whether a doc exists/isDeleted
GitOrigin-RevId: 54c6666b514b466b908b9ed57a26bc6cf66037d7
2021-02-10 03:04:35 +00:00
Eric Mc Sween
309163d444
Merge pull request #3595 from overleaf/ae-password-reset-request-validation
...
Add request validation to the password reset endpoints
GitOrigin-RevId: 104444d0ebfea2b3d66285a8433e49c1134076b8
2021-02-04 03:04:59 +00:00
Jessica Lawshe
ac99738495
Merge pull request #3609 from overleaf/jel-admin-user-affiliations
...
Add confirmation/reconfirmation to admin user affiliation tab
GitOrigin-RevId: d1e065c5e4d6d97814327742db2c4b131d4f0195
2021-02-03 03:05:16 +00:00
Jessica Lawshe
2dd860c431
Merge pull request #3581 from overleaf/jel-dash-consolidate-emails-requests
...
Consolidate emails requests on the dashboard
GitOrigin-RevId: acfaf92dee257712e1eb3ffbf75b536fd1619e1d
2021-02-03 03:05:11 +00:00
Jessica Lawshe
ada017a50c
Merge pull request #3580 from overleaf/jel-dash-pending-license
...
Get all institutions with inReconfirmNotificationPeriod for dash
GitOrigin-RevId: 904454e5c14f647cc6adc6f7c7b740e64607abc5
2021-02-03 03:04:49 +00:00
Jessica Lawshe
b44aed56dd
Merge pull request #3492 from overleaf/jel-calc-notification-period
...
Flag emails in affiliation notification period
GitOrigin-RevId: d2d4868ba3a49e69b85a3bdca16d12276ac5c006
2021-01-20 03:04:37 +00:00
Eric Mc Sween
4a83631388
Merge pull request #3562 from overleaf/em-delete-project-history
...
Delete expired projects in v1 history
GitOrigin-RevId: ad29c02a78803a6ff1ccde7b9ec00c3f1c664a1c
2021-01-15 03:05:15 +00:00
Miguel Serrano
d7d989ca1b
Merge pull request #3537 from overleaf/jpa-helper-for-project-actions
...
[misc] move some helper functions from ProjectStructureTests into User
GitOrigin-RevId: d5d1bbf9aa31a9f248e03b1fa3deb0378dce7a7b
2021-01-12 03:04:37 +00:00
Timothée Alby
f6decd4728
Merge pull request #3491 from overleaf/jel-v1-mock-affiliations
...
Affiliations in v1 mock API
GitOrigin-RevId: 7d6044c5477af529c0ab111c24945c97c982220b
2021-01-06 03:07:35 +00:00
Alasdair Smith
7cbf2cdd9e
Merge pull request #3496 from overleaf/ae-eslint-dot-notation
...
Enable the eslint dot-notation rule
GitOrigin-RevId: e11cbad3e8a77a4a60590d3674fbf34feccc5bc9
2020-12-17 03:07:31 +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
Jakob Ackermann
dc576baa05
Merge pull request #3472 from overleaf/jpa-fix-flaky-assertion
...
[HealthCheckControllerTests] harden assertion on timed-out http requests
GitOrigin-RevId: f6e8346b2f9744e7f4d11b8ac6164c236d3d7e74
2020-12-10 03:04:29 +00:00
Jakob Ackermann
cb9d207ba0
Merge pull request #3427 from overleaf/jpa-rewite-smoke-tests
...
[SmokeTests] rewrite
GitOrigin-RevId: eda39db6b339d997f5669cb9bfca2aefe7d96699
2020-12-10 03:04:18 +00:00
Paulo Jorge Reis
34f7c709f0
Merge pull request #3425 from overleaf/jpa-cookie-domain-in-ci
...
[misc] setup cookieDomain and siteUrl for acceptance tests
GitOrigin-RevId: a57a9c4f44186848ccda34316071cd65ac387310
2020-12-03 03:04:33 +00:00
Jessica Lawshe
8b4659e700
Merge pull request #3409 from overleaf/jel-inst-leavers-db
...
Add reconfirmedAt to UserSchema
GitOrigin-RevId: 543b57236bbf964c72c6587362a6b6d6b7b7caa6
2020-12-01 03:04:39 +00:00
Brian Gough
cde6160973
Merge pull request #3421 from overleaf/bg-fix-health-checks-for-web-closed
...
fix load balancer health checks for web-closed
GitOrigin-RevId: f46ecec4539740bc4f0324944b2b4d6273025211
2020-12-01 03:04:08 +00:00
Simon Detheridge
94092c905b
Merge pull request #3370 from overleaf/jpa-replace-count
...
[misc] replace mongo .count queries
GitOrigin-RevId: 7963286b4d84d1f03978f3212e92bb491eec6b74
2020-11-10 03:04:25 +00:00
Shane Kilkelly
0450c52187
Merge pull request #3335 from overleaf/jpa-cmg-archived-script-logging
...
Update archiving script for re-run
GitOrigin-RevId: 0251ca8d6f864f697395deac9470398519b704de
2020-11-05 03:04:30 +00:00
Jakob Ackermann
654abb3b47
Merge pull request #3355 from overleaf/jpa-use-count-again
...
[misc] mongodb: use deprecated db.collection.count again
GitOrigin-RevId: 93dc05651747ca49b0e26547a330682f85ad9cef
2020-11-04 03:04:26 +00:00
Jakob Ackermann
87634be542
Merge pull request #3351 from overleaf/revert-3348-revert-3298-jpa-re-land-mongoose-latest
...
[misc] re-land: remove mongojs and bump mongoose
GitOrigin-RevId: eba9f80fbd58dbb8aed131fead3ec0b928a555aa
2020-11-04 03:04:21 +00:00
Jakob Ackermann
e249a2e5be
Merge pull request #3348 from overleaf/revert-3298-jpa-re-land-mongoose-latest
...
Revert "[misc] re-land: remove mongojs and bump mongoose"
GitOrigin-RevId: 45a284435c88898d96769ab258651fb8d6d20ff5
2020-11-03 03:05:09 +00:00
Jakob Ackermann
28fe397f38
Merge pull request #3298 from overleaf/jpa-re-land-mongoose-latest
...
[misc] re-land: remove mongojs and bump mongoose
GitOrigin-RevId: 02f78d52ffc2d373c8c0bc4860d3b2326a46f5c9
2020-11-03 03:04:52 +00:00
Jakob Ackermann
15fd090e7a
Merge pull request #3325 from overleaf/jpa-session-cleanup
...
[UserEmailsController] clear sessions after changing the primary email
GitOrigin-RevId: 319b483a3c2851c37c0a340ba9c43a86225a9246
2020-10-31 03:05:36 +00:00
Shane Kilkelly
e9f7a17093
Merge pull request #3234 from overleaf/sk-fix-password-validation-email
...
Overhaul password validation
GitOrigin-RevId: a591c4e192e30a0ac053eab6f80627543a8a92fe
2020-10-23 02:04:39 +00:00
Jakob Ackermann
21070a01a8
Merge pull request #3303 from overleaf/jpa-fix-user-model
...
[model] User: third-party-references is owner of .refProviders entries
GitOrigin-RevId: 8ac81869657f4fe7615928eae2ad3d93d24cef0f
2020-10-22 02:04:43 +00:00
Simon Detheridge
c257b9695a
Merge pull request #3277 from overleaf/revert-3257-jpa-mongoose-latest
...
Revert "[misc] upgrade mongoose to the latest version"
GitOrigin-RevId: d5957fca68be65a08a687476742ffbb9c3cb86e8
2020-10-13 02:04:31 +00:00
Simon Detheridge
dba5127856
Merge pull request #3257 from overleaf/jpa-mongoose-latest
...
[misc] upgrade mongoose to the latest version
GitOrigin-RevId: cc612312e1661a92907dd8d42a32aeccb8cdb62d
2020-10-13 02:04:26 +00:00
Jakob Ackermann
a096d98956
Merge pull request #3193 from overleaf/jpa-mongodb-native-acceptance-tests
...
[misc] migrate the acceptance tests to the native mongo driver
GitOrigin-RevId: 5ec8605cafb28cc9cfeb85d7ee0d1b567cfe49ba
2020-10-09 02:05:03 +00:00
Jessica Lawshe
06316a0f56
Merge pull request #3220 from overleaf/jel-link-ieee
...
Move link/unlink SSO audit log entry
GitOrigin-RevId: 1b912cc58957af7e80628f3f955f01c2a641812d
2020-10-07 02:04:34 +00:00
Jessica Lawshe
1ca50eeb98
Merge pull request #3179 from overleaf/jel-remove-sudo-mode
...
Remove SudoMode
GitOrigin-RevId: 9419f9b28e5051a1c5abd29f498f72448d1afd33
2020-10-07 02:04:29 +00:00
Jakob Ackermann
79bdc60743
Merge pull request #3262 from overleaf/jpa-global-query-normalize-helper
...
[misc] add a helper for normalizing queries and detecting ObjectIds
GitOrigin-RevId: 4f0ac53219ab5853b5499447334724c6c39c6303
2020-10-07 02:04:24 +00:00
Jakob Ackermann
da9f966ff0
[misc] prepare acceptance tests for mismatching ObjectId types ( #3188 )
...
- helpers/User: UserUpdater cannot handle foreign ObjectIds. Instead use
`mongoUpdate`, which in turn uses the user id which
`setExtraAttributes` sets -- hence the reordering of calls.
- CollabratecTests: use chaId for id comparison.
- ProjectStructureMongoLockTest: use chaId for id comparison.
- UserHelper: less generic updateUser -- wrap the passed ObjectId
GitOrigin-RevId: b16e2b66dcb3dd5f0a842ca5e55fa661abe9035f
2020-10-06 02:04:34 +00:00
Jakob Ackermann
e3c6637339
Merge pull request #3187 from overleaf/jpa-mongodb-native
...
[misc] migrate the app to the native mongo driver
GitOrigin-RevId: 9030b18c4cf62e3a01d3d8f450bf0e02f9f89c22
2020-10-02 02:04:18 +00:00
Jessica Lawshe
2a3cb615ee
Merge pull request #3241 from overleaf/jpa-speedup-acceptance-tests
...
[misc] speedup the ConvertArchivedState test suite
GitOrigin-RevId: e7d6471955aabbc6af76e27fdf23d97e2fd87901
2020-09-30 02:04:46 +00:00
Alasdair Smith
394f160679
Merge pull request #2963 from overleaf/cmg-archive-state-script
...
Script to convert old archived state into new array state
GitOrigin-RevId: 64cd3a236dc627f922488e1fa9d8aa2e7df1eb15
2020-09-27 02:05:32 +00:00
Jakob Ackermann
018a44eeb5
Merge pull request #3185 from overleaf/jpa-normalize-mongo-imports
...
[misc] normalize mongo imports
GitOrigin-RevId: ac653d9982e0d36736b90f4c03d4c00be88ea76a
2020-09-25 02:04:20 +00:00
Chrystal Maria Griffiths
e6307237e4
Merge pull request #3207 from overleaf/jpa-drop-console-log
...
[misc] drop console.log calls in tests
GitOrigin-RevId: 156c94761e55648a92cf98d4c3cce20abb5de623
2020-09-19 02:04:38 +00:00
Jessica Lawshe
aee83bc0cf
Merge pull request #3173 from overleaf/jel-institution-sso-audit-log
...
Update audit log when institution SSO is linked/unlinked
GitOrigin-RevId: 264ffbed025dccb4dd202f86afe545c3bf0c1f76
2020-09-15 02:04:24 +00:00
Timothée Alby
d9c435a77a
Merge pull request #2957 from overleaf/ew-validate-saml-email
...
Validate saml email before register
GitOrigin-RevId: 6dcf3bccd280abd7bd3ced2d4fd2f69c590f74c1
2020-09-02 02:05:07 +00:00
Timothée Alby
1ff2c6ce00
Merge pull request #3117 from overleaf/sk-block-tpds-update-on-archived-project
...
Block TPDS update on archived/trashed project
GitOrigin-RevId: 7db41a313b03721b93cbb601add6f91ae31f3f2a
2020-08-25 02:04:17 +00:00
Jakob Ackermann
674954f96f
Merge pull request #3094 from overleaf/sk-restrict-admin-flag
...
Check domain of emails on admin users
GitOrigin-RevId: 75de9cff30e3c628249fcd0ea3446a33d51d39b4
2020-08-20 02:06:19 +00:00
Jessica Lawshe
552fb56b74
Merge pull request #3078 from overleaf/jel-log-password-reset-by-token
...
Update audit log when password reset by token
GitOrigin-RevId: 2ae7f59c5cdf2723e541a99c58c36564cc82adbf
2020-08-13 15:46:10 +00:00
Timothée Alby
3babf23444
Merge pull request #3091 from overleaf/jel-log-default-email-change
...
Update audit log for default email changes
GitOrigin-RevId: c7b4e4e888aa5ffd976062d72f660ded303f0885
2020-08-13 02:06:40 +00:00
Timothée Alby
8cd6e7ccfc
Merge pull request #3064 from overleaf/ta-manage-multiple-groups
...
Allow Users to Manage Multiple Groups
GitOrigin-RevId: c918da0114cdd1d679223f69d81159b4c2608874
2020-08-13 02:06:20 +00:00
Simon Detheridge
29f09c50c2
Merge pull request #3071 from overleaf/spd-unhandled-promises-in-tests
...
Treat unhandled promise rejections as errors in tests
GitOrigin-RevId: ba9d8fa02e0687c6b2d1d95e495fe0b54bb0cff5
2020-08-12 02:07:09 +00:00
Jessica Lawshe
7eee20f914
Merge pull request #3079 from overleaf/jel-log-password-update
...
Update audit log when password updated
GitOrigin-RevId: 3228e39e8a3682d6e77264cd6ee580f3fc40642a
2020-08-10 15:56:11 +00:00
Jakob Ackermann
a437eb3d59
Merge pull request #2995 from overleaf/jpa-project-download-fix-leaking-upstream-response
...
[misc] project download: fix leaking upstream stream from error in pipe
GitOrigin-RevId: cb7db90890853352dc69ea2e46cec7e7ea66e6e9
2020-08-10 15:55:00 +00:00
Jessica Lawshe
c3450e4414
Merge pull request #3051 from overleaf/jel-log-when-email-added
...
Add entry to auditLog when user adds an email
GitOrigin-RevId: 797c85e18cb2b201e09fd2631b1e5ea066adfc37
2020-08-10 15:54:42 +00:00
Jessica Lawshe
cbe21d1f77
Merge pull request #3024 from overleaf/jel-log-cleared-sessions
...
Log cleared user sessions in user.auditLog
GitOrigin-RevId: 829c4ea037d897689c02c1dfe12d38542a7216c0
2020-07-28 02:06:43 +00:00
Jakob Ackermann
1f6499b5ea
Merge pull request #3053 from overleaf/jpa-spd-accepts
...
[misc] reland 3004: unify detection of json requests and skip issuing of redirects
GitOrigin-RevId: fa43b3b4d23deb581496ed70ae8f28b805555d64
2020-07-28 02:06:27 +00:00
Jakob Ackermann
7847209eaa
Merge pull request #3049 from overleaf/jlm-fix-referral-projection
...
Fix referral projection
GitOrigin-RevId: 37c68bf6bfa81a694e2f919b262634a9a1b63f8b
2020-07-28 02:06:20 +00:00
Paulo Jorge Reis
ffc5c4be8f
Merge pull request #3009 from overleaf/jpa-fix-flaky-locking-in-tests
...
[misc] ProjectStructureMongoLockTest: eventually restore locking timeout
GitOrigin-RevId: 6c139edb0f6e37775c459a50a71dd90802e366fc
2020-07-17 02:06:54 +00:00
Hugh O'Brien
eaa7491c2b
Merge pull request #2948 from overleaf/hb-onboarding-email
...
User onboarding email
GitOrigin-RevId: 367fd8b6292024bfcad2139728c16cf00f2fb1cb
2020-07-14 02:06:47 +00:00
Miguel Serrano
8023e48efd
Merge pull request #2974 from overleaf/jel-ns-user-projections-beta
...
Remove user projections in BetaProgramHandler
GitOrigin-RevId: 88b7bc3b6f11ae9f8314543ee538c84d25cde7cd
2020-07-11 02:04:30 +00:00
Jakob Ackermann
153a9c5790
Merge pull request #2953 from overleaf/jpa-nocache
...
[misc] Server: invoke the nocache middleware explicitly and add test
GitOrigin-RevId: 3238b07ebf5963ae95ef3f353e4745d283795fba
2020-06-27 02:10:30 +00:00
Jessica Lawshe
366a925903
Merge pull request #2919 from overleaf/ta-admin-update-empty
...
Allow Empty Strings in Admin Form Updates
GitOrigin-RevId: 79c1315dcb56ebdd82094653c67dcd83b1b53b87
2020-06-19 02:10:32 +00:00
Shane Kilkelly
f4950c21bf
Merge pull request #2870 from overleaf/sk-restrict-chat
...
Block restricted users from Chat endpoints
GitOrigin-RevId: caec8fe2bc93d567dd57f32dc765bd74ba53e933
2020-06-05 02:09:58 +00:00
Eric Mc Sween
8ba63b0f8e
Merge pull request #2849 from overleaf/em-convert-file-to-doc
...
Fix update order when converting a file to a doc
GitOrigin-RevId: a0c9488e3870cc972c21b40ff0e2577fcec40ee0
2020-05-21 03:22:07 +00:00
nate stemen
f5b2640c82
Merge pull request #2817 from overleaf/ns-project-import-deletion-v1-handler
...
remove checks if project is in importing state
GitOrigin-RevId: f087cf04436b38b351b6985cecc9182256401cba
2020-05-21 03:22:02 +00:00
nate stemen
2479cb485a
Merge pull request #2826 from overleaf/ns-project-import-flow-deletion
...
Project import flow deletion
GitOrigin-RevId: 08ffc156eb158235d4ccacba2b3ed504cd9978f0
2020-05-21 03:21:56 +00:00
Eric Mc Sween
ae82366122
Merge pull request #2827 from overleaf/em-faster-clones
...
Make a single Mongo update when cloning projects
GitOrigin-RevId: abd4069bd8854d84c413bc8f890583e647b7c18e
2020-05-14 03:26:15 +00:00
Miguel Serrano
0583f7a667
Merge pull request #2746 from overleaf/ew-jpa-fix-deprecated-express-methods
...
[misc] fix express deprecations
GitOrigin-RevId: 78c730578c6a671f142837c98f98d5fd260332a5
2020-05-07 03:27:56 +00:00
Simon Detheridge
dd59d8c242
Merge pull request #2770 from overleaf/spd-filestore-deletes
...
Delete project files in filestore when project is hard-deleted
GitOrigin-RevId: c836f94b2dc1967d84424ff1b65b1025b3499309
2020-04-25 03:18:55 +00:00
Eric Mc Sween
27941dc8af
Merge pull request #2760 from overleaf/em-faster-uploads
...
Make a single Mongo update when uploading projects
GitOrigin-RevId: de102d3e112c9014ca5885f963e35971e4db6cee
2020-04-24 03:30:55 +00:00
Timothée Alby
be7a1abb13
Merge pull request #2693 from overleaf/ta-acceptance-user-helper
...
Improve UserHelper in Acceptance Tests
GitOrigin-RevId: 3dffc789a07197d6cc14715dee89da0feb40b506
2020-04-02 03:19:44 +00:00
Timothée Alby
1d7b454c96
Merge pull request #2691 from overleaf/ta-4xx-error-page
...
Enhance 4xx HTML Response Page
GitOrigin-RevId: 620f84cd6cdc0571bd68bbd2c3164b08f7fe5598
2020-04-02 03:19:35 +00:00
Shane Kilkelly
b51e3c01e4
Merge pull request #2614 from overleaf/sk-monolithify-tags
...
Move 'tags' into web
GitOrigin-RevId: a248d1b2471f0bfa05589df9b7357b4d85793a79
2020-03-25 04:16:44 +00:00
nate stemen
c301d8bc25
Merge pull request #2666 from overleaf/em-max-json-request-size
...
Separate max_doc_length from max JSON request size
GitOrigin-RevId: 4c725028111966bf04109080d80d4672273dd697
2020-03-19 04:17:05 +00:00
Timothée Alby
fbbb39b0c0
Merge pull request #2620 from overleaf/ta-body-parser-errors
...
Convert Errors with Status Code To HTTP Errors
GitOrigin-RevId: 4c7abf4f9164c1a907fbf38c6e440409a616e047
2020-03-10 04:14:38 +00:00
Eric Mc Sween
fbc1136be7
Merge pull request #2649 from overleaf/em-delete-project-history
...
Delete project in project history when expiring
GitOrigin-RevId: a6bf44a88de35e777b135d8f84d68e3b0ba8908f
2020-03-05 04:17:00 +00:00
Hugh O'Brien
693100358c
Merge pull request #2646 from overleaf/as-fix-trashing-old-archived-project
...
Fix error thrown when trashing project with legacy boolean archived state
GitOrigin-RevId: 0131a2294767e00d69c4dd80ed86dfd5d77339b8
2020-03-04 04:21:54 +00:00
Eric Mc Sween
1da929fcdb
Merge pull request #2618 from overleaf/ew-clear-root-doc-on-delete
...
Clear root doc on delete
GitOrigin-RevId: 4121d198f5253417bca2284c5f750c088debcb8c
2020-02-28 04:18:17 +00:00
Eric Mc Sween
17969c50ce
Merge pull request #2611 from overleaf/ta-cmg-recurly-email-update-test-plus
...
Improve Recurly API Acceptance Test
GitOrigin-RevId: 89f4707c9baaa20e59f64821daa36551ad700118
2020-02-28 04:18:13 +00:00
Shane Kilkelly
2686f5e72a
Merge pull request #2630 from overleaf/sk-fix-token-login-redirect
...
Remember token page when redirect to login
GitOrigin-RevId: 1c4d7b8ae034ef2d63cc680405c099405024f4d1
2020-02-26 04:24:06 +00:00
Shane Kilkelly
7cbb00f207
Merge branch 'sk-token-csrf-protection'
...
GitOrigin-RevId: e71f7264be45b665502150e9ffbb85b3fc94665e
2020-02-26 04:24:01 +00:00
Timothée Alby
995dbc514d
Merge pull request #2594 from overleaf/jel-flag-affiliation-when-registering
...
Flag unchecked affiliation when registering
GitOrigin-RevId: c9da12ceb5a1712c8c477222f967fb54eceef252
2020-02-21 04:21:16 +00:00
Timothée Alby
f5e2983a6b
Merge pull request #2609 from overleaf/ta-cmg-recurly-email-update
...
Add UI to Update Recurly Email
GitOrigin-RevId: 920a741fd9b4312f031bdd40e3d6bec48f1bd579
2020-02-21 04:21:12 +00:00
Timothée Alby
98f031e9aa
Merge pull request #2619 from overleaf/ta-licence-attribute-fix
...
Read Licence Attribute from Affiliation Instead of Institution
GitOrigin-RevId: 2294222e2bd0da473a303d3ffdc5ddb7d856f7f7
2020-02-21 04:20:59 +00:00
Simon Detheridge
b812109cb7
Merge pull request #2593 from overleaf/ta-affiliation-licence-check
...
Check Licence on Affiliations Rather Than Institutions
GitOrigin-RevId: 7effe7f564ff953e60ed77bcdf92f3cb177d4aee
2020-02-19 04:20:39 +00:00
Chrystal Maria Griffiths
4131e5ce7b
Merge pull request #2585 from overleaf/cmg-remove-legacy-archive
...
Remove legacy project archiving
GitOrigin-RevId: a402cde154cdc2ef5e93661318c5ca86201471b5
2020-02-13 04:20:26 +00:00
Jessica Lawshe
528b2b5728
Merge pull request #2563 from overleaf/jel-add-affiliation-when-registering
...
Add affiliation when registering
GitOrigin-RevId: e1915bbdc0a4fef399ef9b4a2154ede31e282cc3
2020-02-12 04:21:10 +00:00
Ersun Warncke
ba253bee12
Revert "Revert "Revert "clear rootDoc_id when deleting doc, reset on compiles if invalid"""
...
This reverts commit 034ae6fa4d8515944683395ef14d99801829cb6a.
GitOrigin-RevId: 16801e6f35e1ee879d36ca46e262f8bb6e506a54
2020-02-12 04:20:56 +00:00
Ersun Warncke
b4cdfc43cf
Revert "Revert "Revert "format fix"""
...
This reverts commit abb3f94c50b94cd87012d9e55c40afd9cbfe97e0.
GitOrigin-RevId: 090e01b96222024341e3c988ec3ba4c9fa1eef11
2020-02-12 04:20:52 +00:00
Ersun Warncke
b57ee58883
Revert "fix acceptance tests"
...
This reverts commit 7e61102f91654431761f5f72b4355c6e5954b0d7.
GitOrigin-RevId: e93c5e079c8b83a77e7a74065c23afb17c9369b3
2020-02-12 04:20:25 +00:00
Ersun Warncke
a6a624eaa3
Revert "format fix"
...
This reverts commit ed06e07c536e3faa984326a02bbc633b7837e859.
GitOrigin-RevId: b4ed8349c9867838442af9c06a2a1a54fe40e57b
2020-02-12 04:20:21 +00:00
Ersun Warncke
5abb9ab855
format fix
...
GitOrigin-RevId: ed06e07c536e3faa984326a02bbc633b7837e859
2020-02-12 04:20:17 +00:00
Ersun Warncke
b4fbb0c9fc
fix acceptance tests
...
GitOrigin-RevId: 7e61102f91654431761f5f72b4355c6e5954b0d7
2020-02-12 04:20:12 +00:00
Ersun Warncke
7e200d2aea
Revert "Revert "format fix""
...
This reverts commit 4617b9ec2ed63b14418a8510a214e58397314831.
GitOrigin-RevId: abb3f94c50b94cd87012d9e55c40afd9cbfe97e0
2020-02-12 04:19:45 +00:00
Ersun Warncke
93bf7cc4db
Revert "Revert "clear rootDoc_id when deleting doc, reset on compiles if invalid""
...
This reverts commit 7acba5876581044a08d6deb4767a4a2196dcb765.
GitOrigin-RevId: 034ae6fa4d8515944683395ef14d99801829cb6a
2020-02-12 04:19:41 +00:00
Jessica Lawshe
f2636e0555
Merge pull request #2572 from overleaf/ta-personal-plan-test
...
Personal Plan Filter Test
GitOrigin-RevId: e0e75bdd43b27cda787d039f9cfaad64e96afa67
2020-02-06 04:20:09 +00:00
Ersun Warncke
76a6c399e3
Revert "clear rootDoc_id when deleting doc, reset on compiles if invalid"
...
This reverts commit 539982adbf55014400f4aff94195e7f567cda676.
GitOrigin-RevId: 7acba5876581044a08d6deb4767a4a2196dcb765
2020-02-06 04:19:46 +00:00
Ersun Warncke
d8b627f59b
Revert "format fix"
...
This reverts commit 71faf86ccd19dfa6428c2d5bcc8c88ec7f0ee41f.
GitOrigin-RevId: 4617b9ec2ed63b14418a8510a214e58397314831
2020-02-06 04:19:41 +00:00
Ersun Warncke
3bf57edd14
format fix
...
GitOrigin-RevId: 71faf86ccd19dfa6428c2d5bcc8c88ec7f0ee41f
2020-02-06 04:18:43 +00:00
Ersun Warncke
74ecb4bebe
clear rootDoc_id when deleting doc, reset on compiles if invalid
...
GitOrigin-RevId: 539982adbf55014400f4aff94195e7f567cda676
2020-02-06 04:18:37 +00:00
nate stemen
aa48d639a0
Merge pull request #2560 from overleaf/ta-group-admin-no-features
...
Don't Give Features To Group Admins
GitOrigin-RevId: 3588aff773bdc4cf18d18ce52f2c1b73462d806e
2020-02-04 04:18:55 +00:00
Simon Detheridge
dc35a7f75e
Merge pull request #2536 from overleaf/spd-projectstructuretests-cleanup
...
Clean up ProjectStructureTests helper methods
GitOrigin-RevId: bc2b5bd66fc875442a703a57ee79b3cca8585ba5
2020-01-28 04:18:40 +00:00
Eric Mc Sween
b055612e3c
Removal of default API passwords ( #2422 )
...
GitOrigin-RevId: d831adcf2fb8bec8792dda624c255474480bb897
2019-12-19 04:21:30 +00:00
Jessica Lawshe
1e8fc5337c
Merge pull request #2449 from overleaf/ew-user-helper-docs-and-tweaks
...
add docs on UserHelper and tweak a few things
GitOrigin-RevId: 410be6b3cdf32cc72e14e26569f56369ce30c0a2
2019-12-17 04:22:59 +00:00
Eric Mc Sween
a493ec94b2
Merge pull request #2414 from overleaf/ta-features-overrides
...
Persistent Features Override
GitOrigin-RevId: 9bb389458a4fde3cc36dbc5b8c3f7185b7e4e9bf
2019-12-02 14:09:53 +00:00
Eric Mc Sween
465329527b
Merge pull request #2398 from overleaf/ta-skip-registration-tests
...
Skip Registration-Related Tests in OSS Codebase
GitOrigin-RevId: 72647f6f54799145bf7bec93ad088c35ceae8fa6
2019-11-26 13:30:56 +00:00
Eric Mc Sween
0aafef36ca
Merge pull request #2397 from overleaf/ta-metrics-tests-move-redo
...
Move Metrics Acceptance Tests Redo
GitOrigin-RevId: 0fbc6e5c4c9f1da9b1f44356d7431b3426bd794d
2019-11-26 13:30:51 +00:00
Eric Mc Sween
3da8413156
Merge pull request #2369 from overleaf/em-imports-tpds
...
Defer flushing to TPDS on project import from v1
GitOrigin-RevId: f2782326716999c37565b3e527b54444bbc53711
2019-11-26 13:30:46 +00:00
Eric Mc Sween
78f6148ca1
Merge pull request #2393 from overleaf/em-revert-tests-move
...
Revert "move metrics authorization tests to module"
GitOrigin-RevId: 0f209d3deca731c2b1f34b4e9cabd174fa70877a
2019-11-21 14:54:38 +00:00
Eric Mc Sween
c419918e60
Merge pull request #2390 from overleaf/ta-metrics-tests-move
...
Move Metrics Acceptance Tests
GitOrigin-RevId: ac789ef9157615b89b1d63f28a2be090df5b62a8
2019-11-21 13:00:34 +00:00
Miguel Serrano
11419845e8
Remove v1 defaults ( #2391 )
...
GitOrigin-RevId: e9812c9d7785ac64500dcd3925a6b5be4cb04d7c
2019-11-21 10:24:41 +00:00
Miguel Serrano
475e6971a2
Revert "Remove settings.apis.v1 defaults ( #2365 )" ( #2388 )
...
This reverts commit 53d191a080fd50b83236f4e16a0dd10e72e705ad.
GitOrigin-RevId: 15b703670efd1cb13ebe9bd12015ec1109f60bb8
2019-11-20 12:06:18 +00:00
Simon Detheridge
81103c93e6
Add support for removing words from user dictionaries to admin panel ( #2371 )
...
* Add support for deletion of words from user dictionary to admin-panel
Co-authored-by: Jessica Lawshe <jessica.lawshe@overleaf.com>
* Add confirmation modal to dictionary word deletion
* Improve dictionary view with some helpful text
* Add MockSpellingApi
* Handle errors more cleanly in SpellingHandler
GitOrigin-RevId: a7d7f8bad120a15b0eaa7d77b5ee804998477ed1
2019-11-20 12:06:13 +00:00
Miguel Serrano
e4d180955f
Remove settings.apis.v1 defaults ( #2365 )
...
GitOrigin-RevId: 53d191a080fd50b83236f4e16a0dd10e72e705ad
2019-11-20 12:06:08 +00:00
Eric Mc Sween
4f9eb281b7
Merge pull request #2356 from overleaf/em-upgrade-test-deps
...
Upgrade test dependencies
GitOrigin-RevId: 0bda49dea086f525211836b6008f67bafa2bbe48
2019-11-18 14:53:42 +00:00
Ersun Warncke
af63c8de97
add email rate limiter on login
...
GitOrigin-RevId: a0da310e5537b420e46c9ed48f8b97051e7e933a
2019-11-13 12:55:30 +00:00
Shane Kilkelly
add98c889c
Merge pull request #2312 from overleaf/sk-fix-join-project-null
...
When we can't join project, produce a 403 response
GitOrigin-RevId: 7a52dd019ed33474e18cdb378fd3d4622f378e56
2019-11-07 10:48:40 +00:00
Shane Kilkelly
cbf08c599b
Merge pull request #2333 from overleaf/em-unhandled-rejections
...
Fail tests on unhandled promise rejection
GitOrigin-RevId: 3cc53ce5b46c63c62374eb83f9442b8d6979272e
2019-11-07 10:48:36 +00:00
Ersun Warncke
8d44f44784
finish saml link after sso login
...
GitOrigin-RevId: 688ce78ddfb0cfd6a025985dc2dd6f62bce76523
2019-11-06 12:45:58 +00:00
Ersun Warncke
9319229657
move institutional email check to overleaf-integration
...
GitOrigin-RevId: 3e08b1e86bb14d90115df5337cab5c36bb6a69fc
2019-10-28 08:36:36 +00:00
Simon Detheridge
2c147f575c
Merge pull request #2206 from overleaf/sk-restricted-users-redux
...
Update the joinProject api to include isRestrictedUser flag
GitOrigin-RevId: 38988b5c886e5355edc2edcd834ae6e334fc9f10
2019-10-18 16:41:24 +00:00
Ersun Warncke
0cc7783ad2
pr fixes
...
GitOrigin-RevId: 8bbe27be51951304673a21e7ba6cd1e7cef1ea60
2019-10-17 14:10:25 +00:00
Ersun Warncke
d59d8dddad
sso bailout pages
...
GitOrigin-RevId: e0e39268227896660a02d8b74cd00249bdf431eb
2019-10-17 14:10:19 +00:00
Ersun Warncke
849f21fde3
add saml acceptance tests. get/set entitlement.
...
GitOrigin-RevId: 65721aadb91678eafaf5a214a2921fe3dd276efa
2019-10-08 13:29:32 +00:00
Ersun Warncke
3a7384c83f
new UserHelper class for acceptance tests
...
GitOrigin-RevId: 194593b8b70c74d2771f8e6f695faa47c84beeca
2019-10-08 08:58:12 +00:00
Eric Mc Sween
45e5808a35
Merge pull request #2202 from overleaf/em-collab-set-permissions
...
Endpoint for setting a collaborator's permissions
GitOrigin-RevId: eb4d4dcc476908f5a42fefd7b81ef6fcc000be5b
2019-10-07 12:29:00 +00:00
Jessica Lawshe
4cce43b8d2
Merge pull request #2198 from overleaf/ta-user-membership-template-graph-fix
...
New Approach to Template Graph Access Fix
GitOrigin-RevId: 5865d8cfaf6f825f8cb76724a04091f3659f9f0f
2019-10-03 14:35:13 +00:00
Simon Detheridge
11ce07ec50
Merge pull request #1999 from overleaf/spd-migrations
...
Add database migrations using 'east'
GitOrigin-RevId: da067292e9db1fad050545858bc7cc39245d3395
2019-10-01 12:09:58 +00:00
Eric Mc Sween
3ec74ac6f2
Merge pull request #2164 from overleaf/em-ownership-transfer
...
Project ownership transfer backend endpoint
GitOrigin-RevId: b7d267f2c105e8f51d5013289ac4afeb077c1e21
2019-09-30 15:01:03 +00:00
Eric Mc Sween
a87a731d25
Merge pull request #2176 from overleaf/em-ta-json-auth
...
Make ensureUserCanAdminProject always raise a 403
GitOrigin-RevId: 4dd1eca1cfb171d92392bc3c8208b61cbf7c6815
2019-09-30 13:36:48 +00:00
Eric Mc Sween
9cd5af840a
Merge pull request #2152 from overleaf/as-per-user-trash-backend
...
Add per-user trash endpoint
GitOrigin-RevId: 94a6e3416b047e1f8721159ac0d049e98785e5ce
2019-09-26 12:56:02 +00:00
Eric Mc Sween
9a31361795
Merge pull request #2175 from overleaf/ta-user-membership-refactor-fix
...
UserMembershipAuthorization Refactor Fix
GitOrigin-RevId: ac404324728f4a3fe18e122c9e52ad4956ae47d7
2019-09-26 12:55:56 +00:00
Timothée Alby
a23ecc9bf8
Merge pull request #2105 from overleaf/ta-user-membership-refactor
...
UserMembershipAuthorization Refactor
GitOrigin-RevId: 7711cda4a134823cbacee42731319fbb8aa648d0
2019-09-24 08:58:05 +00:00
Simon Detheridge
696527df8d
Merge pull request #2153 from overleaf/spd-subscription-indexes
...
Make default for Subscription.manager_ids 'required'
GitOrigin-RevId: 18aa899736270bbb7eacbda53824a2ed52ca936f
2019-09-18 10:14:45 +00:00
Timothée Alby
0c9bf05a0a
Merge pull request #2139 from overleaf/ta-subscription-restore-misc
...
Restore Deleted Subscriptions Extra
GitOrigin-RevId: 6fceb1142af8ba510dc266ef31acc86ddca69f0e
2019-09-10 14:44:18 +00:00
Timothée Alby
71060e8d57
Merge pull request #2123 from overleaf/ta-subscription-restore
...
Restore Deleted Subscriptions
GitOrigin-RevId: 4df1d2116e5502235e06f47d7317d97ad458b75b
2019-09-10 14:28:55 +00:00
Hugh O'Brien
a319073a08
Merge pull request #2132 from overleaf/spd-collabratec-tests
...
Make collabratec tests not depend on previous run state
GitOrigin-RevId: 264f946e05b848fa253b6fbdd8e97a4998e4158e
2019-09-10 10:08:59 +00:00
Eric Mc Sween
d0fc8d90e5
Merge pull request #2119 from overleaf/ta-subscription-deletion
...
Store Deleted Subscriptions
GitOrigin-RevId: c7004f1807dee6b6ec82eeb2a8fe939801ce3e8b
2019-09-09 12:05:23 +00:00
Eric Mc Sween
3791b8d288
Merge pull request #2104 from overleaf/ta-user-membership-acceptance-tests
...
Acceptance Tests for UserMembership Authorization
GitOrigin-RevId: caad99727fd2fedc91f2b2063ed83a1e02d9ea1d
2019-09-03 15:24:53 +00:00
Eric Mc Sween
358cd22f54
Merge pull request #2087 from overleaf/subscription-invoices-link
...
Add Link to Invoices for Recurly Subscriptions
GitOrigin-RevId: dd3aa999c26988f2bd42b0db83dbfb0ce586a0a7
2019-08-20 12:59:58 +00:00
Miguel Serrano
9386bdeaff
Delete copybara sync server pro ( #2082 )
...
This actually reverts https://github.com/overleaf/web-internal/pull/2052
GitOrigin-RevId: c282655cf29533e8cb523f854247bd37396b1346
2019-08-16 14:27:30 +00:00
Miguel Serrano
e8790a638c
affiliations flag checks Settings.overleaf
( #2080 )
...
GitOrigin-RevId: c0dc5a8c1e6ad6c5ddb055ccfc21c901d66a9827
2019-08-15 14:00:24 +00:00
Brian Gough
9833f1ec93
Merge pull request #2060 from overleaf/spd-linkedfiletests-nondependent
...
Refactor and clean up LinkedFileTests to not be dependent on previous run
GitOrigin-RevId: 199a4ab6b463b2248244a067c765078816da182b
2019-08-14 15:19:40 +00:00
Simon Detheridge
6defe1a693
Make tests in RegistrationTests not depend on previous run state
...
GitOrigin-RevId: 68bcf9530ec6f5831c67449f35d0f010e5104f78
2019-08-13 08:50:19 +00:00
Simon Detheridge
67b68b0171
Change token-access acceptance tests to not depend on previous test runs ( #2063 )
...
GitOrigin-RevId: 3727af6743cc530fe4a9dc7ec787dad25f1eadef
2019-08-10 01:58:33 +00:00
Alasdair Smith
5b458e32ac
Merge pull request #2057 from overleaf/spd-promisify-userhelper
...
Add promisified version of User helper in acceptance tests
GitOrigin-RevId: ce2c28dd0d8ec66edaef54a260a3944f4cdd55d6
2019-08-09 09:53:58 +00:00
Simon Detheridge
7588393580
Merge pull request #2047 from overleaf/spd-eslint-mocha-arrows
...
Enforce consistent callback style in mocha tests
GitOrigin-RevId: a64c293dae6926ef5831abe97eaf2044942a5c85
2019-08-07 15:29:25 +00:00
Eric Mc Sween
7fcfbe8930
Merge pull request #2038 from overleaf/spd-refactor-project-structure-tests
...
Refactor ProjectStructureTests to not depend on previous run state
GitOrigin-RevId: c004e980406db0f0c547b9407a6f5a76cccabe03
2019-08-06 12:34:21 +00:00
Eric Mc Sween
1c43219315
Merge pull request #2039 from overleaf/spd-more-nondependent-tests
...
Replace before with beforeEach in (most) acceptance tests
GitOrigin-RevId: 888c320d5616d541c112c007c488c38448c4c88d
2019-08-06 12:34:15 +00:00
Eric Mc Sween
5d0c6cddf6
Merge pull request #2040 from overleaf/spd-projectinvite-tests
...
Ensure tests ProjectInviteTests are not dependent on previous test state
GitOrigin-RevId: 0db825789f86d2a22a8ad981d4d1875a93c83017
2019-08-06 12:34:10 +00:00
Ersun Warncke
d9b5941642
do not use v1 for setting default email
...
GitOrigin-RevId: 00d4610ae55c0a90699d4bc79e7d08d432087abe
2019-07-23 10:59:58 +00:00
Simon Detheridge
4cf480a448
Merge pull request #1965 from overleaf/jel-remove-v1-login
...
Remove login to v1 via v2
GitOrigin-RevId: e5ba86786d14c5a2be87aff6b38cfd807b5cd053
2019-07-22 15:31:24 +00:00
Simon Detheridge
bf740f1e25
Merge pull request #1959 from overleaf/spd-integration-soft-deletion
...
Integration: Merge soft-deletion features into master
GitOrigin-RevId: 83baf730be2f256ad0d02271600392fda144b761
2019-07-18 14:34:22 +00:00
Ersun Warncke
23ff7c23e8
add custom error page for v1 project if no overleaf id
...
GitOrigin-RevId: 538c68c568c9138f26353d5492f4aa9d66fbae19
2019-07-18 11:12:47 +00:00
Jessica Lawshe
ed6891e66d
Merge pull request #1961 from overleaf/jel-remove-force-import-feature-check
...
Remove checks for `force-import-to-v2`
GitOrigin-RevId: f94e8b0fb2f7f4416759583d5ca02babec345120
2019-07-11 15:35:36 +00:00
Jessica Lawshe
c8b6b83848
Merge pull request #1903 from overleaf/jel-oauth-email-notification
...
OAuth link/unlink email notification via v2
GitOrigin-RevId: 36b0c6153d3eb8174adc4fd684837d81be95b644
2019-07-11 15:35:25 +00:00
Jessica Lawshe
f8d895100a
Return custom error if provider linked to another account
...
GitOrigin-RevId: c34a615b210a22e220736c9ba44d17be5add491b
2019-07-03 08:50:51 +00:00
Miguel Serrano
27985458ea
Uploading an empty zipfile throws specific error ( #1909 )
...
Added a counter for the total files extracted from a zip. If no files are extracted a specific error is thrown.
GitOrigin-RevId: 391bb669500c86e2e7fecebd90e2201248a8afd3
2019-07-02 10:58:58 +00:00
Miguel Serrano
dc54a261e3
Merge pull request #1907 from overleaf/as-fix-tag-project-count
...
Fix tag project count
GitOrigin-RevId: 60236571403f8cc02f70bbe49e652ef18bbeab4d
2019-06-27 10:32:01 +00:00
Simon Detheridge
757ae39487
Merge pull request #1899 from overleaf/spd-implicit-return-tests
...
Decaf cleanup: Remove implicit return from 'it' and 'describe' in tests
GitOrigin-RevId: f297820e6212dddc0d60697a2fe1612ef27403b6
2019-06-21 13:58:57 +00:00
Timothée Alby
e659703745
Merge pull request #1842 from overleaf/ta-remove-v1-sync
...
Remove v1 Sync on Features Refresh
GitOrigin-RevId: a99e0a74c4fc503bf81d0b847b3f331b3228e24f
2019-06-11 13:34:11 +00:00
Miguel Serrano
9226237a36
Merge pull request #1837 from overleaf/msm-revert-commit-by-error-master
...
Revert "disabled logging during acceptance test execution"
GitOrigin-RevId: 5d613ef0abeb00b2c4b42a660fac95876aebcd46
2019-06-03 09:38:54 +00:00
Miguel Serrano
df026f9f81
disabled logging during acceptance test execution
...
GitOrigin-RevId: 185077cc0f0c8791bc063bd8da6dd755f94c74d6
2019-06-01 01:57:49 +00:00
Alasdair Smith
0ca81de78c
Merge pull request #1717 from overleaf/as-decaffeinate-backend
...
Decaffeinate backend
GitOrigin-RevId: 4ca9f94fc809cab6f47cec8254cacaf1bb3806fa
2019-05-29 09:32:21 +00:00
Ersun Warncke
8377005187
Revert "Revert "oauth and collabratec migration""
...
This reverts commit c8814e7fd85776feb37bf8fad95038349b36cd9a.
GitOrigin-RevId: 9deeb445917c856acee54ef793575c8ab9c81304
2019-05-14 10:24:04 +00:00
Ersun Warncke
9b24ed6daa
Revert "Revert "add thirdPartyIdentifiers to User model and add manager class""
...
This reverts commit df1b9355b1b28e3311bb9e5748df9db673d32ce5.
GitOrigin-RevId: bba2cc5217ce1d2b50a596be07a086b4d716786e
2019-05-14 10:23:46 +00:00
Ersun Warncke
934b70e96a
Revert "add thirdPartyIdentifiers to User model and add manager class"
...
This reverts commit 5839f1f43237c19efed7f4ce1dfb500da9327f70.
GitOrigin-RevId: df1b9355b1b28e3311bb9e5748df9db673d32ce5
2019-05-13 15:52:47 +00:00
Ersun Warncke
89ee728514
Revert "oauth and collabratec migration"
...
This reverts commit 4ac63921b030a01ed79bc0da1666d3c9f9545248.
GitOrigin-RevId: c8814e7fd85776feb37bf8fad95038349b36cd9a
2019-05-13 15:52:30 +00:00
Ersun Warncke
935877222a
oauth and collabratec migration
...
* make v2 system of record for collabratec id
* migrate oauth apps, tokens to v2
* set collabratec id on reg/link from ctec
* copy collabratec id from user stub to user on merge
GitOrigin-RevId: 4ac63921b030a01ed79bc0da1666d3c9f9545248
2019-05-13 12:04:56 +00:00
Ersun Warncke
8f339603f4
add thirdPartyIdentifiers to User model and add manager class
...
GitOrigin-RevId: 5839f1f43237c19efed7f4ce1dfb500da9327f70
2019-05-13 12:04:40 +00:00
Simon Detheridge
9808eb7f55
Merge pull request #1722 from sharelatex/jel-password-descriptive-message
...
Use descriptive error message for password reset
GitOrigin-RevId: f1f0bacd6397f2068ed2abc71ee6ec54b3a51aff
2019-04-25 14:37:21 +00:00
Timothée Alby
85e7f688d5
Display Pricing Exceptions on Subscription Dashboard ( #1720 )
...
Display Pricing Exceptions on Subscription Dashboard
GitOrigin-RevId: 31de89824db70b7af1f8704e6da592064ce44bfd
2019-04-23 14:35:21 +00:00
Jessica Lawshe
f455a11aa8
Merge pull request #1655 from sharelatex/jel-user-must-reconfirm
...
Reconfirm user accounts
GitOrigin-RevId: 0343ff745e881cd51b5efbfb97404b6b926905c8
2019-04-17 14:14:19 +00:00
Simon Detheridge
870f183595
Merge pull request #1476 from sharelatex/spd-character-sets
...
Detect encoding of non-utf8 files and convert during load
GitOrigin-RevId: 1856a42457c52b125793dd001b92a014f358da69
2019-03-11 11:04:22 +00:00
Brian Gough
43899589dc
Merge pull request #1514 from sharelatex/bg-avoid-text-html-content-type-in-responses
...
use explicit json content-type to avoid security issues with text/html
GitOrigin-RevId: 0c8d96a61380231c5f878572ed91b8ab24375f56
2019-03-11 10:58:32 +00:00
Simon Detheridge
7dcc807caf
Merge pull request #1479 from sharelatex/sk-check-read-token-against-v1
...
Check generated read-tokens against v1
GitOrigin-RevId: 15749a41a295c0401b0a39968f2c3657f8abebb8
2019-02-11 11:42:29 +00:00
Ersun Warncke
81e3db260c
Merge pull request #1472 from sharelatex/ew-add-close-site-and-private-disconnect-route
...
Add close site setting and private disconnect all users route
GitOrigin-RevId: d078c053ba4e5f5c048f30f2a6d509966736b3e0
2019-02-06 14:24:52 +00:00
Alasdair Smith
3af1ef48c2
Merge pull request #1423 from sharelatex/as-fix-non-existent-v1-token
...
Fix import page showing for non-existent v1 token
GitOrigin-RevId: cdce007b64d153505a15ec7b16fb4b9311ebf11b
2019-01-22 11:38:55 +00:00