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
Ersun Warncke
65cbfbaeae
complete v2 collabratec api
...
* remove proxies to v1
* allow oauth tokens with user stubs
* add profile/unlink end points
* fix Makefile issue
GitOrigin-RevId: 9c75b657c11f98e3f927dd01a422157f53a5672d
2019-05-13 12:05:04 +00:00
Ersun Warncke
935877222a
oauth and collabratec migration
...
* make v2 system of record for collabratec id
* migrate oauth apps, tokens to v2
* set collabratec id on reg/link from ctec
* copy collabratec id from user stub to user on merge
GitOrigin-RevId: 4ac63921b030a01ed79bc0da1666d3c9f9545248
2019-05-13 12:04:56 +00:00
Ersun Warncke
c0ab195eed
fix auth error response and use 401 for malformed header
...
GitOrigin-RevId: 6dc4d10c25db7710b3e4e8e876d425a1e84574c8
2019-05-13 12:04:51 +00:00
Ersun Warncke
dc06069dff
add oauth2-server
...
GitOrigin-RevId: d10f565973f8b762c5aa51aa11e73105b016d3ae
2019-05-13 12:04:46 +00:00
Ersun Warncke
8f339603f4
add thirdPartyIdentifiers to User model and add manager class
...
GitOrigin-RevId: 5839f1f43237c19efed7f4ce1dfb500da9327f70
2019-05-13 12:04:40 +00:00
Brian Gough
07b7566466
Merge pull request #1089 from overleaf/bg-compute-filestore-hash
...
compute filestore hash
GitOrigin-RevId: 23a909d2c2ea7aba3abfdb8f0c060e414a17e52e
2019-05-13 08:49:42 +00:00
Brian Gough
c989179517
Merge pull request #1758 from overleaf/as-remove-unused-middleware-file
...
Remove unused TemplatesMiddlewear file
GitOrigin-RevId: 00cf49c970171f1f99d133ee4876f2a35c89c023
2019-05-13 08:49:36 +00:00
Brian Gough
d1cc605855
Merge pull request #1755 from overleaf/bg-admin-resync-project-history
...
add button to resync history for project in admin page
GitOrigin-RevId: e52e85ee6d1f7dea7930bf3dee0ec70b28b8a6c2
2019-05-13 08:49:29 +00:00
Henry Oswald
69ccac8f49
log out job in tpdsupdate sender
...
GitOrigin-RevId: 8ff4665f62a1f36580c5864f2185ddf1a792f6cf
2019-05-11 01:54:39 +00:00
Alasdair Smith
36035e8ccd
Merge pull request #1746 from overleaf/sk-fix-stale-pdf-download-3
...
Pass build-id when downloading pdf
GitOrigin-RevId: bc4b1558170661172304df1b71f9b859a59abc5b
2019-05-08 09:09:11 +00:00
Christopher Hoskin
8aa8840db0
Merge pull request #1745 from overleaf/csh-issue-1118-node-10.15.3
...
Csh issue 1118 node 10.15.3
GitOrigin-RevId: 5b75d030d9d07bdb41dbca46f90fd950293e17b3
2019-05-07 10:58:52 +00:00
Paulo Jorge Reis
d613d7e1a2
Merge pull request #1647 from sharelatex/as-upgrade-ace-1.4.3
...
Upgrade Ace to v1.4.3
GitOrigin-RevId: 810350080a6b89fd9817ebcacde7e9817097d99a
2019-05-06 09:02:03 +00:00
Timothée Alby
5b7b9fc97b
Store lastUpdatedBy Value on Projects ( #1727 )
...
Store lastUpdatedBy Value on Projects
GitOrigin-RevId: bdb12c55732bc726151135b28a03e722bf3fdb39
2019-05-02 14:17:41 +00:00
Timothée Alby
5b7974065d
Prevent registration of new accounts with existing secondary emails ( #1696 )
...
Prevent registration of new accounts with existing secondary emails
GitOrigin-RevId: 004cf9d31064fc5b7deb621c95c38f103397ff15
2019-05-02 14:17:34 +00:00
Alasdair Smith
5049dc083e
Merge pull request #1739 from sharelatex/bg-upgrade-history-in-project-admin-page
...
add button to upgrade history in project admin page
GitOrigin-RevId: a5f2a64028ccb002cbb96da0f910b7b494f75eb8
2019-05-01 09:38:35 +00:00
Alasdair Smith
028c3bc94c
Merge pull request #1742 from sharelatex/bg-avoid-unnecessary-callback-for-emit-to-room
...
remove unnecessary callback on emitToRoom
GitOrigin-RevId: a34006d6f72862b1f2e0b88d20ad8003ea5b8883
2019-05-01 09:38:30 +00:00
Alasdair Smith
2c30ae0f8a
Merge pull request #1738 from sharelatex/spd-dumpfolder
...
Ensure dump folder exists before opening templates
GitOrigin-RevId: 3c7269fbcdff45a06e505154a35ce6d2bd4b7ae1
2019-05-01 09:38:24 +00:00
Brian Gough
77a711f7a3
Merge pull request #1732 from sharelatex/bg-avoid-null-in-remove-element
...
make removeElementFromMongoArray atomic
GitOrigin-RevId: 3c4cf50caed9b3197ee0ec7fe4c89738d368a966
2019-04-29 09:31:09 +00:00
Simon Detheridge
5517adcbd1
Merge pull request #1726 from sharelatex/hb-sso-password-setting
...
Check for password from v1 before showing password change form
GitOrigin-RevId: 58ef0f9d3c8ce3ab7ca51d3538f1be13f05d4658
2019-04-25 14:37:38 +00:00
Simon Detheridge
9808eb7f55
Merge pull request #1722 from sharelatex/jel-password-descriptive-message
...
Use descriptive error message for password reset
GitOrigin-RevId: f1f0bacd6397f2068ed2abc71ee6ec54b3a51aff
2019-04-25 14:37:21 +00:00
Simon Detheridge
3990a5d736
Merge pull request #1724 from sharelatex/ta-subscription-canceled-page
...
Add Subscription Canceled Page
GitOrigin-RevId: b490ff008dd888911e8168606d90ae92662c0745
2019-04-25 14:37:15 +00:00
Simon Detheridge
cc96ecfd74
Merge pull request #1734 from sharelatex/spd-delete-user-crash
...
Don't fail in refreshFeatures if the v1 user doesn't exist
GitOrigin-RevId: 7849f5f942ef39762b40c31a616b51b4b1fe0706
2019-04-25 14:36:58 +00:00
Brian Gough
e1ec01eb0f
Merge pull request #1719 from sharelatex/ja-restore-doc-snapshots
...
Show and restore doc snapshots from admin panel
GitOrigin-RevId: 22339644d48a8698df97f7d5fc1eecfaf27c6fab
2019-04-24 13:24:46 +00:00
Timothée Alby
d3f0285fd2
Ensure project name is unique when transferring to another user ( #1712 )
...
Ensure project name is unique when transferring to another user
GitOrigin-RevId: 0742fcbd958b5801ed155214f403a74d17236859
2019-04-23 14:35:27 +00:00
Timothée Alby
85e7f688d5
Display Pricing Exceptions on Subscription Dashboard ( #1720 )
...
Display Pricing Exceptions on Subscription Dashboard
GitOrigin-RevId: 31de89824db70b7af1f8704e6da592064ce44bfd
2019-04-23 14:35:21 +00:00
Timothée Alby
2a73d8106b
Send Email on Subscription Reactivation ( #1721 )
...
Send Email on Subscription Reactivation
GitOrigin-RevId: 388f3490eddba0507e8c66e45d9ee4d185119c1e
2019-04-23 14:35:05 +00:00
Timothée Alby
54186d9db1
Add linked accounts section to user settings page ( #1705 )
...
Add linked accounts section to user settings page
GitOrigin-RevId: d2bb26a3bfb3946144a05b98f58d50a2c57f3040
2019-04-23 14:34:55 +00:00
Timothée Alby
e2793f659c
Don't Sanitize Undefined Team Notices ( #1725 )
...
Don't Sanitize Undefined Team Notices
GitOrigin-RevId: 540316d71bc4047d25100bb0ef524d5d2adba0b1
2019-04-23 14:34:48 +00:00
Timothée Alby
6232854ff7
Remove User Memberships on Deletion ( #1688 )
...
Remove User Memberships on Deletion
GitOrigin-RevId: d6e6a4cc01e31288f660c2fd36a0cee174ee5dd1
2019-04-23 14:34:40 +00:00
Jessica Lawshe
f455a11aa8
Merge pull request #1655 from sharelatex/jel-user-must-reconfirm
...
Reconfirm user accounts
GitOrigin-RevId: 0343ff745e881cd51b5efbfb97404b6b926905c8
2019-04-17 14:14:19 +00:00
Paulo Jorge Reis
8b7b49f72a
Merge pull request #1693 from sharelatex/cmg-clone-owners
...
Return new project data from api when cloning
GitOrigin-RevId: 726ee5a37a7f74f2f618ca911ae9c2c991f12786
2019-04-17 10:26:11 +00:00
nate stemen
bec56ccafa
Merge pull request #1713 from sharelatex/ns-captchas-two
...
turn off captchas for project invite
GitOrigin-RevId: 3e044ba8c6bb2ffb77ea4486f7b51a587133839c
2019-04-16 18:47:56 +00:00
Hugh O'Brien
9644ff4f51
Merge pull request #1714 from sharelatex/spd-middlewear-oops
...
Fix spelling in UserMembershipAuthorization
GitOrigin-RevId: cca5e5d13d7eb33e12f73be9172bc5cbe90312c0
2019-04-15 16:09:26 +00:00
Hugh O'Brien
5edead4446
Merge pull request #1694 from sharelatex/hb-clear-ip-notifications
...
Remove notification for university enrolment on affiliation add
GitOrigin-RevId: 67df66ad6c6e9e16b6573fa15eb34293adaa0287
2019-04-15 16:09:16 +00:00
Shane Kilkelly
f3dd61abce
Merge pull request #1657 from sharelatex/sk-rate-limit-join-project
...
Add a rate-limit to joinProject
GitOrigin-RevId: 27edd8b56ae80868b5fcd0b803d0e042dce26f31
2019-04-13 01:57:10 +00:00
nate stemen
2ae27fbc6a
Merge pull request #1702 from sharelatex/revert-1650-ns-toggle-captchas
...
Revert "allow toggling of captchas via setting"
GitOrigin-RevId: 422daf84d2b02a10dd9b771e5c0f672139da0613
2019-04-08 15:20:49 +00:00
nate stemen
5aac144d5b
Merge pull request #1650 from sharelatex/ns-toggle-captchas
...
allow toggling of captchas via setting
GitOrigin-RevId: 09decba22f6b7b4e97b04a57534a2797e10940c4
2019-04-08 13:53:54 +00:00
Alasdair Smith
9ff021cc88
Merge pull request #1676 from sharelatex/as-upgrade-pdfjs-2.0.943
...
Upgrade PDFjs to v2.0.943
GitOrigin-RevId: 79081841d64558a7fe82055c172893533466c4eb
2019-04-01 09:27:32 +00:00
Simon Detheridge
385da07930
Merge pull request #1675 from sharelatex/spd-zip-file-limit-ui
...
Display more descriptive errors when uploading a project fails
GitOrigin-RevId: e206ca0d595f927ab141fb901644906f000160f8
2019-03-28 15:14:30 +00:00
Simon Detheridge
88446ffa9b
Merge pull request #1677 from sharelatex/spd-hide-heapdump
...
Move 'heapdump' endpoint to private API router
GitOrigin-RevId: 581cc13b60ee944b3e1ad21a973d70ebab606a5b
2019-03-28 15:14:22 +00:00
Simon Detheridge
bb81a47d58
Merge pull request #1641 from sharelatex/spd-soft-delete-users
...
Add initial support for soft-deletion of users
GitOrigin-RevId: 22e47536732c5aec843d120773d2565112ad80b7
2019-03-26 13:59:49 +00:00
Simon Detheridge
d9522f563d
Merge pull request #1631 from sharelatex/ho-remove-recurly-sign
...
remove RecurlyWrapper.sign and recurly private api key
GitOrigin-RevId: ceec49bcb9b66a6ad3cbf2b436c87cf0008ab152
2019-03-25 15:52:54 +00:00
Shane Kilkelly
90cb50f4ac
Merge pull request #1609 from sharelatex/sk-upgrade-bcrypt-3
...
Upgrade bcrypt to version 3, and specify minor-version of hash function
GitOrigin-RevId: 9282664a628e4b50839a1bb6f7ee895f3f9f15ca
2019-03-25 09:50:41 +00:00
Simon Detheridge
d2e053f456
Merge pull request #1610 from sharelatex/cmg-reintroduce-beta
...
Revive the beta program in the settings area
GitOrigin-RevId: 40024210cba08de96805d58147b6a0fe166a7d43
2019-03-22 12:28:36 +00:00