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 |
|
Henry Oswald
|
68c7cc6fa3
|
Merge pull request #1577 from sharelatex/ho-jenkins-github-connection
point to the web-sharelatex-internal repo for github-> jenkins
GitOrigin-RevId: 9f31bed9296181484baf9dc11d488763f1b57b50
|
2019-03-11 11:04:10 +00:00 |
|
Hugh O'Brien
|
491c29bad1
|
Merge pull request #1569 from sharelatex/hb-v2-metrics-email-opt-out
v2 metrics email opt out and last sent tracking
GitOrigin-RevId: d45ac653c26e780dc380883c0ac1da7436bf8c2b
|
2019-03-11 11:03:39 +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 |
|
Douglas Lovell
|
65012e5037
|
Merge branch 'dcl-i1507c'
GitOrigin-RevId: fc12ab4d20918e83f7aa05ba5263c785d594c8dc
|
2019-03-11 11:03:18 +00:00 |
|
Hugh O'Brien
|
f887bcb121
|
Merge pull request #1556 from sharelatex/cmg-search-clearing
Stop search bar clearing on enter
GitOrigin-RevId: c3dc6236e3fd889b229f68633a17b396cbe45f60
|
2019-03-11 11:03:07 +00:00 |
|
Hugh O'Brien
|
72933bdd81
|
Merge pull request #1546 from sharelatex/sk-add-routes-script
Add a script to print all routes in the project
GitOrigin-RevId: 47e55bb24fb16864296222b7a87b21901c56f084
|
2019-03-11 11:02:51 +00:00 |
|
Jessica Lawshe
|
0d4c92054b
|
Merge pull request #1557 from sharelatex/ew-update-clean
add network/image prune for clean_ci
GitOrigin-RevId: 23be6f849c0c0fd473a76c12e5ba03565f1f3808
|
2019-03-11 11:02:32 +00:00 |
|
Jessica Lawshe
|
dc06e166c3
|
Merge pull request #1562 from sharelatex/jel-blog-sidebar
Add blog sidebar
GitOrigin-RevId: 9eab27eaad650e20166cceb20b9df49c2f9e2601
|
2019-03-11 11:02:18 +00:00 |
|
Jessica Lawshe
|
e5d453454e
|
Merge pull request #1561 from sharelatex/jel-subscription-events
Also send subscription events to Google Analytics
GitOrigin-RevId: b1a078550c7c92863f3d8225aa78b9240faa2e72
|
2019-03-11 11:02:08 +00:00 |
|
Paulo Jorge Reis
|
46c6d11574
|
Merge pull request #1544 from sharelatex/pr-fix-sl-history-toolbar
Show the toolbar in SL history projects.
GitOrigin-RevId: ea268638c4ccfd2439a624fc10966f9b9c9ae86b
|
2019-03-11 11:01:56 +00:00 |
|
Henry Oswald
|
e4153ae3e4
|
Merge pull request #1554 from sharelatex/ew-build-tests
Bump timeout for unit tests
GitOrigin-RevId: 2354d4620d1c91e99c80612659a43509b54cdbc9
|
2019-03-11 11:01:45 +00:00 |
|
Henry Oswald
|
d12dd862c8
|
Merge pull request #1551 from sharelatex/ho-docker-debug
Add missing config into defaults file
GitOrigin-RevId: 7d47bce6b6b429eab8d2765b081967ce52908c27
|
2019-03-11 11:01:34 +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
|
6e960492ff
|
Merge pull request #1550 from sharelatex/spd-fix-broken-team-invite-accept
Fix broken accept-team-invite page
GitOrigin-RevId: 0ba3c906548358931902beb48812257da16fc5db
|
2019-03-11 11:01:10 +00:00 |
|
Ersun Warncke
|
2421593d85
|
run unit and acceptance tests in parallel (#1545)
GitOrigin-RevId: fefdfa04d9b9496bf6c98b37331fc4a084de065a
|
2019-03-11 11:00:58 +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
|
f84e94dc88
|
Merge pull request #1533 from sharelatex/as-fix-extra-bracket
Fix autocomplete inserting extra brace when completing command with optional argument
GitOrigin-RevId: cb01eb0b7df400997e5f7dc25a92ef7660689709
|
2019-03-11 11:00:36 +00:00 |
|
Simon Detheridge
|
c6b8ab3245
|
Merge pull request #1542 from sharelatex/as-fix-noopener
Fix some missing noopener attributes
GitOrigin-RevId: a833fc26b2c783bb713f771fb2ae4a494e5fec63
|
2019-03-11 11:00:17 +00:00 |
|