Commit graph

21010 commits

Author SHA1 Message Date
Jakob Ackermann
79f7d259e9 Merge pull request #11833 from overleaf/jpa-v2-fallback
[access-token-encryptor] scripts: fallback version to v2

GitOrigin-RevId: 232e6b1f6b8667a58c5fd0f5caf604209f100809
2023-02-16 09:04:39 +00:00
Jakob Ackermann
d06a578492 Merge pull request #11816 from overleaf/jpa-re-encrypt-v2
[access-token-encryptor] flag v2 tokens for re-encryption

GitOrigin-RevId: 4ccb6d220d74a821f2fef8c72267f174cc2c502f
2023-02-16 09:04:31 +00:00
Christopher Hoskin
b531105446 Merge pull request #11807 from overleaf/csh-issue-11777-use-upstream-passport-saml
Use upstream passport-saml 3.2.3

GitOrigin-RevId: b2c951686ba859f15e87709d257ebd6b034689b0
2023-02-16 09:04:05 +00:00
Jakob Ackermann
82d59a18d9 Merge pull request #11536 from overleaf/jpa-access-token-encryptor-v3
[access-token-encryptor] rewrite module and add scheme v3

GitOrigin-RevId: d23ec86d63739a61f1e45f04ed41ea7d991ddb0e
2023-02-15 09:05:12 +00:00
Davinder Singh
c524fee690 Merge pull request #11694 from overleaf/ab-managed-institutions-react
[web] Migrate managed institutions to React dash

GitOrigin-RevId: 535dfafe42d88189bb20e7bb3beac233221ee6ba
2023-02-15 09:04:55 +00:00
Davinder Singh
ba2d5db50c Merge pull request #11670 from overleaf/ab-manage-members-back-button
[web] Add a back button on the members/managers management pages

GitOrigin-RevId: 7a723853683438ebac91eb534f9fb9a445a306c9
2023-02-15 09:04:46 +00:00
Davinder Singh
de245c288a Merge pull request #11653 from overleaf/ds-documentation-btn-on-editor
Adding documentation button on the editor

GitOrigin-RevId: e03fd7b931eb0fe7273e6e9d0185c81c384df916
2023-02-15 09:04:37 +00:00
Jakob Ackermann
ce1c9713bd Merge pull request #11809 from overleaf/jpa-fix-is-old-domain-flag
[web] user-content-domain-access-check: fix isOldDomain flag

GitOrigin-RevId: 56332dbb414fcfb7e5833cb9af21bee6ef69253f
2023-02-14 09:04:41 +00:00
Thomas
f7e632ceb9 Merge pull request #11808 from overleaf/mf-appName-resolution-bug-string
Fix `appName` does not properly transformed on some strings

GitOrigin-RevId: be2f8a4a33fc30b1d8465f88522d69c3004bf00c
2023-02-14 09:04:33 +00:00
ilkin-overleaf
c09e29c040 Merge pull request #11751 from overleaf/ii-payment-page-stories
[web] Payment page stories

GitOrigin-RevId: 9f8aff0cf839bc811d8612e97bd627b577860cc8
2023-02-14 09:04:25 +00:00
Jakob Ackermann
9eff0140a9 Merge pull request #11761 from overleaf/jpa-access-check-noise-metric
[web] optionally run access check on old compile domain

GitOrigin-RevId: 02fba931726cdfe1dad763e73e6306b041ce8ea5
2023-02-14 09:04:17 +00:00
Jakob Ackermann
e525c4c58d Merge pull request #11758 from overleaf/jpa-metric-max-access-checks-hit
[web] add metric for hitting limit on new compile domain access checks

GitOrigin-RevId: 58df0911a411dd77698932e13d212cf15b4c8931
2023-02-14 09:04:09 +00:00
Thomas
c52799798d Merge pull request #11781 from overleaf/tm-merge-group-subscription-members-script
Add script to merge group subscription members

GitOrigin-RevId: 4a3633320624e0c0514ed58cf792f2a921b0867a
2023-02-14 09:04:01 +00:00
Jakob Ackermann
0b82db0abe Merge pull request #11804 from overleaf/jpa-fix-fs-persistor-nested-layout
[object-persistor] forward settings.useSubdirectories to FSPersistor

GitOrigin-RevId: 92cef51c392cfeaebbcca2597740562c1f3fc95f
2023-02-13 14:41:08 +00:00
Jakob Ackermann
8a60ae1fae Merge pull request #11803 from overleaf/jpa-whitespace-fix
[server-ce] trim trailing space in docker-compose.yml

GitOrigin-RevId: a814450e59bde888ac479863772448ae2d11a32b
2023-02-13 14:40:59 +00:00
Jakob Ackermann
249ea67511 Merge pull request #11802 from overleaf/jpa-server-ce-fix-closing-site
[web] move config option siteMaintenanceFile into server-ce config

