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
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
dc09095ae7
Merge pull request #1756 from overleaf/pr-resize-ace-when-toggling-pdf
...
Resize Ace when toggling PDF view
GitOrigin-RevId: 77e6fe662eb67f2ec39a00f42a35026f6a696eb9
2019-05-10 08:56:21 +00:00
Alasdair Smith
51a4c33e91
Merge pull request #1748 from overleaf/hb-fix-change-plan-vat-display
...
Use two decimal places for inc-vat change plan prices
GitOrigin-RevId: 6dd46c42693345ba0aaca5cfe061bc907a112a68
2019-05-09 13:03:09 +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
Alasdair Smith
cbab60476a
Merge pull request #1747 from overleaf/hb-graphics-autocomplete-additions
...
Make image autocomplete file type case insensitive
GitOrigin-RevId: 8a39a600340d8cea7bbfda08d8cc95343c8002ad
2019-05-08 09:09:05 +00:00
Alasdair Smith
9b94b32b83
Merge pull request #1751 from overleaf/as-fix-cite-auto-complete
...
Don't show shortened arguments in cite autocomplete
GitOrigin-RevId: 75e86e1b97adb7632f30960a50ad775511868d5b
2019-05-08 09:08:57 +00:00
Timothée Alby
986378932f
Update README.md
...
GitOrigin-RevId: ea14f37a281d6d1fafcee0d17d92b0d50fb74d24
2019-05-07 17:04:40 +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
Brian Gough
f583ffdbff
Merge pull request #1740 from sharelatex/spd-captcha-on-register
...
Don't add captcha fields to register form if captcha is disabled
GitOrigin-RevId: 7ac3a3b41734377243ac1e31a99b3778c9a2e77d
2019-05-02 10:18:57 +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
16f905358a
Merge pull request #1690 from sharelatex/cmg-color-tags
...
Color-code tags/folders
GitOrigin-RevId: d8dcb90b861dd61c1bc502e0b67556dcd772b42e
2019-04-25 14:37:32 +00:00
Simon Detheridge
d2de6d8e87
Merge pull request #1689 from sharelatex/revert-1684-revert-1637-as-clear-undo-stack-remote-edit
...
Bring back clearing of undo stack when remote change is received
GitOrigin-RevId: f18b1b4c1af0ab0c8563c3670c73d75afa6d8345
2019-04-25 14:37:27 +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
6c04bc8712
Merge pull request #1728 from sharelatex/jel-feature-event
...
Track events that display "Start Free Trial" buttons
GitOrigin-RevId: 4890d8f1da8b0cd47d7c97eab322e6048f774d30
2019-04-25 14:37:08 +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
967973f354
Only show label version button for users with write permission ( #1665 )
...
Only show label version button for users with write permission
GitOrigin-RevId: f0a6504b51c1e9018942592ad6784599694c571a
2019-04-23 14:35:32 +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
44ba16bb7c
Fix Wording in Subscription Cancellation Flow ( #1723 )
...
Fix Wording in Subscription Cancellation Flow
GitOrigin-RevId: 27b89982d0ac9d4bc9e9b985df2dd515253a1368
2019-04-23 14:35:14 +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