Simon Detheridge
|
f9594707ca
|
Merge pull request #1662 from sharelatex/as-fix-wrong-favicon
Fix missed favicon path update and make track-changes page inherit from layout
GitOrigin-RevId: e702b965b7445d86193b3b914d40d91a9a3345e3
|
2019-03-25 15:52:44 +00:00 |
|
Simon Detheridge
|
cd9ed1dd6b
|
Merge pull request #1663 from sharelatex/cmg-rttc-typo
Fix lack of whitespace typo on review panel
GitOrigin-RevId: cfbbf421800af479f148d2006b96242acef7f275
|
2019-03-25 15:52:38 +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
|
db162cfe0a
|
Merge pull request #1656 from sharelatex/cmg-reintroduce-beta-fix-path
Use path.join() in reintroduce beta script to pass linting
GitOrigin-RevId: 4936de04b389571e73de3ddcae8ee611634efcaf
|
2019-03-22 13:02:21 +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
|
2bf6e4e072
|
Merge pull request #1638 from sharelatex/spd-delete-user-rate-limit
Add rate limit to user deletion
GitOrigin-RevId: 4269277ea88b32b93f897a2b2709385ab379e479
|
2019-03-22 12:28:30 +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
|
49a5056e78
|
Merge pull request #1637 from sharelatex/as-clear-undo-stack-remote-edit
Clear undo stack when remote change is received
GitOrigin-RevId: 1a1d1e34827e002e08a264bffa467d77701ce758
|
2019-03-22 10:27:51 +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 |
|
Henry Oswald
|
494f749e72
|
Merge pull request #1651 from sharelatex/ho-check-exit-codes
Check exit codes of parallel build tasks
GitOrigin-RevId: fb242722d8a886c64b61876cfdcbece9bfa987e6
|
2019-03-21 11:14:37 +00:00 |
|
Timothée Alby
|
983b1a0f57
|
Merge pull request #1648 from sharelatex/ho-simple-client-build
Simple client build
GitOrigin-RevId: d7107104960c97bad7ec1316b5e6720a6c1017b6
|
2019-03-20 17:12:10 +00:00 |
|
Timothée Alby
|
27251bc1ac
|
Merge pull request #1646 from sharelatex/ho-fail-lint
Remove `set -e` from build process and wait for each previous task
GitOrigin-RevId: 4ece4b70c729e8de654adae0053fdb28f0f86799
|
2019-03-20 17:12:02 +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 |
|
Henry Oswald
|
991cbf3fee
|
Merge pull request #1636 from sharelatex/ho-fail-lint
throw error in bash quickly on error
GitOrigin-RevId: 03df23aff25583f3af122f9a643c8faef64c5c46
|
2019-03-18 15:37:03 +00:00 |
|
Alasdair Smith
|
e6e3c023ed
|
Merge pull request #1635 from sharelatex/as-fix-broken-chat-mathjax
Fix broken messages in chat due to mathjax XSS filtering
GitOrigin-RevId: 8d5eb1f4df6496cafabff4669e5e59633c160647
|
2019-03-18 12:12:10 +00:00 |
|
Alasdair Smith
|
41f75b5936
|
Merge pull request #1543 from sharelatex/as-fix-potential-angular-xss
Fix potential Angular XSS issues
GitOrigin-RevId: a18a609a25b29e910cb78e28a37398417cfe4842
|
2019-03-18 10:37:15 +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
|
1edf1964c8
|
Merge pull request #1607 from sharelatex/spd-succserror
Don't show 'No errors' message if PDF generation fails
GitOrigin-RevId: 7ed454b489dcef419c51f48b6c5b3920d5558a79
|
2019-03-14 16:02:32 +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
|
a1e16c9676
|
Merge pull request #1600 from sharelatex/as-rttc-text-markers
Switch delete track change markers to use bookmark system to improve performance
GitOrigin-RevId: 865003ba30728f7104ad4c1b9e114998aa7d66a0
|
2019-03-13 16:52:11 +00:00 |
|
Jessica Lawshe
|
4652b69488
|
Merge pull request #1617 from sharelatex/ho-logger-use-metrics-name
use METRICS_APP_NAME for the logger
GitOrigin-RevId: 536a76119f7b4be92985f62d4e007a88c36cd430
|
2019-03-13 16:52:03 +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 |
|
Timothée Alby
|
5b5b06307a
|
Merge pull request #1596 from sharelatex/ja-more-client-error-logging
Increase the number and type of events we log
GitOrigin-RevId: 5384beb86f095d673deebe7b17d76668137fc912
|
2019-03-11 11:08:20 +00:00 |
|
Timothée Alby
|
b86a949f50
|
Merge pull request #1485 from sharelatex/cmg-comments-track-changes
Add comments highlighting to rich text track changes
GitOrigin-RevId: 7f81490417cc228db5f6f687c309a4e39c0b25d5
|
2019-03-11 11:08:10 +00:00 |
|
Timothée Alby
|
8187eb7fcb
|
Merge pull request #1592 from sharelatex/ew-clean-stray-containers
Clean Up Containers
GitOrigin-RevId: 334f5458981b68432f0e0d086176f508ee83e836
|
2019-03-11 11:07:59 +00:00 |
|
Timothée Alby
|
89f31d71e3
|
Merge pull request #1603 from sharelatex/spd-admin-panel-buttons-not-working
Don't use multipart/form-data for admin panel buttons
GitOrigin-RevId: 97c265a1c0addbddf5628d5e0c70fedb38bda75d
|
2019-03-11 11:07:45 +00:00 |
|
Timothée Alby
|
e1fb28ae28
|
Merge pull request #1598 from sharelatex/jel-wiki-search
Stop search bar clearing on enter
GitOrigin-RevId: 54d0de33fc196ea97b3f8628442704475aa959dd
|
2019-03-11 11:07:34 +00:00 |
|
Timothée Alby
|
72ae3f3aa5
|
Merge pull request #1601 from sharelatex/hb-metrics-email-bugfixes
Fixes for unsubscribing from metrics email
GitOrigin-RevId: 7d7ae79275d6216ef2b44d2e75c51fabf460ef65
|
2019-03-11 11:07:20 +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 |
|
Simon Detheridge
|
f5ecc5ad85
|
Merge pull request #1585 from sharelatex/spd-bin-run
Add bin/run wrapper to web
GitOrigin-RevId: e324256fdca6b334d25385148e7517b4c4c5e702
|
2019-03-11 11:06:57 +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
|
b9e88c7998
|
Merge remote-tracking branch 'origin/bg-accept-larger-document-size-on-api-requests'
GitOrigin-RevId: b06511daa7000878646f5cb8132d6077304f5f8c
|
2019-03-11 11:06:23 +00:00 |
|
Douglas Lovell
|
f090eb6d06
|
Merge remote-tracking branch 'origin/pr-update-files-to-hash'
GitOrigin-RevId: dec35961f496f14357757248a62fe4c7d7fc1def
|
2019-03-11 11:06:10 +00:00 |
|
Douglas Lovell
|
24da4799ed
|
Merge remote-tracking branch 'origin/jel-payment-countries'
GitOrigin-RevId: 412422397ad36408566899b7b2bcbbaabf88138b
|
2019-03-11 11:05:58 +00:00 |
|
Douglas Lovell
|
ce8695c951
|
Merge branch 'dcl-i1261b'
GitOrigin-RevId: 2d6c318e12220f39309238a2c7c76650cefa8be6
|
2019-03-11 11:05:47 +00:00 |
|
Douglas Lovell
|
44dd7c1c75
|
Merge remote-tracking branch 'origin/as-fix-email-address'
GitOrigin-RevId: 5fa0d5b540f0d7b79a1dab0c6dc345bcb06d04e2
|
2019-03-11 11:05:36 +00:00 |
|
Douglas Lovell
|
eadc6b838b
|
Merge branch 'dcl-i1507e'
GitOrigin-RevId: 6368f274c2b19d12c571cf065291805a4ff50a4e
|
2019-03-11 11:05:26 +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
|
96759a90f4
|
Merge pull request #1578 from sharelatex/jel-student-disclaimer
Show disclaimer on student subscription trials
GitOrigin-RevId: dfac98e74b3bc34742a179193cc8ce92deb14229
|
2019-03-11 11:04:46 +00:00 |
|
Simon Detheridge
|
97145847ef
|
Merge pull request #1574 from sharelatex/sk-ignore-external-updates-from-gitbridge
When a document is updated externally via git-bridge, don't show warning
GitOrigin-RevId: bede2fa0c555a597ac40e8680ff30a51da0ab429
|
2019-03-11 11:04:35 +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 |
|