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
|
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
|
7883554d73
|
Revert "Revert "add oauth2-server""
This reverts commit 946a7c2494d39fd7581cb8a068af7df647fb3bda.
GitOrigin-RevId: 2f02e9d9e2d0348e4ea1d447e0291fae72c0008a
|
2019-05-14 10:23:51 +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
|
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
|
dc06069dff
|
add oauth2-server
GitOrigin-RevId: d10f565973f8b762c5aa51aa11e73105b016d3ae
|
2019-05-13 12:04:46 +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 |
|
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 |
|
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
|
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
|
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
|
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 |
|
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 |
|
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
|
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
|
d184087a53
|
Merge pull request #1643 from sharelatex/spd-transfer-projects
Add support for transferring project ownership
GitOrigin-RevId: 088e02bb5be67033dba8e24c11660a1e200a3258
|
2019-03-22 12:28:24 +00:00 |
|
Shane Kilkelly
|
a5ad2e48d4
|
Merge pull request #1629 from sharelatex/sk-censor-token-prefix
Censor `tokens.readAndWritePrefix` when building project model
GitOrigin-RevId: 0fe3fc2657aa191808ea282dfcd2ea5506e93fee
|
2019-03-22 10:27:56 +00:00 |
|
Shane Kilkelly
|
a51fefae6c
|
Merge pull request #1630 from sharelatex/as-allow-deleted-inviter-import
Allow deleted v1 user when importing project invite inviter
GitOrigin-RevId: be8fc8f09452b72128592f9c00859aaa0b535c3d
|
2019-03-22 10:27:45 +00:00 |
|
Brian Gough
|
0305ba0c6b
|
Merge pull request #1639 from sharelatex/bg-add-message-ids
include a unique id in every message published to redis
GitOrigin-RevId: f2843e5bb570247f03b260fa0f82f562c9c6014d
|
2019-03-21 16:17:37 +00:00 |
|
Timothée Alby
|
5de25032d8
|
Merge pull request #1634 from sharelatex/ta-no-institution-autocreate
Don't Auto-Create Institutions
GitOrigin-RevId: 8be3a0d9f3f3814396a58d2fd131a62c9f196861
|
2019-03-19 23:51:53 +00:00 |
|
Brian Gough
|
c704312c85
|
Merge pull request #1625 from sharelatex/bg-move-entities-safely
move project entities safely without losing data on error
GitOrigin-RevId: 864fcf14af1045154e9deb7d02a4f2d508e6021e
|
2019-03-18 09:30:28 +00:00 |
|
Timothée Alby
|
429709dfcb
|
Merge pull request #1621 from sharelatex/ns-update-spam-regexes
allow hyphen in email hostname and ' in project name
GitOrigin-RevId: d108b7d42372dee4250157e2830cbc800851afc1
|
2019-03-14 16:02:45 +00:00 |
|
Timothée Alby
|
ca2c854452
|
Merge pull request #1622 from sharelatex/sk-add-unit-test-for-bcrypt
Add unit test for 'real' bcrypt
GitOrigin-RevId: 670282b5235484ac03d3451dc2685af18d84a4e3
|
2019-03-14 16:02:38 +00:00 |
|
Timothée Alby
|
970ca2e122
|
Merge pull request #1604 from sharelatex/ns-fix-capitalization
improve project invite email wording
GitOrigin-RevId: a15c2db992a000d3d1b2e49878380532d9b48e37
|
2019-03-14 16:02:27 +00:00 |
|
Timothée Alby
|
e4c684786d
|
Merge pull request #1580 from sharelatex/ta-entity-create-form-fix-2
Fix Publisher Creation Form Take2
GitOrigin-RevId: a51512cc48067f50ba05fa371ed1d759d3fca985
|
2019-03-14 13:43:12 +00:00 |
|
Jessica Lawshe
|
0b841aacef
|
Merge pull request #1605 from sharelatex/jel-portal-team-data
Refactor portals
GitOrigin-RevId: c75eb5fc17b2755070dfe48eb85845c690fe0230
|
2019-03-13 16:51:52 +00:00 |
|
Brian Gough
|
32925f0c4e
|
Merge pull request #1608 from sharelatex/bg-allow-reserved-names-safely
allow reserved names safely
GitOrigin-RevId: d0c5f287411f5cd6d0639f57ef925409571acf8a
|
2019-03-13 11:18:06 +00:00 |
|
Brian Gough
|
0f22a626c8
|
Merge pull request #1595 from sharelatex/bg-remove-old-project-version-request
remove old project version request
GitOrigin-RevId: 1c0a36ddfde4852b4cae90f5f4c4cfcb727eff77
|
2019-03-13 09:12:42 +00:00 |
|
nate stemen
|
f699877959
|
Merge pull request #1540 from sharelatex/ns-less-spam-mail
add spam checkers on project invite emails
GitOrigin-RevId: 305825efe6a824b1c0f5b347d2ed2427165d2cef
|
2019-03-11 11:07:09 +00:00 |
|
Brian Gough
|
01fd6e9c8a
|
Merge pull request #626 from sharelatex/bg-use-atomic-project-structure-version
use atomic project structure version
GitOrigin-RevId: ac61039a63af3e94fe842031e90e0aac802ff2b8
|
2019-03-11 11:06:45 +00:00 |
|
Douglas Lovell
|
ce8695c951
|
Merge branch 'dcl-i1261b'
GitOrigin-RevId: 2d6c318e12220f39309238a2c7c76650cefa8be6
|
2019-03-11 11:05:47 +00:00 |
|
Simon Detheridge
|
3553fb2d9d
|
Merge pull request #1581 from sharelatex/spd-wearing-middle
Fix spelling of "middleware"
GitOrigin-RevId: d2b2b20ad8a6871cd6366303e75b340f0f2f2dda
|
2019-03-11 11:05:12 +00:00 |
|
Simon Detheridge
|
939922485c
|
Merge pull request #1555 from sharelatex/spd-email-escape-html
HTML-escape user-supplied data in HTML emails
GitOrigin-RevId: 7535ee8d0ac2c7c772a175ea5058e8cfc7f20e91
|
2019-03-11 11:05:01 +00:00 |
|
Simon Detheridge
|
870f183595
|
Merge pull request #1476 from sharelatex/spd-character-sets
Detect encoding of non-utf8 files and convert during load
GitOrigin-RevId: 1856a42457c52b125793dd001b92a014f358da69
|
2019-03-11 11:04:22 +00:00 |
|
Simon Detheridge
|
838fe00058
|
Merge pull request #1531 from sharelatex/spd-notify-users-on-affiliation-upgrade
Notify users when affiliations are upgraded
GitOrigin-RevId: 0f9e92b6a49f2ddef559e9e23fc73436910fb9f6
|
2019-03-11 11:00:01 +00:00 |
|
Brian Gough
|
43899589dc
|
Merge pull request #1514 from sharelatex/bg-avoid-text-html-content-type-in-responses
use explicit json content-type to avoid security issues with text/html
GitOrigin-RevId: 0c8d96a61380231c5f878572ed91b8ab24375f56
|
2019-03-11 10:58:32 +00:00 |
|