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 |
|
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 |
|
Jessica Lawshe
|
b8bb118fe3
|
Merge pull request #1528 from sharelatex/jel-portal-print
Update portals for printing
GitOrigin-RevId: ad3861b8464f0e5a8d8e70daa0166ebcf7d2312d
|
2019-03-11 10:59:47 +00:00 |
|
Henry Oswald
|
0df9c6440b
|
test commit
GitOrigin-RevId: be8e7c9ffd2be973fe9ae38f55951aa7a24415db
|
2019-03-11 10:59:30 +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 |
|
Ersun Warncke
|
57450bb0fb
|
Merge pull request #1522 from sharelatex/ew-smoke-test-remove-rate-limit
Remove smoke test rate limit, use POST for logout
GitOrigin-RevId: 0152f259b4a4375147857cc25156621de87f8bc9
|
2019-03-11 10:59:09 +00:00 |
|
Brian Gough
|
1ee4a1816c
|
Merge pull request #1483 from sharelatex/jel-cms-table-style
Add styling for tables on CMS pages
GitOrigin-RevId: 3d258c5453cd47b434a6d3804687ca044cc704eb
|
2019-03-11 10:58:57 +00:00 |
|
Brian Gough
|
15a6169a06
|
Merge pull request #1526 from sharelatex/revert-1467-as-global-search-keybind
Revert "Enable search keybinding globally in editor"
GitOrigin-RevId: 423bebb48a237c8bda935bb6cb70c5cf953b7015
|
2019-03-11 10:58:47 +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
|
e379691767
|
Merge pull request #1521 from sharelatex/as-fix-noreferrer-noopener
Add some missing rel="noreferrer noopener" attributes
GitOrigin-RevId: 470de17ba724b8ba544b736bf3a7682b3d499a5d
|
2019-02-15 13:33:54 +00:00 |
|
Chrystal Maria Griffiths
|
bf5a28b258
|
Merge pull request #1509 from sharelatex/as-update-google-config
Use env var for brandPrefix for compatibility with google infrastructure
GitOrigin-RevId: c7749007d3fbd3746cd8f6771d6b394f5864dd9f
|
2019-02-15 13:33:49 +00:00 |
|
Chrystal Maria Griffiths
|
d52c30f272
|
Merge pull request #1512 from sharelatex/as-rate-limit-confirm-uni-domain-endpoint
Rate limit confirm university domain endpoint
GitOrigin-RevId: 1d03eec3c0e8208e5f643000693f685957e15442
|
2019-02-15 13:33:42 +00:00 |
|
Chrystal Maria Griffiths
|
96f283e2c6
|
Merge pull request #1477 from sharelatex/as-confirm-quick-action-archive-leave
Confirm archive or leave when clicking quick action buttons
GitOrigin-RevId: 95d728f22284bab17887a5ac7bc7461d501db7a2
|
2019-02-15 13:33:38 +00:00 |
|
Chrystal Maria Griffiths
|
b1c40d2c58
|
Merge pull request #1501 from sharelatex/cmg-anonymous-display-name
Label only truly anonymous users as anonymous
GitOrigin-RevId: c33a5c0584bd8a0603921fcf1579204b5fcac009
|
2019-02-15 13:33:33 +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 |
|
Chrystal Maria Griffiths
|
778af6ca40
|
Merge pull request #1510 from sharelatex/ns-moar-contrast
better contrast in github modal
GitOrigin-RevId: b841f18933bfa2c916c8d2092578a895db0346dd
|
2019-02-15 13:33:23 +00:00 |
|
Jessica Lawshe
|
429e392fbb
|
Merge pull request #1518 from sharelatex/jel-search-result-url
encodeURIComponent on wiki search result
GitOrigin-RevId: 87cb53784de691677a56a5e3fc139a35ad7ae941
|
2019-02-14 18:24:27 +00:00 |
|
Jessica Lawshe
|
c9eab36031
|
Merge pull request #1455 from sharelatex/jel-cms-color-block
Add color block feature to CMS pages
GitOrigin-RevId: 51a9828d62275308422bdb0d6e2e90cfef0a638a
|
2019-02-14 18:24:22 +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 |
|
Brian Gough
|
1940e9b061
|
Merge pull request #1523 from sharelatex/bg-avoid-unwanted-fallback-on-network-errors
avoid fallback to old websocket if initial connection succeeded
GitOrigin-RevId: 1b3f38d0a0f4889b9a15fa071de90a0a9c9a5699
|
2019-02-14 14:39:19 +00:00 |
|
Shane Kilkelly
|
e78487922e
|
Merge pull request #1513 from sharelatex/sk-migrate-read-and-write-token-prefix-post-deploy
Script to re-activate token access for select projects
GitOrigin-RevId: df379f49ec840948ec1afc0864b35b5b5746ebc1
|
2019-02-14 11:09:45 +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 |
|
Shane Kilkelly
|
25a0ea8752
|
Merge pull request #1495 from sharelatex/sk-migrate-read-and-write-token-prefix
Add migrations for new project property: `tokens.readAndWritePrefix`
GitOrigin-RevId: 276a9e53533ae76e04e20fd94234f65999874662
|
2019-02-14 10:27:02 +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 |
|