Commit graph

9093 commits

Author SHA1 Message Date
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
506543d6a0 Merge pull request #2605 from overleaf/jel-sso-registration
Do not block SSO registration on nonessential errors

GitOrigin-RevId: c9d6a7803aa8a48dbc1a8aae84d6f2588bad654e
2020-02-21 04:21:07 +00:00
Timothée Alby
b94e1791e0 Merge pull request #2617 from overleaf/ho-open-site-for-admins
allow site to be accessible to admins when closed

GitOrigin-RevId: 71bdf329ce2a4e41533b2a65f45190277ea72dbb
2020-02-21 04:21:03 +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
nate stemen
ab5101f189 Merge pull request #2613 from overleaf/spd-tags-timeout
Use a longer timeout when talking to the tags API

GitOrigin-RevId: 467f981c1818293c28dd288d7223540597a8ca3e
2020-02-21 04:20:55 +00:00
nate stemen
10d6a9b7f2 Merge pull request #2589 from overleaf/ns-hide-v1-projects
ensure v1 projects folder not shown on dashboard if empty

GitOrigin-RevId: d8c0f1352fc2e8d891eb76f7d1ef00126a4f581e
2020-02-21 04:20:49 +00:00
nate stemen
3b70e080b1 Merge pull request #2601 from overleaf/jpa-hotfix-autocomplete-deleted-docs
[autocomplete] ignore deleted docs for completion

GitOrigin-RevId: 9f39bbb90d443e7a1691ff5558742e4d12f4eb4d
2020-02-21 04:20:45 +00:00
Simon Detheridge
cae6cf6efa Merge pull request #2592 from overleaf/jel-html-inst-table-script
Add script to generate institution row in list

GitOrigin-RevId: 8dfb7396626c229ff2a7e9441a3fa5ae247d06bb
2020-02-19 04:20:51 +00:00
Simon Detheridge
ab80c72565 Merge pull request #2602 from overleaf/hb-too-many-files-errors
Too many files errors for new files modal

GitOrigin-RevId: a9e2db2e4d8624de4e062161781067ee0c68c4e0
2020-02-19 04:20:47 +00:00
Simon Detheridge
bb3394885c Merge pull request #2604 from overleaf/cmg-duplicate-modal-root
Stop duplicate file modal appearing when moving back to original folder - root edition

GitOrigin-RevId: 11fe3b2457190f8bada010a344143a66b8967f34
2020-02-19 04:20:43 +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
Simon Detheridge
19266bbc8a Merge pull request #2598 from overleaf/sk-upgrade-mongoose-4.13.19
Upgrade mongoose to 4.13.19

GitOrigin-RevId: 73c111d5d351a16efc01738e2148e9ab5daf4541
2020-02-19 04:20:34 +00:00
Timothée Alby
cd9a9b43bd Merge pull request #2606 from overleaf/ta-check-sso-users
Add SSO Users Info on Users Features Check Summary

GitOrigin-RevId: 5c874e1bf50005eb311317b867b17380ca017118
2020-02-15 04:17:53 +00:00
Brian Gough
69a98355ce Merge pull request #2599 from overleaf/bg-fix-safepath-check
fix safepath check

GitOrigin-RevId: b5bb636d2bd958ab142fa94683ad9cf58369a77d
2020-02-14 04:16:44 +00:00
Simon Detheridge
1c6ad2b7db Merge pull request #2569 from overleaf/as-build-changes
Build changes required for passing secrets into docker build

GitOrigin-RevId: 46c221bd0f0e3ec4ec02384afb252c532d688516
2020-02-13 04:20:58 +00:00
Simon Detheridge
de40289b38 Merge pull request #2588 from overleaf/ns-add-text-extensions
add more extensions to editable files

GitOrigin-RevId: f2a52eee148a78c8cb3623f27e25f2e0801ef835
2020-02-13 04:20:53 +00:00
Simon Detheridge
9e6323caeb Merge pull request #2584 from overleaf/spd-duplicate-deleted-things
Prevent creation of (and clean up) duplicate deletedUsers and deletedProjects

GitOrigin-RevId: 5e52578b514f05779290c61cf7d4e630cc3ba6f7
2020-02-13 04:20:49 +00:00
Simon Detheridge
73defe82d9 Merge pull request #2561 from overleaf/pr-reduce-spellcheck-initial-req
Reduce spellcheck initial (and subsequent) requests

GitOrigin-RevId: 81eee359ea1bc740991ba84b0fe121c37cb4c6a2
2020-02-13 04:20:44 +00:00
Simon Detheridge
72c5286622 Merge pull request #2587 from overleaf/msm-ns-disable-comment-button
disable "add comment" button if feature is not available

GitOrigin-RevId: e054f138a84ec634cc777d76e8a288ba2c1b2ee3
2020-02-13 04:20:40 +00:00
Simon Detheridge
96cd1c869e Merge pull request #2583 from overleaf/spd-no-mongoredis-in-unittests
Clean up attempts to connect to Mongo and Redis in unit tests

GitOrigin-RevId: 396813a04fc2aaf39a07e28613f8f1e0a7a2db8f
2020-02-13 04:20:35 +00:00
Jakob Ackermann
5c7251afce Merge pull request #2596 from overleaf/jpa-build-scripts-1-3-5
[misc] align the Dockerfile to the build scripts version 1.3.5

