Brian Gough
|
4134c32f8d
|
Merge pull request #1861 from overleaf/bg-check-existing-import
check if project already imported
GitOrigin-RevId: 6dbca42fd524c34bb79a86b7449fe6ed3d542b43
|
2019-06-13 08:47:58 +00:00 |
|
Brian Gough
|
c242a8d4c1
|
Merge pull request #1853 from overleaf/bg-check-doc-hashes-staged-rollout
enable sharejs hash checking
GitOrigin-RevId: 2c71d239b2f5ee2bee6baf03dd54aaa8afc6fae7
|
2019-06-13 08:47:52 +00:00 |
|
Timothée Alby
|
4583c25b1b
|
Merge pull request #1843 from overleaf/ta-limit-affiliation-rate
Limit the Number of Affiliations Created Simultaneously
GitOrigin-RevId: 242d3f3a2859eb2114f43091e7ca52534b282396
|
2019-06-11 13:34:18 +00:00 |
|
Timothée Alby
|
e659703745
|
Merge pull request #1842 from overleaf/ta-remove-v1-sync
Remove v1 Sync on Features Refresh
GitOrigin-RevId: a99e0a74c4fc503bf81d0b847b3f331b3228e24f
|
2019-06-11 13:34:11 +00:00 |
|
Timothée Alby
|
8caea13193
|
Merge pull request #1845 from overleaf/ta-invite-self
Don't Send Invite when Group Manager Invite Self
GitOrigin-RevId: 35d7aecc82cf1124fbdac7fe986081b9556c23f9
|
2019-06-11 13:34:00 +00:00 |
|
Timothée Alby
|
f6c2cfe727
|
Merge pull request #1848 from overleaf/sk-increase-compile-timeout-hard-limit-10
Increase compile socket timeout to 10 minutes
GitOrigin-RevId: 93712c493c67bf54022df43175d331557b7cf49a
|
2019-06-11 13:33:53 +00:00 |
|
Ersun Warncke
|
48b5c7e209
|
do not log warning in dev/tests (#1830)
do not log warning in dev/tests
GitOrigin-RevId: c46664779fe939ad0f39466f43eb24381a245b55
|
2019-06-06 13:01:45 +00:00 |
|
Ersun Warncke
|
35138e6763
|
remove v1 oauth (#1846)
remove oauth token v1 fallback
GitOrigin-RevId: 621e75024d8ae877c821b9bfed9b2a19fdbbf9f7
|
2019-06-06 13:01:38 +00:00 |
|
Eric Mc Sween
|
15db8d3711
|
Merge pull request #1828 from overleaf/msm-fix-zip-upload-ignored-extensions-js
Fixes files with full name equals to an ignored extension being ignored (JS version)
GitOrigin-RevId: 94d84c2b3e6c7e7219397b0a982117f9c88bcf5d
|
2019-06-05 16:19:31 +00:00 |
|
Eric Mc Sween
|
5d2d7b894a
|
Merge pull request #1833 from overleaf/em-edit-subscription-admin
Change admin button in subscription admin page
GitOrigin-RevId: d446f54299578c3806ef7146d2163ec24e831b6d
|
2019-06-05 16:19:26 +00:00 |
|
Timothée Alby
|
a8edafe104
|
Merge pull request #1825 from overleaf/ta-institutions-staff-hub
Create Institutions Staff Hub
GitOrigin-RevId: 6926406951796d2e7dd0903c3d3c4dae87545390
|
2019-06-04 11:24:02 +00:00 |
|
Timothée Alby
|
14cbeef31d
|
Merge pull request #1806 from overleaf/ta-use-billing-name
Use Billing Name when Creating Subscription
GitOrigin-RevId: 66744faa7edde241340016bbb6c1bbc5fb53ede2
|
2019-06-04 11:23:55 +00:00 |
|
Timothée Alby
|
2deac5f3a1
|
Merge pull request #1805 from overleaf/csh-issue-1457-recurly-xml-builder
Don't Build Recurly XML Requests Manually
GitOrigin-RevId: bebe7f747715a33e681dc58fb89b529411a13860
|
2019-06-04 11:23:49 +00:00 |
|
Timothée Alby
|
8330c6ae61
|
Merge pull request #1835 from overleaf/hb-analytics-template-ids
Set template ids on cloned projects on creation
GitOrigin-RevId: 6b7ef72d148774c3d5ea7b65cde0e6a8fdfa2ceb
|
2019-06-04 11:23:37 +00:00 |
|
nate stemen
|
642081dd17
|
Merge pull request #1802 from overleaf/jel-oauth-hide-when-not-linked
OAuth provider check and capitalize button text
GitOrigin-RevId: afa2e8301d5141da178d88304932c5736d8632c4
|
2019-06-03 18:32:13 +00:00 |
|
Alasdair Smith
|
0ca81de78c
|
Merge pull request #1717 from overleaf/as-decaffeinate-backend
Decaffeinate backend
GitOrigin-RevId: 4ca9f94fc809cab6f47cec8254cacaf1bb3806fa
|
2019-05-29 09:32:21 +00:00 |
|
Hugh O'Brien
|
d4eb71b525
|
Merge pull request #1788 from overleaf/ta-ensure-can-delete-account
Prevent Subscription Owner from Deleting their Account
GitOrigin-RevId: bd60484bdfb6381216cfc0799e45b28300014ca0
|
2019-05-28 15:51:27 +00:00 |
|
Hugh O'Brien
|
29408b301c
|
Merge pull request #1750 from overleaf/cmg-project-metadata
Preserve project metadata when deleting
GitOrigin-RevId: 38efb139406d6111f5b6186d82c3fbfb5ab9b2b9
|
2019-05-28 15:51:21 +00:00 |
|
Alasdair Smith
|
b84c24520c
|
Merge pull request #1804 from overleaf/msm-removed-collaborator-as-first-step-transfer-ownership
Removing user as collaborator as a pre-step for project ownership transfer
GitOrigin-RevId: dbfe1553ae7277863908341fdd2af709dc019692
|
2019-05-28 11:25:43 +00:00 |
|
Alasdair Smith
|
4e8facf3cc
|
Merge pull request #1776 from overleaf/pr-history-ui-filenames-overflow
History filenames overflow + full history for admins
GitOrigin-RevId: b52d79e0aa1cb600eacb475d21b603f42c8cf18c
|
2019-05-28 11:25:17 +00:00 |
|
Simon Detheridge
|
ff4e0013cd
|
Merge pull request #1809 from overleaf/ns-escape-archive-translation
treat translate call as var, not string
GitOrigin-RevId: db1b40182bbfabef4ea31b2e1923bb28921900b0
|
2019-05-28 09:33:31 +00:00 |
|
Simon Detheridge
|
d5556c55a9
|
Merge pull request #1813 from overleaf/spd-verbose-merge-logging
Add very verbose logging to SL user merging
GitOrigin-RevId: 802a9295240c23f48c133fabb5895501f1c9a49f
|
2019-05-28 09:33:15 +00:00 |
|
Simon Detheridge
|
6488fd1284
|
Merge pull request #1814 from overleaf/spd-missing-callback-returns
Add missing return statements to callbacks in SubscriptionGroupHandler
GitOrigin-RevId: 05ff67bd8e4997fde01c6cf9f4558d3caa261590
|
2019-05-28 09:33:06 +00:00 |
|
Simon Detheridge
|
561f54c1a3
|
Merge pull request #1816 from overleaf/spd-user-delete-newsletter
Don't fail to delete a user if unsubscribing from newsletter fails
GitOrigin-RevId: 8764717220d906a20a7dd0a90879a45d9dd8a7ce
|
2019-05-28 09:32:57 +00:00 |
|
Simon Detheridge
|
40316b0735
|
Merge pull request #1815 from overleaf/spd-mongoose-debugging
Allow very verbose debugging of mongo queries via env var
GitOrigin-RevId: ad132ef0cc6df892b4c879948094f67497cc9a48
|
2019-05-28 09:32:50 +00:00 |
|
Simon Detheridge
|
a0adde3573
|
Merge pull request #1803 from overleaf/spd-email-login-url
Fix path to login URL in account migration emails
GitOrigin-RevId: 609445ad5f214deb7da3966806ff512c4a7a3d55
|
2019-05-23 13:25:29 +00:00 |
|
Alasdair Smith
|
a3894ac9b4
|
Merge pull request #1794 from overleaf/as-upgrade-ace-1.4.4
Upgrade Ace to v1.4.4
GitOrigin-RevId: 26681bcf255537f8eb09fa0ac1c98009cf964496
|
2019-05-23 08:49:13 +00:00 |
|
Timothée Alby
|
d86abf49e6
|
Merge pull request #1729 from overleaf/ta-show-last-modified
Show LastUpdatedBy on Dashboard
GitOrigin-RevId: 11760e575a46f061d4aa9059a0c1e813b9adb1f9
|
2019-05-21 13:39:29 +00:00 |
|
Timothée Alby
|
2895a6878c
|
Merge pull request #1796 from overleaf/ta-institution-subscriptions-fix
Ignore Trials when Listing Subscriptions on Institution Hub
GitOrigin-RevId: 9121b08fc16fd3d18fff4a0403354fecec2d4666
|
2019-05-21 13:39:16 +00:00 |
|
Jessica Lawshe
|
e03b5ae691
|
Merge pull request #1741 from overleaf/jel-manage-linked-accounts
Manage linked accounts via v2
GitOrigin-RevId: 09a7af361e1fc3c30bd01f7876fc17d651f60f06
|
2019-05-20 16:10:46 +00:00 |
|
Simon Detheridge
|
004272619e
|
Merge pull request #1781 from overleaf/ta-institution-subscriptions
List Institution Subscriptions
GitOrigin-RevId: b259b4729f031bb6a50b27f6740df3df21017818
|
2019-05-20 12:18:57 +00:00 |
|
Simon Detheridge
|
efd7cf5b01
|
Merge pull request #1793 from overleaf/fix-name-removed-transfer-ownership
Fix name removed transfer ownership
GitOrigin-RevId: ccbc681746033017686c4e36040a71ab7f98ad16
|
2019-05-20 12:18:49 +00:00 |
|
Simon Detheridge
|
c07c44f366
|
Merge pull request #1644 from overleaf/spd-reconcile-accounts
Add account-reconciliation script
GitOrigin-RevId: e20a8b9531126d91baaa9da5c77ab6e971b43e67
|
2019-05-16 10:59:53 +00:00 |
|
Timothée Alby
|
0e38ca1fd7
|
Merge pull request #1775 from overleaf/ta-fetch-user-before-confirm
Check User Exists Before Confirming Email
GitOrigin-RevId: 3622044f31f78e8499ccd084ca99297ca297ca97
|
2019-05-16 07:34:23 +00:00 |
|
Timothée Alby
|
276310bd23
|
Merge pull request #1778 from overleaf/hb-password-reset-sl
Handle users who haven't migrated better on password reset
GitOrigin-RevId: f123a6fe4a5a958f558e3cf34c3180e8fc96d159
|
2019-05-16 07:34:18 +00:00 |
|
Brian Gough
|
c6c948e9f9
|
Merge pull request #1769 from overleaf/bg-record-date-for-doc-deletion
record timestamp for doc deletion
GitOrigin-RevId: 3ae38c94918d3400ad9aa821e1e1ef1bcde6373b
|
2019-05-15 12:41:42 +00:00 |
|
Brian Gough
|
e252c64996
|
Merge pull request #1763 from overleaf/bg-preserve-file-hash-on-copy-and-delete
preserve file hash on copy and delete
GitOrigin-RevId: 2dc000255dcfe875a30a7e7f878aaa09fea367dc
|
2019-05-15 12:41:37 +00:00 |
|
Brian Gough
|
833caf4acd
|
Merge pull request #1765 from overleaf/bg-avoid-exception-in-token-access
handle exception in crypto.timingSafeEqual when checking token
GitOrigin-RevId: ba23aa4d4fe1e212c776965c0a58a90ecd846052
|
2019-05-15 12:41:31 +00:00 |
|
Timothée Alby
|
7e32ed5158
|
Merge pull request #1766 from overleaf/ta-dropbox-duplicates-script
Add Script to Unlink all Duplicate Dropbox uids
GitOrigin-RevId: 6db73dee9f04e9006d0aec558cf370b5079df671
|
2019-05-15 07:29:00 +00:00 |
|
Timothée Alby
|
bd722dda8e
|
Merge pull request #1759 from overleaf/sk-disable-bcrypt-rounds-upgrade
Temporarily de-activate automatic upgrade of bcrypt rounds
GitOrigin-RevId: 66dbe344c00253e4b6a8f883735e61d9133da62e
|
2019-05-15 07:28:54 +00:00 |
|
Ersun Warncke
|
6513cc7b7a
|
Revert "Revert "complete v2 collabratec api""
This reverts commit 378825fae46cef6f19c8f908a1d6cf9c837cd1d6.
GitOrigin-RevId: cf38aa3b4ec53ec6741389885ebe882476cb9297
|
2019-05-14 10:24:11 +00:00 |
|
Ersun Warncke
|
8377005187
|
Revert "Revert "oauth and collabratec migration""
This reverts commit c8814e7fd85776feb37bf8fad95038349b36cd9a.
GitOrigin-RevId: 9deeb445917c856acee54ef793575c8ab9c81304
|
2019-05-14 10:24:04 +00:00 |
|
Ersun Warncke
|
8e916a830d
|
Revert "Revert "fix auth error response and use 401 for malformed header""
This reverts commit 5d25af9026159b0c1e0a53f0d1fd0d9c685b40ee.
GitOrigin-RevId: d5cc2fd2e7a676cad637717d77d1a69a7fe6453c
|
2019-05-14 10:23:57 +00:00 |
|
Ersun Warncke
|
7883554d73
|
Revert "Revert "add oauth2-server""
This reverts commit 946a7c2494d39fd7581cb8a068af7df647fb3bda.
GitOrigin-RevId: 2f02e9d9e2d0348e4ea1d447e0291fae72c0008a
|
2019-05-14 10:23:51 +00:00 |
|
Ersun Warncke
|
9b24ed6daa
|
Revert "Revert "add thirdPartyIdentifiers to User model and add manager class""
This reverts commit df1b9355b1b28e3311bb9e5748df9db673d32ce5.
GitOrigin-RevId: bba2cc5217ce1d2b50a596be07a086b4d716786e
|
2019-05-14 10:23:46 +00:00 |
|
Ersun Warncke
|
934b70e96a
|
Revert "add thirdPartyIdentifiers to User model and add manager class"
This reverts commit 5839f1f43237c19efed7f4ce1dfb500da9327f70.
GitOrigin-RevId: df1b9355b1b28e3311bb9e5748df9db673d32ce5
|
2019-05-13 15:52:47 +00:00 |
|
Ersun Warncke
|
a00f4b219e
|
Revert "add oauth2-server"
This reverts commit d10f565973f8b762c5aa51aa11e73105b016d3ae.
GitOrigin-RevId: 946a7c2494d39fd7581cb8a068af7df647fb3bda
|
2019-05-13 15:52:41 +00:00 |
|
Ersun Warncke
|
6d4b67d1ee
|
Revert "fix auth error response and use 401 for malformed header"
This reverts commit 6dc4d10c25db7710b3e4e8e876d425a1e84574c8.
GitOrigin-RevId: 5d25af9026159b0c1e0a53f0d1fd0d9c685b40ee
|
2019-05-13 15:52:36 +00:00 |
|
Ersun Warncke
|
89ee728514
|
Revert "oauth and collabratec migration"
This reverts commit 4ac63921b030a01ed79bc0da1666d3c9f9545248.
GitOrigin-RevId: c8814e7fd85776feb37bf8fad95038349b36cd9a
|
2019-05-13 15:52:30 +00:00 |
|
Ersun Warncke
|
4189f2e6ec
|
Revert "complete v2 collabratec api"
This reverts commit 9c75b657c11f98e3f927dd01a422157f53a5672d.
GitOrigin-RevId: 378825fae46cef6f19c8f908a1d6cf9c837cd1d6
|
2019-05-13 15:52:25 +00:00 |
|