Jakob Ackermann
|
a517c15053
|
[docker] include the LICENSE file in the image
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
|
2019-04-17 23:10:08 +02:00 |
|
Jessica Lawshe
|
1306de81e1
|
Merge pull request #1711 from sharelatex/pr-fix-tc-toggle-ie
Fix review panel toggles in IE11.
GitOrigin-RevId: f8c0c8191a8299da87c6308749bace0d7bf8bca8
|
2019-04-17 14:14:27 +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 |
|
Jakob Ackermann
|
2ebae69044
|
[docker] build the git-bridge in docker
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
|
2019-04-17 13:45:21 +02:00 |
|
Paulo Jorge Reis
|
f2fbdcc078
|
Merge pull request #1718 from sharelatex/revert-1667-pr-add-post-integration-survey-link
Revert "Add survey link in the projects list sidebar."
GitOrigin-RevId: 22b3a9bce5e53d54929f9593af4156b668665de2
|
2019-04-17 10:45:15 +00:00 |
|
Paulo Jorge Reis
|
8b7b49f72a
|
Merge pull request #1693 from sharelatex/cmg-clone-owners
Return new project data from api when cloning
GitOrigin-RevId: 726ee5a37a7f74f2f618ca911ae9c2c991f12786
|
2019-04-17 10:26:11 +00:00 |
|
Paulo Jorge Reis
|
5a6cdf0999
|
Merge pull request #1679 from sharelatex/cmg-dashboard-owner
Fix ordering by Owner on the dashboard
GitOrigin-RevId: ec780ae8de5221e151f970638f3fa55c00bd6767
|
2019-04-17 10:26:03 +00:00 |
|
Paulo Jorge Reis
|
6c6bc1216a
|
Merge pull request #1670 from sharelatex/pr-fix-contrast-issues
Fix contrast issues (and others)
GitOrigin-RevId: 5882978b70163e65efdf0ef7d5f82a8fc29b48ec
|
2019-04-17 10:25:55 +00:00 |
|
Jakob Ackermann
|
85a8e377fc
|
[docker] use a base image that already contains maven and openjdk
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
|
2019-04-17 11:21:41 +02:00 |
|
nate stemen
|
bec56ccafa
|
Merge pull request #1713 from sharelatex/ns-captchas-two
turn off captchas for project invite
GitOrigin-RevId: 3e044ba8c6bb2ffb77ea4486f7b51a587133839c
|
2019-04-16 18:47:56 +00:00 |
|
James Allen
|
2a1e843558
|
Merge pull request #49 from sharelatex/ja-record-snapshots-of-ranges
Record a snapshot to mongo when a doc's comments/changes get collapsed
|
2019-04-16 14:34:51 +01:00 |
|
Brian Gough
|
1078688895
|
Merge pull request #1716 from sharelatex:bg-fix-merge-conflict
fix incorrect merge conflict
GitOrigin-RevId: 55e19f025a433e8abbde16bd68ccbc3e21f7964f
|
2019-04-16 10:05:38 +00:00 |
|
James Allen
|
52f3596e53
|
Review feedback
|
2019-04-16 11:05:17 +01:00 |
|
Brian Gough
|
5864e90794
|
Merge pull request #1698 from sharelatex/bg-send-hash-when-debugging
send sha1 hash when in debug mode
GitOrigin-RevId: 7a906deb15f1be0ac2e41d4ff2e1f105018b22f6
|
2019-04-16 09:06:23 +00:00 |
|
Brian Gough
|
f3960db1ad
|
Merge pull request #1701 from sharelatex/bg-send-last-version
send last version to docupdater
GitOrigin-RevId: fab3415fdb1f37982d8089a9d0b35fd06f7459ae
|
2019-04-16 08:34:44 +00:00 |
|
Brian Gough
|
d82f679fd7
|
Merge pull request #1699 from sharelatex/bg-improve-logging
improve logging
GitOrigin-RevId: 0d87db74c62aa5c887412250c26f5acccdf73acf
|
2019-04-16 08:34:37 +00:00 |
|
Brian Gough
|
0eaf6db2d6
|
Merge pull request #1703 from sharelatex/bg-handle-send-before-rejoin
handle error gracefully when client has not yet joined project
GitOrigin-RevId: 21e337f6adbbb23a2126eaf4fa026c78178efef0
|
2019-04-16 08:34:31 +00:00 |
|
Hugh O'Brien
|
9644ff4f51
|
Merge pull request #1714 from sharelatex/spd-middlewear-oops
Fix spelling in UserMembershipAuthorization
GitOrigin-RevId: cca5e5d13d7eb33e12f73be9172bc5cbe90312c0
|
2019-04-15 16:09:26 +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 |
|
Brian Gough
|
2828cc3d7f
|
Merge pull request #45 from sharelatex/bg-update-request
update request module
|
2019-04-15 15:37:14 +01:00 |
|
Brian Gough
|
2277872022
|
update package.json to current version of request
|
2019-04-15 15:26:04 +01:00 |
|
Brian Gough
|
6a7679d55c
|
Merge pull request #44 from sharelatex/bg-add-pubsub-health-check
add health check to pubsub channels
|
2019-04-15 15:20:24 +01:00 |
|
Brian Gough
|
15c7c911f9
|
update request module
|
2019-04-15 14:46:58 +01:00 |
|
Brian Gough
|
2dbdcf5bc8
|
add health check to pubsub channels
|
2019-04-15 14:17:55 +01:00 |
|
Shane Kilkelly
|
0773311805
|
Merge pull request #1674 from sharelatex/sk-email-make-primary-tooltip
Change the wording on emails from 'default' to 'primary'
GitOrigin-RevId: e09792f6fba73b626c09d8f1bf4298b6e9780d15
|
2019-04-13 01:57:15 +00:00 |
|
Shane Kilkelly
|
f3dd61abce
|
Merge pull request #1657 from sharelatex/sk-rate-limit-join-project
Add a rate-limit to joinProject
GitOrigin-RevId: 27edd8b56ae80868b5fcd0b803d0e042dce26f31
|
2019-04-13 01:57:10 +00:00 |
|
Henry Oswald
|
816c49daf2
|
bump metrics to 2.1.2
|
2019-04-12 12:36:47 +01:00 |
|
Henry Oswald
|
d4faaaa60e
|
use console.log not logger.log
we don't habe verbiouse lossing enabled that early in the apps lifecycle
also best not to require modules before enabling profiler
|
2019-04-12 12:34:17 +01:00 |
|
James Allen
|
33478f95fd
|
Fix package.json versions
|
2019-04-11 16:32:31 +01:00 |
|
Brian Gough
|
e72acacf17
|
downsample logging
|
2019-04-11 16:25:42 +01:00 |
|
Brian Gough
|
9eee098af4
|
Merge pull request #43 from sharelatex/bg-update-ioredis
update to redis-sharelatex v1.0.6 for latest ioredis
|
2019-04-11 15:50:56 +01:00 |
|
Brian Gough
|
8006e4f2d5
|
Merge pull request #42 from sharelatex/bg-add-event-metric
add metric for applied-ops events
|
2019-04-11 15:50:15 +01:00 |
|
Brian Gough
|
cefdd15c5e
|
update to redis-sharelatex v1.0.6 for latest ioredis
|
2019-04-11 15:49:19 +01:00 |
|
Brian Gough
|
16cc171abc
|
Merge pull request #7 from sharelatex/bg-allow-updates-to-ioredis
allow patch updates to ioredis 4.6.0
|
2019-04-11 15:40:14 +01:00 |
|
Brian Gough
|
ef9e97e7d1
|
add metric for applied-ops events
|
2019-04-11 15:39:28 +01:00 |
|
Brian Gough
|
f4b2f7742e
|
allow patch updates to ioredis 4.6.0
|
2019-04-11 15:24:27 +01:00 |
|
Brian Gough
|
01a1923e1f
|
Merge pull request #41 from sharelatex/bg-handle-duplicate-events
handle duplicate events
|
2019-04-11 15:17:31 +01:00 |
|
Brian Gough
|
6374a641d5
|
fix unit tests
|
2019-04-11 15:07:42 +01:00 |
|
Brian Gough
|
c6225d614e
|
add /debug/events endpoint
|
2019-04-11 15:00:25 +01:00 |
|
James Allen
|
3d76f4b9bf
|
Record a snapshot to mongo when a doc's comments/changes get collapsed
|
2019-04-11 13:27:46 +01:00 |
|
Brian Gough
|
2a31139254
|
log and skip duplicate events
|
2019-04-11 12:53:43 +01:00 |
|
John Lees-Miller
|
234f7e1c4d
|
Merge pull request #615 from sharelatex/cla-link
Update CLA and other links
|
2019-04-10 16:50:10 +01:00 |
|
John Lees-Miller
|
98bc755b9f
|
Update CLA and other links
|
2019-04-10 16:15:41 +01:00 |
|
Chrystal Maria Griffiths
|
36d0e8e199
|
Merge pull request #1654 from sharelatex/ns-add-status-page
add status.overleaf.com to 500 page
GitOrigin-RevId: 47988918a4c2ea83b2edbd9f850d65a0d2bcdf82
|
2019-04-10 09:52:46 +00:00 |
|
Chrystal Maria Griffiths
|
5d6a307234
|
Merge pull request #1664 from sharelatex/as-fix-read-only-comment
Only show add comment button if user has permission
GitOrigin-RevId: e2de9ec435eff45d575a368f07ff40416ed43f1f
|
2019-04-10 09:52:41 +00:00 |
|
Chrystal Maria Griffiths
|
ab6565beb8
|
Merge pull request #1697 from sharelatex/cmg-leave-archived
Leave an archived project
GitOrigin-RevId: c1da7fdff9ae90b9992ed99dbcff3e7ee31ec4d9
|
2019-04-10 09:52:36 +00:00 |
|
Brian Gough
|
9a32c2eebb
|
Merge pull request #40 from sharelatex/bg-handle-duplicate-clients
handle duplicate entries in io.sockets.clients
|
2019-04-09 15:39:08 +01:00 |
|
Brian Gough
|
893515e83f
|
handle duplicate entries in io.sockets.clients
|
2019-04-09 14:48:00 +01:00 |
|
Brian Gough
|
f8066349c4
|
Merge pull request #1700 from sharelatex/bg-simplify-queue
simplify queuing code
GitOrigin-RevId: 9c6ce66e9a3272dea28284d3cbf1dc65c9cbc825
|
2019-04-09 11:01:42 +00:00 |
|
Paulo Jorge Reis
|
9c5c6922b9
|
Merge pull request #1626 from sharelatex/pr-history-drag-and-drop-selection
History drag and drop selection
GitOrigin-RevId: d2bc0dfc2e2634553224b7bef2ac5d926d42bf01
|
2019-04-09 10:11:13 +00:00 |
|