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 |
|
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
|
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 |
|
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
|
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 |
|
Henry Oswald
|
0c5346460f
|
log ops in filestore error
GitOrigin-RevId: 008722ba2ff335ebedb2e17e9413737d0244f78e
|
2019-03-12 11:48:51 +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 |
|
Douglas Lovell
|
9b6ac8f715
|
Merge remote-tracking branch 'origin/ta-entity-create-form-fix'
GitOrigin-RevId: e16167515c1c64bb350751fc1e748b719446a5b3
|
2019-03-11 11:03:28 +00:00 |
|
Henry Oswald
|
b9edc0f414
|
Merge pull request #1548 from sharelatex/ho-tpds-linode-hosts
read linode_url in for tpdsworker jobs
GitOrigin-RevId: 23d5b36a881e4d96ddc343444802354594d798d7
|
2019-03-11 11:01:25 +00:00 |
|
Simon Detheridge
|
5d8b8ff012
|
Merge pull request #1530 from sharelatex/spd-dont-cancel-groups-on-invite
Only prompt for group cancellation if group is personal when accepting invite
GitOrigin-RevId: 921807b25d64f037859d303e28c40cdc12eb7685
|
2019-03-11 11:00:48 +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 |
|
Henry Oswald
|
d55b38cc05
|
Merge pull request #1471 from sharelatex/ho-docker2
Move to docker image based builds
GitOrigin-RevId: 992aeaf69bfea4d1847a07c457575a63985d4407
|
2019-03-11 10:59:20 +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 |
|
Brian Gough
|
2ab346e762
|
Merge pull request #1511 from sharelatex/as-inc-linked-file-rev
Increment rev of linked file to fix bug where dropbox not syncing
GitOrigin-RevId: 6779d10f9ed64eeca901590cc888f35382a2b284
|
2019-03-11 10:58:21 +00:00 |
|
Chrystal Maria Griffiths
|
9abea8ae5f
|
Merge pull request #1516 from sharelatex/as-sanitize-team-notice
Show sanitized HTML for team notice on subscription page
GitOrigin-RevId: 20256eed298a709d663bdfd0057e0d8462722a0c
|
2019-02-15 13:33:28 +00:00 |
|
Brian Gough
|
cc613f4370
|
Merge pull request #1507 from sharelatex/mm-pubmodal-show-errors
Return error status to the publish modal on export creation error
GitOrigin-RevId: e46e9c1244ee540a4687240e8ecbb14ff36bd2e8
|
2019-02-14 15:03:42 +00:00 |
|
Shane Kilkelly
|
349d731745
|
Merge pull request #1493 from sharelatex/sk-read-write-token-match-on-prefix
Constant-time comparison for read-write tokens
GitOrigin-RevId: ddd83de551c540544fde426d7d5aca9f4c83fcc7
|
2019-02-14 11:09:40 +00:00 |
|
Brian Gough
|
00cdc008d5
|
Merge pull request #1508 from sharelatex/bg-add-websocket-fallback-option
add fallback to siteUrl if websocket fails
GitOrigin-RevId: fd866d17475cb974e4158ac7a89e972c66f0dd97
|
2019-02-13 09:20:35 +00:00 |
|
Timothée Alby
|
b39626751a
|
Merge pull request #1499 from sharelatex/ta-open-redirect-fix
Prevent Open Redirects
GitOrigin-RevId: 8cd2ead74de60f47b728ac227c21440281b111a5
|
2019-02-12 15:47:41 +00:00 |
|
Alasdair Smith
|
9b97af8977
|
Merge pull request #1403 from sharelatex/as-swap-brand-prefix
Swap brand prefix so OL is the default
GitOrigin-RevId: 60f4f03598fb6befc1ce790d39f546490612a1db
|
2019-02-12 11:32:28 +00:00 |
|
Simon Detheridge
|
7dcc807caf
|
Merge pull request #1479 from sharelatex/sk-check-read-token-against-v1
Check generated read-tokens against v1
GitOrigin-RevId: 15749a41a295c0401b0a39968f2c3657f8abebb8
|
2019-02-11 11:42:29 +00:00 |
|
Simon Detheridge
|
c7f30bdfec
|
Merge pull request #1494 from sharelatex/spd-overleaf-v1-oauth-state
Use 'state' parameter to prefent CSRF attacks when authenticating with v1
GitOrigin-RevId: bf5f8ddffa391d8f3ca84d3588df906b08eb018d
|
2019-02-11 11:42:20 +00:00 |
|
nate stemen
|
4840d9e9bd
|
Merge pull request #1469 from sharelatex/ns-ta-refresh-features-on-donmain-confirm
refresh features on donmain confirm
GitOrigin-RevId: e1c29f1c590aafefef188ddfbc50654194b0747f
|
2019-02-05 15:58:58 +00:00 |
|
Chrystal Maria Griffiths
|
2463fef390
|
Merge pull request #1454 from sharelatex/hb-subscriptions-page-messaging
Subscription page messaging updates
GitOrigin-RevId: c29999d22636dfe11c55b3f6110a38992645fad3
|
2019-02-04 16:24:35 +00:00 |
|
Chrystal Maria Griffiths
|
e73a7dbe9c
|
Merge pull request #1431 from sharelatex/mm-pubmodal-show-errors
Show export creation errors to the user
GitOrigin-RevId: fc116cfcfc2ca49d19188f01ef7b3460e4619503
|
2019-02-04 16:24:30 +00:00 |
|
Chrystal Maria Griffiths
|
d9692b7f91
|
Merge pull request #1168 from sharelatex/cmg-range-prototype
Rich text track changes pt. 1 view changes
GitOrigin-RevId: a50ba1491a46525894b32b87a8c05be0af90084d
|
2019-01-30 14:07:06 +00:00 |
|
Douglas Lovell
|
dc60d6b630
|
Merge remote-tracking branch 'origin/as-validate-email-length'
GitOrigin-RevId: 00f46c637a7563443e903f491ec39446dc570b5f
|
2019-01-29 20:32:28 +00:00 |
|
Timothée Alby
|
9a0dd31d8c
|
Merge pull request #1061 from sharelatex/ja-remove-domain-license-code
Remove deprecated domain license code
GitOrigin-RevId: c9eebe1a657b07b69d618cdb5e73b64782109714
|
2019-01-29 12:08:29 +00:00 |
|
Timothée Alby
|
bc2ee419eb
|
Merge pull request #1451 from sharelatex/ns-check-institution-users-patch
remove extra emails call in mongo query
GitOrigin-RevId: d64ab2ef72fe7691bc29e56210de0e04743ee917
|
2019-01-29 12:08:24 +00:00 |
|
Timothée Alby
|
b311f997aa
|
Merge pull request #1444 from sharelatex/ta-ns-check-institution-users
add script to check all if users on institution are upgraded
GitOrigin-RevId: 903f3a65fc038862178a82f43d97a5a4630cf470
|
2019-01-28 14:38:29 +00:00 |
|
Douglas Lovell
|
d2bccbec25
|
Merge remote-tracking branch 'origin/sk-admin-panel-projects'
GitOrigin-RevId: 56f17fe3bec6252bd3d933899e540813550a36ff
|
2019-01-24 12:13:16 +00:00 |
|