GitOrigin-RevId: 278495820cbbd2afa916246fbf309d5ee36325f5
2023-02-13 12:40:02 +00:00
Jakob Ackermann
ed2b96276d Merge pull request #11770 from overleaf/jpa-flag-403
[web] catch unexpected response status codes from user content domain

GitOrigin-RevId: 654141e1be8721f92be271733aca70a7bc672973
2023-02-13 10:26:28 +00:00
Miguel Serrano
577a8a3ee2 Merge pull request #11791 from overleaf/msm-track-changes-flush-fix
[track-changes] add `waitForDb` to `scripts/flush_all.js`

GitOrigin-RevId: 318c0b4334bd70dddb3b5fe585e70c51d54af491
2023-02-13 10:06:35 +00:00
CloudBuild
04865b1285 auto update translation
GitOrigin-RevId: c0b623836d6eba4d55827d29d6c6cc4ab99997e2
2023-02-13 10:06:27 +00:00
CloudBuild
a6e41dc062 auto update translation
GitOrigin-RevId: d4ed529006202d96a6a8ea5f628351385955766e
2023-02-13 09:03:53 +00:00
Miguel Serrano
67ba7b1fe3 Merge pull request #11788 from overleaf/msm-missing-quote
[CE] added missing quote in shutdown script

GitOrigin-RevId: 76e16bcc1cab29c6cdf261ec7e425adc5520d8f4
2023-02-11 08:41:21 +00:00
Miguel Serrano
d639e2421d Merge pull request #11786 from overleaf/msm-compose-timeout
[CE] Add `stop_grace_period: 60s` to `docker-compose.yml`