GitOrigin-RevId: cdda059b68068b9b4de87520cff91ce179426836
2020-02-13 04:20:31 +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
Chrystal Maria Griffiths
3785be1fec Merge pull request #2566 from overleaf/cmg-invalid-filename
Suppress error for empty filename when still editing

GitOrigin-RevId: 42d7fa9af9b183603577effb5d1daaafa21ce065
2020-02-13 04:20:22 +00:00
Brian Gough
80e9afe42c Merge pull request #2586 from overleaf/bg-simplify-rate-limit-metrics
simplify metric for rate limits

GitOrigin-RevId: bba98c7e38846aedcfcf0781003f755e302f7759
2020-02-13 04:20:17 +00:00
Jessica Lawshe
401ed57890 Merge pull request #2577 from overleaf/jel-notifications-decaf-cleanup
Decaf cleanup for notifications on dashboard

GitOrigin-RevId: ee8b30cf3af8078d8455bd85b89e6156f3993412
2020-02-12 04:21:14 +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
Jessica Lawshe
222ba263ff Merge pull request #2552 from overleaf/jel-update-pdfjs
Update PDF.js

GitOrigin-RevId: 231ab11eccc32e4eddc87fc8829dd28843e41a51
2020-02-12 04:21:05 +00:00
Ersun Warncke
353625be51 Revert "Revert "Revert "decaf clean up"""
This reverts commit 4a3933668a0d01912e748c164581bcb9bbded0dd.

GitOrigin-RevId: 829a5c65093200db066f5852e42bd4f88d4c299a
2020-02-12 04:21:00 +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
02140124bd Revert "Revert "Revert "wip"""
This reverts commit 80bc280977d25e3ba554c32242fddfb3e15915e6.

GitOrigin-RevId: 563ed572aad616d98cd81e0acf649df8f063aa3a
2020-02-12 04:20:47 +00:00
Ersun Warncke
9228fbd026 Revert "Revert "Revert "optimize rootDoc_id validation"""
This reverts commit f015bc2bb54e98d1271bc2417647638aa80ba843.

GitOrigin-RevId: ca8380891a0e71713ed33f200720a9ab92db6ef3
2020-02-12 04:20:43 +00:00
Ersun Warncke
9c61681ae2 Revert "Revert "Revert "log errors"""
This reverts commit 3911f3380767ae2e24b3694ef21c4eb73a7219b3.

GitOrigin-RevId: 9b2fe77881ab871f0919487b45b4fc78c48147fd
2020-02-12 04:20:38 +00:00
Ersun Warncke
67e89b9d80 Revert "Revert "Revert "add ensureRootDocumentIsValidForProject method"""
This reverts commit aced9579ed1f4b0ab1780be0f4f45ae8d6a405a5.

GitOrigin-RevId: 90df39b8b90197c53ee80ffbb9ee61fa3b4ba905
2020-02-12 04:20:34 +00:00
Ersun Warncke
b1c904f824 Revert "Revert "Revert "use ProjectRootDocManager in ClsiManager"""
This reverts commit 14c94880804a3567e2b91e314a707a47bb74be2c.

GitOrigin-RevId: 9039335d01e90cf240f627a7c35889c9ab994a63
2020-02-12 04:20:30 +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
22fcbe8648 Revert "Revert "use ProjectRootDocManager in ClsiManager""
This reverts commit 98c0b9246eb29a9d0bdab14a04d456473a1b4a14.

GitOrigin-RevId: 14c94880804a3567e2b91e314a707a47bb74be2c
2020-02-12 04:20:08 +00:00
Ersun Warncke
725a3c5282 Revert "Revert "add ensureRootDocumentIsValidForProject method""
This reverts commit 80bb46f92f200f48fc39138afb27df729959888c.

GitOrigin-RevId: aced9579ed1f4b0ab1780be0f4f45ae8d6a405a5
2020-02-12 04:20:03 +00:00
Ersun Warncke
d0ada551fa Revert "Revert "log errors""
This reverts commit 0db1d89ac75bf80e1d28dbd02110809fa24f4a9f.

GitOrigin-RevId: 3911f3380767ae2e24b3694ef21c4eb73a7219b3
2020-02-12 04:19:59 +00:00
Ersun Warncke
f326d632ab Revert "Revert "optimize rootDoc_id validation""
This reverts commit 13e4b22daa99b096cf2a9625212a855be59b1fdc.

GitOrigin-RevId: f015bc2bb54e98d1271bc2417647638aa80ba843
2020-02-12 04:19:54 +00:00
Ersun Warncke
1c77077e71 Revert "Revert "wip""
This reverts commit f817ac652e35e9ed79db8d24c4144460e4cc0f71.

GitOrigin-RevId: 80bc280977d25e3ba554c32242fddfb3e15915e6
2020-02-12 04:19:50 +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
Ersun Warncke
a581ef7609 Revert "Revert "decaf clean up""
This reverts commit 669ce8b6411309cbab3162cf94bd03399581eeb4.

GitOrigin-RevId: 4a3933668a0d01912e748c164581bcb9bbded0dd
2020-02-12 04:19:36 +00:00
Jakob Ackermann
6185fe8a30 Merge pull request #2581 from overleaf/jpa-change-base-image
[misc] use node:10.19.0 as base image

GitOrigin-RevId: c66ab9df06533261b12883c328673572f76b1647
2020-02-08 04:14:43 +00:00