Commit graph

320 commits

Author SHA1 Message Date
Ersun Warncke
c0049d8b67 patch xml-crypto to fix carriage return normalization (#2671)
* patch xml-crypto to fix carriage return normalization

Co-authored-by: Ersun Warncke <ersun.warncke@overleaf.com>
GitOrigin-RevId: 65c79216b1f8602dd4b31596578d319e47904e2b
2020-03-13 04:19:58 +00:00
Jessica Lawshe
30763043d1 Merge pull request #2663 from overleaf/jel-sso-missing-email-error
Institution SSO error handling when missing session data

GitOrigin-RevId: c455ef97eb17b98ffbd03eb5f623ceb27678deed
2020-03-12 04:18:52 +00:00
Jessica Lawshe
a433235310 Merge pull request #2643 from overleaf/jel-affiliations-cron-job
Ensure affiliations cron job

GitOrigin-RevId: 4ac6f8b29b1e1460d627a86172fcdf1fa27a59a8
2020-03-12 04:18:47 +00:00
Brian Gough
fc028c7544 Merge pull request #2633 from overleaf/bg-fix-health-check-for-web-api
fix the health check on the api router

GitOrigin-RevId: 985322f8e4ff0b5dddbe7cf68c41414af6fd502d
2020-03-11 04:14:58 +00:00
Eric Mc Sween
8547bb3c8d Merge pull request #2661 from overleaf/em-convert-doc-to-file-ranges
Do not convert a doc to file when it has ranges

GitOrigin-RevId: 52f0151e54c426178f80c34c6afac908bbf7b90d
2020-03-11 04:14:54 +00:00
Eric Mc Sween
58017d4480 Merge pull request #2659 from overleaf/em-binary-file-history-fix
Fix binary file diffs

GitOrigin-RevId: 1773e8918a0f82a1945470630ca691dfa4b13026
2020-03-06 04:13:46 +00:00
nate stemen
6379f15815 Merge pull request #2651 from overleaf/ta-missing-return
Add Missing Return

GitOrigin-RevId: aeb622a6745678eb687217beeb49b5d023168052
2020-03-06 04:13:42 +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
Eric Mc Sween
2627595040 Merge pull request #2639 from overleaf/em-convert-doc-to-file
Endpoint for converting a doc to a file

GitOrigin-RevId: 0a3bd46a7a78537b0f64dc577402277cbe81fecb
2020-03-05 04:16:49 +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
Hugh O'Brien
bb958492a9 Merge pull request #2623 from overleaf/hb-third-party-too-many-files
Third party too many files errors

GitOrigin-RevId: 0a44931b14dd349d9cc4d25a3b51c68f221b8195
2020-03-04 04:21:43 +00:00
Eric Mc Sween
d8d1bdd461 Merge pull request #2647 from overleaf/em-promisify-history-manager
Promisify HistoryManager

GitOrigin-RevId: cbf946a7d61f7f57bad03e4c83184c6decd91027
2020-03-04 04:21:26 +00:00
Eric Mc Sween
b2ee3bf2bb Merge pull request #2634 from overleaf/jel-ensure-affiliations
Ensure affiliations after loading the settings page

GitOrigin-RevId: bf9982fb436d0e75d6fbd8418ca2d19e00fe3b66
2020-03-03 04:21:44 +00:00
Eric Mc Sween
864394d4ad Merge pull request #2640 from overleaf/em-promisify-project-deleter
Finish promisification of ProjectDeleter

GitOrigin-RevId: a426117c9430e2ee66b297b95f67460062a6a809
2020-03-03 04:21:39 +00:00
Timothée Alby
e7f968d370 Merge pull request #2637 from overleaf/jpa-hotfix-graceful-session-access
[ErrorController] handleError: access session gracefully

GitOrigin-RevId: 90c8ce0be80f5f198139a3b079c3a81e200112db
2020-02-29 04:17:36 +00:00
Timothée Alby
42aa999af6 Merge pull request #2638 from overleaf/ta-subscription-change-admin-fix
Change Manager When Changing Admin of Individual Subscriptions

GitOrigin-RevId: 3da53789f4331c4eb8d0a458650ea41f8b2b4f97
2020-02-29 04:17:31 +00:00
Eric Mc Sween
4e760e276a Merge pull request #2622 from overleaf/em-promisify-editor-http-controller
Promisify EditorHttpController

GitOrigin-RevId: 938350f21a19c10c6bd4261086265a098e71e932
2020-02-28 04:18:42 +00:00
Eric Mc Sween
77c75bf223 Merge pull request #2597 from overleaf/as-cleanup-tags-handler
Clean up tags handler

GitOrigin-RevId: 6e83880d9a38b323470933f6ef01fde187d55161
2020-02-28 04:18:25 +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
174af14d46 Merge pull request #2610 from overleaf/ta-recurly-email-update-auto
Update Recurly Email on Default Email Change

GitOrigin-RevId: e2821d7bdc4bc6befff2152d92c76952c38694f9
2020-02-28 04:18:09 +00:00
Brian Gough
509c23def7 Merge pull request #2631 from overleaf/bg-maintenance-messages-in-editor
display maintenance messages in editor

GitOrigin-RevId: 7d4fda60c5e2bd12d2cead2a9bff326b75e9c4e7
2020-02-27 04:17:59 +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
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
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
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
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
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
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
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
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
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