GitOrigin-RevId: 3013ed420ca20c236bacd15d07c0797d3299c6e7
2023-02-10 16:33:58 +00:00
Miguel Serrano
976e0d5e8f [CE] Set Phusion Image timeouts in Dockerfile (#11785)
GitOrigin-RevId: 6ce852e44093d44e66d9f394c6ef4ef9d88d1373
2023-02-10 16:33:50 +00:00
Jakob Ackermann
4e885da597 Merge pull request #11782 from overleaf/jpa-server-ce-history-s3
[server-ce] s3 settings for history-v1

GitOrigin-RevId: 51d5c6b3a67339b126ccbaa61d78f3cd36377e79
2023-02-10 16:33:43 +00:00
Jakob Ackermann
c7f03c1b23 Merge pull request #11783 from overleaf/jpa-fix-server-ce-history
[server-ce] fix bucket locations for history-v1

GitOrigin-RevId: a1709a72438d0cf36fa8679d90f6322c24d97fc7
2023-02-10 16:33:36 +00:00
Mathias Jakobsen
6e421f8754 Merge pull request #11765 from overleaf/mj-count-images
[web] Add script for counting images in Mongo

GitOrigin-RevId: 1f2795d73d9afa0f0ae46b1e29a03a93b1d85ee5
2023-02-10 16:33:22 +00:00
June Kelly
53b78ad68b Merge pull request #11590 from overleaf/jk-password-reset-ux-improvements
[web] Password Reset UX Improvements

GitOrigin-RevId: d62575ff965e045823bfb7268db892188cf709ed
2023-02-10 16:33:14 +00:00
CloudBuild
24e7bb08d3 auto update translation
GitOrigin-RevId: ae2c02198655faa096896c63ac35ef8a5629884f
2023-02-10 16:33:06 +00:00
Miguel Serrano
2113038536
Merge pull request #1090 from overleaf/msm-sigkill-env
added SIGKILL timeouts for docker and phusion_image
2023-02-10 16:29:26 +01:00
Miguel Serrano
542d549bbc
added SIGKILL timeouts for docker and phusion_image 2023-02-10 16:09:54 +01:00
Miguel Serrano
286cbc66a8 Merge pull request #11771 from overleaf/msm-force-ace-sp
[web] Force Ace editor in Server Pro

GitOrigin-RevId: 1ea5675ad1c64a15dc30566c02d694feb2aaed3c
2023-02-10 09:12:26 +00:00
Jakob Ackermann
9cf1373777 Merge pull request #11769 from overleaf/jpa-s3-config
[server-ce] add support for s3 backend in filestore

GitOrigin-RevId: 20998547326e75acf22562d2964db78ae261b6bf
2023-02-10 09:12:23 +00:00
CloudBuild
583a27cfb6 auto update translation
GitOrigin-RevId: f980fe62ac0d6caf67b72c5837b45c3bdabb84d7
2023-02-10 09:04:27 +00:00
M Fahru
811b224d81 Update req.i18n.translate to contains better filtering security and inject appName variable by default to all translation keys (#11312)
Also remove the unused translate wrapper function since the content has been imported directly in the `req.i18n.translate`

GitOrigin-RevId: ed9cee76783e4d41819845a82f66afaed47e2ebd
2023-02-10 09:04:19 +00:00
M Fahru
9719b0439c Tear down recompile button text split test (#11637)
GitOrigin-RevId: 574ebeda9517cc54e04362395a90584703198d9f
2023-02-10 09:04:12 +00:00
M Fahru
6da0a8ddf7 Clean up old new file modal since it has been migrated fully to react (#11755)
GitOrigin-RevId: f17aea302d4bac932877ed0b2d733633328ff469
2023-02-10 09:03:51 +00:00
Miguel Serrano
ef499680aa Merge pull request #11708 from overleaf/bg-reinitialise-project-history
allow re-initialisation of history

GitOrigin-RevId: 85caf506df736917f6870f68b3bfab46d57aa28e
2023-02-09 14:34:56 +00:00
Miguel Serrano
98cf5765e9 Merge pull request #11287 from overleaf/bg-clear-first-op-timestamp-2
clear the first op timestamp whenever the queue is processed (2nd attempt)

GitOrigin-RevId: 0764ca6360b2a9203e5d32499213b312563a2c47
2023-02-09 14:34:49 +00:00
Eric Mc Sween
25f75bbc41 Merge pull request #11661 from overleaf/jpa-cleanup-clsi
[clsi] delete unused DbQueue module and related config option

GitOrigin-RevId: d9f1f84f82149efe1d7cdd75b2b45ba78e4defd2
2023-02-09 14:34:42 +00:00
Eric Mc Sween
74eeec2ba3 Merge pull request #11680 from overleaf/em-mongo-pool-monitoring
Mongo connection pool monitoring

GitOrigin-RevId: 050e50e7e67061ccbf39a710ca4532eafd423365
2023-02-09 14:34:35 +00:00
Eric Mc Sween
5683cebf71 Merge pull request #11679 from overleaf/em-upgrade-prom-client
Upgrade prom-client library in metrics

GitOrigin-RevId: 4ff60d94b17e7f236d4b40103365ed6fe1515148
2023-02-09 14:34:28 +00:00
ilkin-overleaf
b0841592c7 Merge pull request #11646 from overleaf/ii-payment-page-payment-preview-panel
[web] Payment page payment preview panel

GitOrigin-RevId: 35f2e11a9a80e8b240dc8485b8062cf33d5b40b4
2023-02-09 14:34:18 +00:00
CloudBuild
a010822246 auto update translation
GitOrigin-RevId: 959dc7e518489f89e47de485d5bf2e20f38a90d1
2023-02-09 09:07:29 +00:00
Christopher Hoskin
574f2733d3 Merge pull request #11716 from overleaf/csh-fix-idp
Get the mock IdP running in the dev environment again

GitOrigin-RevId: 927133ca4118d75ce678787d980d92bb1ad4eb91
2023-02-09 09:07:21 +00:00
Tim Down
7c7f8c1573 Merge pull request #11733 from overleaf/msm-close-site-sp-shutdwn
[CE/SP] close site on shutdown before flushing

GitOrigin-RevId: e36c80f2f4c6f10eda3a536319a2fcc5dfda4fa4
2023-02-09 09:07:07 +00:00
Tim Down
1a4011fb61 Merge pull request #11732 from overleaf/td-remove-cm6-indentation-markers
[cm6] Remove indentation markers for now

GitOrigin-RevId: 0281abf1dc27a68ce41e99e1ebd5f00266b1e362
2023-02-09 09:06:53 +00:00
Brian Gough
af96eb6941 Merge pull request #11746 from overleaf/bg-remove-flush-track-changes-script
remove old flush_track_changes script

GitOrigin-RevId: be6e1f5572359ad3805cf0bcbf18817ecaaa5d41
2023-02-09 09:06:45 +00:00
Miguel Serrano
909bb99b9f [CE/SP] Flush redis on docker stop (#11714)
* [CE/SP] Flush redis on `docker stop`

* Extracted `limit` to variable

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

* Increased logging

---------

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
GitOrigin-RevId: 4bcb4e70988337369acca0e80f243609bd6323ed
2023-02-09 09:06:37 +00:00
Eric Mc Sween
204e7a0c87 Merge pull request #11719 from overleaf/em-survey-sidebar
Make survey notification the width of the dashboard sidebar

GitOrigin-RevId: 754ec21692505107e683369628a2b5481e7cef9a
2023-02-09 09:06:29 +00:00
Thomas
6ca86168b1 Merge pull request #11741 from overleaf/tm-fix-foreach-invite-email-lowercase-script
Bugfix for script to fix lowercase emails in group invites

GitOrigin-RevId: f8581376fa5dde2fe057f0e988e5921de7446612
2023-02-09 09:06:22 +00:00