Commit graph

9040 commits

Author SHA1 Message Date
Eric Mc Sween
d772dbaceb Merge pull request #2673 from overleaf/ta-resync-subscriptions-fix
Resync Recurly Subscriptions Script Improvements

GitOrigin-RevId: b042465b7bffcbb73b40d1a7f23de784185d53ef
2020-03-17 04:18:03 +00:00
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
Timothée Alby
50ccc90815 Merge pull request #2664 from overleaf/ta-resync-subscriptions
Add Script To Resync Recurly Subscriptions

GitOrigin-RevId: 95f1263e5b3b782ec70d3d135f3c1866548a048f
2020-03-12 04:18:56 +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
Timothée Alby
403704710c Merge pull request #2648 from overleaf/msm-fix-multiresult-promisify
Added multiResult to ProjectEntityHandler.promises.getDoc

GitOrigin-RevId: 6a2807cdae822c188298b48887d0eff57edf12d4
2020-03-10 04:14:51 +00:00
Timothée Alby
6734d9e107 Merge pull request #2641 from overleaf/ew-delete-orphaned-docs
Process and Script to Delete Orphaned Docs

GitOrigin-RevId: 0c428e36973a9131e3d379fdf4657e802576b23d
2020-03-10 04:14:46 +00:00
Timothée Alby
620b95fbe8 Merge pull request #2656 from overleaf/jpa-import-709
[misc] fileOperationI18nNames: drop blocking DOM access

GitOrigin-RevId: e6aab686fc8d4fe3b5515033b88548278c7bf7c0
2020-03-10 04:14:42 +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
Timothée Alby
a53174a4d6 Merge pull request #2660 from overleaf/jlm-fix-div-in-p
Remove div from inside p tag

GitOrigin-RevId: 2feea3786d7d737e2f8c8aa8d817f8e7cd1868ae
2020-03-10 04:14:33 +00:00
Timothée Alby
d4fc866984 Merge pull request #2658 from overleaf/jpa-import-makefile-changes
[misc] import Makefile changes

GitOrigin-RevId: 6b19abd48cc40bdbaab6b0005711c9c2cca292f7
2020-03-10 04:14:29 +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
nate stemen
818d19bd69 Merge pull request #2654 from overleaf/sk-ns-fix-tag-count-for-real
Ensure tag count doesn't include trashed projects

GitOrigin-RevId: d1ccafe8b8553378c8d25504494d790ee342fedb
2020-03-06 04:13:38 +00:00
Eric Mc Sween
34a40296f4 Merge pull request #2652 from overleaf/jel-new-file-scope
Maintain scope in new file modal

GitOrigin-RevId: f4a39dfefbbcb75f5a3fb8fe23cb71a186b575dd
2020-03-05 04:17:05 +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
43d47ee35f Merge pull request #2582 from overleaf/ew-hackathon
Code mod to convert logger.warn/error to OError wrapper

GitOrigin-RevId: 0150cc7341d5a6cabe54c657947b135c23349073
2020-03-05 04:16:54 +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
d20518fdd4 Merge pull request #2624 from overleaf/hb-warning-nearing-file-limit
Show warning near or above file limit in upload modal

GitOrigin-RevId: 75e7c41e526ccde9516f7caf6ef1b9cbc59c2439
2020-03-04 04:21:48 +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
Alasdair Smith
ad361a6617 Merge pull request #2650 from overleaf/revert-2570-as-sentry-source-maps
Revert "Upload source maps to Sentry"

GitOrigin-RevId: 6f6a122209553b9fde664ff55ebec37f7cb6ef7e
2020-03-04 04:21:39 +00:00
Eric Mc Sween
a11a4ac614 Merge pull request #2570 from overleaf/as-sentry-source-maps
Upload source maps to Sentry

GitOrigin-RevId: badbce7a5a72c3c2b5ad61d1ab2e458a52128e37
2020-03-04 04:21:34 +00:00
Eric Mc Sween
60b5bf14e0 Merge pull request #2642 from overleaf/jel-sso-confirm-notification
Extend _ssoAvailable check on dash frontend

GitOrigin-RevId: a549ba86286361481114b9f0355c5741ac3ab921
2020-03-04 04:21:30 +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
1f89083ab2 Merge pull request #2632 from overleaf/as-remove-minjs
Remove mirroring frontend JS to public/minjs directory

GitOrigin-RevId: f199530161dcd6d54800d148188f4e0b21b8df66
2020-03-03 04:21:53 +00:00
Eric Mc Sween
506bc44336 Merge pull request #2621 from overleaf/jpa-ns-empty-history
Add messaging to projects with empty history

GitOrigin-RevId: 3fab0b115d35ec3d7f7d1ffa5603b7c7d3423c94
2020-03-03 04:21:48 +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
Timothée Alby
bb722f3bff Merge pull request #2628 from overleaf/jel-backfill-sso
Add script to backfill SSO affiliations

GitOrigin-RevId: 5dc6678531311871b09fd79ed96f45f718753ad5
2020-02-29 04:17:27 +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
130f97d621 Merge pull request #2625 from overleaf/bg-fix-spelling-stateful-regexp
fix stateful regexp usage in SpellCheckManager

GitOrigin-RevId: 6ac93e6a9227a638b30882ce99771e30c1a097c1
2020-02-28 04:18:37 +00:00
Eric Mc Sween
5f712645ed Merge pull request #2626 from overleaf/bg-fix-editor-regexps
fix stateful regexp usage in editor inputs

GitOrigin-RevId: 4950066251cb6235e218ff4f600fab2652d15e76
2020-02-28 04:18:33 +00:00
Eric Mc Sween
c120309dd0 Merge pull request #2591 from overleaf/pr-avoid-out-of-sync-error-spellcheck
Avoid out of sync error spellcheck

GitOrigin-RevId: e9772c01ffc0ffaca5d137e8e43e797903b727cd
2020-02-28 04:18:29 +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
e80870f453 Merge pull request #2629 from overleaf/cmg-updateon-typo
Fix typo in user settings

GitOrigin-RevId: 066ee8047d807e9ac077eb687a93f12d9db6bf55
2020-02-28 04:18:21 +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
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
Eric Mc Sween
403c9ae66b Merge pull request #2627 from overleaf/jel-decaf-cleanup
Decaf cleanup

GitOrigin-RevId: 9e0770ce6c5362ea288fc1706014aacd45608008
2020-02-28 04:18:04 +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
Brian Gough
ac5d688d8c Merge pull request #2612 from overleaf/bg-precompile-web-views-only
only precompile views for web, not web-api

GitOrigin-RevId: 292f4d5dd6f81b1928ccd543898dfa643f1e5be8
2020-02-27 04:17:55 +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