Commit graph

18276 commits

Author SHA1 Message Date
Shane Kilkelly
8e6fa6c938 Re-add removed libs, needed by AWS SDK 2021-07-06 14:17:37 +01:00
Jakob Ackermann
03f6e8af64 [misc] expose merge function in a separate module 2021-07-06 13:52:59 +01:00
Simon Detheridge
6b4cee976a Merge pull request #132 from overleaf/spd-binutils
Add binutils and graphviz to Docker image
2021-07-06 08:55:53 +01:00
Alexandre Bourdin
89b031a21a Merge pull request #4240 from overleaf/ns-trim-urls
Trim outer whitespace when adding file from external URL

GitOrigin-RevId: b85b1aac81a138d7ebc11b36f180468cdf778b8c
2021-07-06 02:05:58 +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
Thomas
f6c6a06b80 Upgrade passport-saml to overleaf fork of 3.0.0 and xml-crypto to 2.1.2 (#4190)
* Use overleaf fork of passport-saml and remove existing monkey patch

* Update xml-crypto to 2.1.2

* New way of loading MultiSamlStrategy

* Rename privateCert privateKey

* Add promisified SAML Cache Provider functions for passport-saml 3.0.0

* Remove test which checked xml-crypto version for old patch

* Sign mock SAML responses with test saml-key and provide saml-cert to test settings

* Decaffeinate createMockSamlResponse.js

* Add (unused) cert property to SAML config for metadata endpoint

Removes non-needed `cert` property from `settings.test.js`

* Allow SAMLManager to accept either privateKey or privateCert (legacy) config keys

Co-authored-by: Christopher Hoskin <christopher.hoskin@gmail.com>
GitOrigin-RevId: bdb9d1c9bf72a7fbf60c0b2afa9068e7a8c147d3
2021-07-06 02:05:50 +00:00
Alf Eaton
34ba76aa76 Merge pull request #4286 from overleaf/jpa-clear-clsi-unavailable-state
[frontend] PdfController: clear clsiUnavailable state for new responses

GitOrigin-RevId: 7a89a24db6c8f0e62e775befcb4148e749ce8b4e
2021-07-06 02:05:46 +00:00
Alf Eaton
2be1a44eda Merge pull request #4257 from overleaf/ae-file-views-beta
Roll out new file view UI to beta users

GitOrigin-RevId: c8665c5043ad55dd530989fb3b9c51f21858fcac
2021-07-06 02:05:42 +00:00
Simon Detheridge
14f459870a Add binutils and graphviz to Docker image 2021-07-05 17:31:17 +01:00
Jakob Ackermann
d12fa9e35e Merge pull request #258 from overleaf/jpa-clsi-perf-downloads
[UrlFetcher] do not override domain for clsi-perf requests
2021-07-05 10:02:31 +02:00
CloudBuild
3fb6ea4ea5 auto update translation
GitOrigin-RevId: d9d09dcfa5660f9924fab51d77023d31a0293f32
2021-07-05 02:05:59 +00:00
CloudBuild
4bf722ef3c auto update translation
GitOrigin-RevId: 96f081c3334444ddaf3d9fc8685bc3bb88c23e23
2021-07-03 02:09:21 +00:00
Eric Mc Sween
e6b805b885 Merge pull request #4242 from overleaf/ho-paypal-script-exit-code
exit with non zero code when no invoicess were processed

GitOrigin-RevId: df449964fc830f689d972d9ad3ed6b352c1b7c5c
2021-07-03 02:09:17 +00:00
Eric Mc Sween
9820b787a7 Merge pull request #4254 from overleaf/em-active-projects-expire
Unit test for not expiring active projects

GitOrigin-RevId: 8b2f3d05c7f7e4c4d44e5487041f19d2bff9891a
2021-07-03 02:09:12 +00:00
Eric Mc Sween
a966a5f9d7 Merge pull request #4255 from overleaf/em-active-projects-expire-2
Create the deleted project record later when deleting a project

GitOrigin-RevId: 2ed21fb4623f4f27be0ed6ca8132cd81aa0a7ced
2021-07-03 02:09:07 +00:00
Simon Detheridge
e505ecc8c0 Revert "Merge pull request #129 from overleaf/spd-jeprof"
This reverts commit 4268e58ff36bd591d40e3730446b691440c34409, reversing
changes made to 6c1eaae2eeb4949b7466c36d4a2e722697294c0b.
2021-07-02 17:04:41 +01:00
Simon Detheridge
187dfa82e5 Merge pull request #130 from overleaf/spd-apachecommons
Upgrade apache commons to 3.12
2021-07-02 16:00:15 +01:00
Simon Detheridge
adcd156470 Merge pull request #129 from overleaf/spd-jeprof
Add jemalloc/jeprof profiling
2021-07-02 15:59:57 +01:00
Simon Detheridge
12dab1bcd4 Upgrade apache commons to 3.12 2021-07-02 14:44:15 +01:00
Simon Detheridge
9a7ba7f04f Add jemalloc/jeprof profiling 2021-07-02 13:16:31 +01:00
Jakob Ackermann
516525126b [UrlFetcher] do not override domain for clsi-perf requests 2021-07-02 09:17:29 +01:00
Shane Kilkelly
36982a59e7 Merge pull request #115 from overleaf/dependabot-maven-junit-junit-4.13.2
Bump junit from 4.12 to 4.13.2
2021-07-01 16:00:40 +01:00
Shane Kilkelly
5877f57a36 Merge pull request #116 from overleaf/dependabot-maven-org.apache.commons-commons-compress-1.20
Bump commons-compress from 1.15 to 1.20
2021-07-01 16:00:26 +01:00
Shane Kilkelly
d0166ceb01 Merge pull request #117 from overleaf/dependabot-maven-com.google.guava-guava-30.1.1-jre
Bump guava from 24.0-jre to 30.1.1-jre
2021-07-01 16:00:14 +01:00
Shane Kilkelly
3c04d8554b Merge pull request #119 from overleaf/dependabot-maven-commons-io-commons-io-2.10.0
Bump commons-io from 2.6 to 2.10.0
2021-07-01 16:00:03 +01:00
Shane Kilkelly
88259ba3ec Merge pull request #126 from overleaf/sk-upgrade-jgit-5.12
Upgrade jgit to version 5.12
2021-07-01 15:59:51 +01:00
Shane Kilkelly
a8aa1dde79 Merge pull request #127 from overleaf/spd-reupgrade-jetty-again
Revert jetty downgrade
2021-07-01 15:59:37 +01:00
Shane Kilkelly
ef9c2363e1 Merge pull request #128 from overleaf/sk-upgrade-sqlite
Upgrade sqlite jdbc library to 3.36.0.1
2021-07-01 15:59:26 +01:00
Shane Kilkelly
49aa2ef845 Fix query for oldest (un-swapped) project 2021-07-01 14:57:58 +01:00
Shane Kilkelly
9170f6fdb3 Upgrade sqlite jdbc library to 3.36.0.1 2021-07-01 14:35:30 +01:00
Miguel Serrano
7430d7f558 Merge pull request #4287 from overleaf/jpa-no-analytics-queues-server-ce-pro
[misc] do not set up analytics queues in Server CE/Pro

GitOrigin-RevId: 61a62f0ff7f04d5206845e01c68097229a5954fd
2021-07-01 12:30:26 +00:00
Miguel Serrano
37a50e295a [ServerPro] Removed SaaS views in admin panel and user settings (#4263)
* Removed SaaS views from SP admin panel and user settings

* Hiding must reconfirm for server pro and restored site admin

* Removed empty 'security' section

GitOrigin-RevId: 9ad8e2b7510cf957ccf3f968a53fa88d3174a64b
2021-07-01 12:30:21 +00:00
CloudBuild
59be5e4ce8 auto update translation
GitOrigin-RevId: abf8fe0ccb401e08aa153429407db6da9006557f
2021-07-01 12:30:14 +00:00
Miguel Serrano
19d515fe91 Push React Navigation Toolbar to beta (#4283)
GitOrigin-RevId: 56078b62faeeaf6e994c23b73061705834c3211d
2021-07-01 12:30:10 +00:00
Miguel Serrano
19bd381a9e Improve Server Pro Template dialogs (#4282)
GitOrigin-RevId: 9d4368b7bef47c212fedfce49946b1d15e2e21ff
2021-07-01 12:30:05 +00:00
Miguel Serrano
cbb0fd41e2 Merge pull request #4273 from overleaf/msm-update-publish-modal-permissions
User 'write' permission to display the publish button

GitOrigin-RevId: f73ccf05b165ef1ef9e57e3aea4c04d177aba6d4
2021-07-01 12:29:59 +00:00
Miguel Serrano
1419129348 Fixed duplicated key in Collaborator icons (#4272)
GitOrigin-RevId: f0bfc27de0764f3347e6b4cf342a1be574e3e916
2021-07-01 12:29:54 +00:00
Miguel Serrano
ab15252843 Fixed errors with anonymous track changes (#4260)
GitOrigin-RevId: 63806b22e95ff80ec78d53170f6dc823196f5eac
2021-07-01 12:29:50 +00:00
Jakob Ackermann
343ab44172 Merge pull request #4279 from overleaf/bg-revert-async-apply-in-pdfcontroller
revert async apply in PdfController

GitOrigin-RevId: 20628ca8c9ba06528271e1323ba062d6b563e08e
2021-07-01 12:29:45 +00:00
Jakob Ackermann
018eedece6 Merge pull request #256 from overleaf/jpa-more-timings
[misc] add timings for the sync stage and output stage
2021-07-01 13:06:36 +02:00
Jakob Ackermann
ec36ad2020 Merge pull request #257 from overleaf/revert-251-ho-load-shed-mvp
Revert "very basic mvp for shedding load"
2021-07-01 13:06:04 +02:00
Jakob Ackermann
b62b96cb1c Revert "very basic mvp for shedding load" 2021-07-01 11:57:03 +01:00
Simon Detheridge
33b6ffd4a2 Drop default jetty idle timeout to 30sec 2021-07-01 11:46:42 +01:00
Simon Detheridge
f8f60eabad Revert "Merge pull request #125 from overleaf/spd-revert-jetty-changes"
This reverts commit 9c324c378c46aa8b4b14e529e90ad9cbfca969cd, reversing
changes made to 63ccd609405952aa8749299c8a5cf7895f14a1bd.
2021-07-01 11:45:16 +01:00
Shane Kilkelly
93de1d0946 Upgrade jgit to 5.12.0 2021-07-01 09:37:53 +01:00
Jakob Ackermann
efa0c54ca5 [misc] add timings for the sync stage and output stage 2021-06-30 11:45:34 +01:00
Jakob Ackermann
103873a013 Merge pull request #4275 from overleaf/jpa-drop-slow-compile-request-bailout
[misc] drop slow compile request bailout

GitOrigin-RevId: b5eec86878fbc7220dfe163241f29a3f5851c19f
2021-06-29 02:06:04 +00:00
Alf Eaton
55ca4783fb Remove React memo from preview pane
GitOrigin-RevId: 27c953ff7727a7898587d9e43e18c6cc9295c23b
2021-06-29 02:06:00 +00:00
Paulo Jorge Reis
4e384e0c3b Revert "Handle PDF failure error case"
This reverts commit 902a97f6f454f09345ba4017b50623fd46e57110.

GitOrigin-RevId: 946838e51feaff28025c4a4d733e0dd89a29e890
2021-06-29 02:05:56 +00:00
Paulo Jorge Reis
f4822e4407 Revert "Improve copy for single errors or warnings"
This reverts commit 1fdd270d4148abd0385e4258bb634cf769cce8c5.

GitOrigin-RevId: f01e0726b9a0119bc7f8bda3a98c2c0df5026e51
2021-06-29 02:05:52 +00:00