Commit Graph

  • 5907172463 Merge remote-tracking branch 'upstream/master' into misc/docker-build Jakob Ackermann 2019-05-05 18:32:35 +02:00
  • d1dc6b8ce7 bump ioredis Henry Oswald 2019-05-03 11:37:32 +01:00
  • db590651ee make ioredis the driver for standard connections Henry Oswald 2019-05-03 11:33:24 +01:00
  • a33cd6cbbf Bump buildscripts from 1.1.11 to 1.1.20 Christopher Hoskin 2019-05-02 15:27:21 +01:00
  • daca83a057 add dryRun option to flush all projects Henry Oswald 2019-05-02 16:54:22 +01:00
  • d5d1736a5e adds /flush_all_projects project Henry Oswald 2019-05-02 16:30:36 +01:00
  • 5b7b9fc97b Store lastUpdatedBy Value on Projects (#1727) Timothée Alby 2019-05-02 15:03:48 +01:00
  • 5b7974065d Prevent registration of new accounts with existing secondary emails (#1696) Timothée Alby 2019-05-02 15:03:36 +01:00
  • 70c505830b Persist Last Author id on Document Flush (#50) Timothée Alby 2019-05-02 15:09:58 +01:00
  • a79adcd325 [logging] do not overwrite the logger name Jakob Ackermann 2019-05-02 01:26:35 +02:00
  • f583ffdbff Merge pull request #1740 from sharelatex/spd-captcha-on-register Brian Gough 2019-05-02 10:29:10 +01:00
  • c1c23e4bee record last author id on document flush Tim Alby 2019-04-22 20:02:48 -04:00
  • c59a3db4e8 [FSPersistorManager] fix the stream opening for node10+ Jakob Ackermann 2019-05-02 02:04:59 +02:00
  • 5049dc083e Merge pull request #1739 from sharelatex/bg-upgrade-history-in-project-admin-page Alasdair Smith 2019-05-01 10:25:27 +01:00
  • 028c3bc94c Merge pull request #1742 from sharelatex/bg-avoid-unnecessary-callback-for-emit-to-room Alasdair Smith 2019-05-01 10:23:48 +01:00
  • 2c30ae0f8a Merge pull request #1738 from sharelatex/spd-dumpfolder Alasdair Smith 2019-05-01 10:23:35 +01:00
  • 79a314d5fd [misc] disable the flash transport Jakob Ackermann 2019-05-01 00:56:32 +02:00
  • 6601e94db7 [misc] bump socket.io to 0.9.19 for node7+ support Jakob Ackermann 2019-04-30 23:33:59 +02:00
  • 77a711f7a3 Merge pull request #1732 from sharelatex/bg-avoid-null-in-remove-element Brian Gough 2019-04-29 10:16:43 +01:00
  • 68e7b9c4e9 Merge pull request #48 from sharelatex/bg-check-incoming-hash Brian Gough 2019-04-29 10:15:44 +01:00
  • a2d041ffae Merge pull request #58 from overleaf/sk-docker-maven-base-image Shane Kilkelly 2019-04-29 10:00:15 +01:00
  • 35ac848f43 [docker] install git in the app image Jakob Ackermann 2019-04-26 20:07:58 +02:00
  • a333aabfa9 [WLGitBridgeIntegrationTest] adjust the urls for the individual tests Jakob Ackermann 2019-04-26 23:49:26 +02:00
  • 5040b4d7f0 [WLGitBridgeIntegrationTest] ensure that we stop the started servers Jakob Ackermann 2019-04-26 23:33:12 +02:00
  • c3308e565b Add git, make, and curl to docker image Shane Kilkelly 2019-04-26 15:29:44 +01:00
  • bf44fe3b29 Merge pull request #56 from das7pad/misc/dry-dockerfile Shane Kilkelly 2019-04-26 14:09:23 +01:00
  • 5517adcbd1 Merge pull request #1726 from sharelatex/hb-sso-password-setting Simon Detheridge 2019-04-25 15:21:47 +01:00
  • 16f905358a Merge pull request #1690 from sharelatex/cmg-color-tags Simon Detheridge 2019-04-25 15:21:35 +01:00
  • d2de6d8e87 Merge pull request #1689 from sharelatex/revert-1684-revert-1637-as-clear-undo-stack-remote-edit Simon Detheridge 2019-04-25 15:21:25 +01:00
  • 9808eb7f55 Merge pull request #1722 from sharelatex/jel-password-descriptive-message Simon Detheridge 2019-04-25 15:21:10 +01:00
  • 3990a5d736 Merge pull request #1724 from sharelatex/ta-subscription-canceled-page Simon Detheridge 2019-04-25 15:20:55 +01:00
  • 6c04bc8712 Merge pull request #1728 from sharelatex/jel-feature-event Simon Detheridge 2019-04-25 15:20:43 +01:00
  • cc96ecfd74 Merge pull request #1734 from sharelatex/spd-delete-user-crash Simon Detheridge 2019-04-25 15:20:28 +01:00
  • e1ec01eb0f Merge pull request #1719 from sharelatex/ja-restore-doc-snapshots Brian Gough 2019-04-24 14:12:22 +01:00
  • 967973f354 Only show label version button for users with write permission (#1665) Timothée Alby 2019-04-23 10:21:23 -04:00
  • d3f0285fd2 Ensure project name is unique when transferring to another user (#1712) Timothée Alby 2019-04-23 10:21:13 -04:00
  • 85e7f688d5 Display Pricing Exceptions on Subscription Dashboard (#1720) Timothée Alby 2019-04-23 10:21:00 -04:00
  • 44ba16bb7c Fix Wording in Subscription Cancellation Flow (#1723) Timothée Alby 2019-04-23 10:20:49 -04:00
  • 2a73d8106b Send Email on Subscription Reactivation (#1721) Timothée Alby 2019-04-23 10:20:19 -04:00
  • 54186d9db1 Add linked accounts section to user settings page (#1705) Timothée Alby 2019-04-23 10:19:52 -04:00
  • e2793f659c Don't Sanitize Undefined Team Notices (#1725) Timothée Alby 2019-04-23 10:19:18 -04:00
  • 6232854ff7 Remove User Memberships on Deletion (#1688) Timothée Alby 2019-04-23 10:19:07 -04:00
  • b9c3bf3f58 add missing aspell-sl lang Henry Oswald 2019-04-23 13:47:11 +01:00
  • 5b1481fc12 [docker] add support for a different docker group id on the docker host Jakob Ackermann 2019-04-22 01:38:24 +02:00
  • a517c15053 [docker] include the LICENSE file in the image Jakob Ackermann 2019-04-17 23:10:08 +02:00
  • 1306de81e1 Merge pull request #1711 from sharelatex/pr-fix-tc-toggle-ie Jessica Lawshe 2019-04-17 09:00:36 -05:00
  • f455a11aa8 Merge pull request #1655 from sharelatex/jel-user-must-reconfirm Jessica Lawshe 2019-04-17 09:00:13 -05:00
  • 2ebae69044 [docker] build the git-bridge in docker Jakob Ackermann 2019-04-17 13:45:21 +02:00
  • f2fbdcc078 Merge pull request #1718 from sharelatex/revert-1667-pr-add-post-integration-survey-link Paulo Jorge Reis 2019-04-17 11:32:02 +01:00
  • 8b7b49f72a Merge pull request #1693 from sharelatex/cmg-clone-owners Paulo Jorge Reis 2019-04-17 11:11:44 +01:00
  • 5a6cdf0999 Merge pull request #1679 from sharelatex/cmg-dashboard-owner Paulo Jorge Reis 2019-04-17 11:11:32 +01:00
  • 6c6bc1216a Merge pull request #1670 from sharelatex/pr-fix-contrast-issues Paulo Jorge Reis 2019-04-17 11:11:17 +01:00
  • 85a8e377fc [docker] use a base image that already contains maven and openjdk Jakob Ackermann 2019-04-17 11:21:41 +02:00
  • bec56ccafa Merge pull request #1713 from sharelatex/ns-captchas-two nate stemen 2019-04-16 14:36:24 -04:00
  • 2a1e843558 Merge pull request #49 from sharelatex/ja-record-snapshots-of-ranges James Allen 2019-04-16 14:34:51 +01:00
  • 1078688895 Merge pull request #1716 from sharelatex:bg-fix-merge-conflict Brian Gough 2019-04-16 10:52:56 +01:00
  • 52f3596e53 Review feedback James Allen 2019-04-16 11:05:17 +01:00
  • 5864e90794 Merge pull request #1698 from sharelatex/bg-send-hash-when-debugging Brian Gough 2019-04-16 09:54:59 +01:00
  • f3960db1ad Merge pull request #1701 from sharelatex/bg-send-last-version Brian Gough 2019-04-16 09:23:11 +01:00
  • d82f679fd7 Merge pull request #1699 from sharelatex/bg-improve-logging Brian Gough 2019-04-16 09:22:26 +01:00
  • 0eaf6db2d6 Merge pull request #1703 from sharelatex/bg-handle-send-before-rejoin Brian Gough 2019-04-16 09:17:57 +01:00
  • 9644ff4f51 Merge pull request #1714 from sharelatex/spd-middlewear-oops Hugh O'Brien 2019-04-15 16:56:49 +01:00
  • 5edead4446 Merge pull request #1694 from sharelatex/hb-clear-ip-notifications Hugh O'Brien 2019-04-15 16:56:10 +01:00
  • 2828cc3d7f Merge pull request #45 from sharelatex/bg-update-request Brian Gough 2019-04-15 15:37:14 +01:00
  • 2277872022 update package.json to current version of request Brian Gough 2019-04-15 15:26:04 +01:00
  • 6a7679d55c Merge pull request #44 from sharelatex/bg-add-pubsub-health-check Brian Gough 2019-04-15 15:20:24 +01:00
  • 15c7c911f9 update request module Brian Gough 2019-04-15 14:46:58 +01:00
  • 2dbdcf5bc8 add health check to pubsub channels Brian Gough 2019-04-15 14:05:26 +01:00
  • 0773311805 Merge pull request #1674 from sharelatex/sk-email-make-primary-tooltip Shane Kilkelly 2019-04-12 10:39:17 +01:00
  • f3dd61abce Merge pull request #1657 from sharelatex/sk-rate-limit-join-project Shane Kilkelly 2019-04-12 10:39:04 +01:00
  • 816c49daf2 bump metrics to 2.1.2 Henry Oswald 2019-04-12 12:36:47 +01:00
  • d4faaaa60e use console.log not logger.log Henry Oswald 2019-04-12 12:34:17 +01:00
  • 33478f95fd Fix package.json versions James Allen 2019-04-11 16:32:31 +01:00
  • e72acacf17 downsample logging Brian Gough 2019-04-11 16:25:42 +01:00
  • 9eee098af4 Merge pull request #43 from sharelatex/bg-update-ioredis Brian Gough 2019-04-11 15:50:56 +01:00
  • 8006e4f2d5 Merge pull request #42 from sharelatex/bg-add-event-metric Brian Gough 2019-04-11 15:50:15 +01:00
  • cefdd15c5e update to redis-sharelatex v1.0.6 for latest ioredis Brian Gough 2019-04-11 15:49:19 +01:00
  • 16cc171abc Merge pull request #7 from sharelatex/bg-allow-updates-to-ioredis Brian Gough 2019-04-11 15:40:14 +01:00
  • ef9e97e7d1 add metric for applied-ops events Brian Gough 2019-04-11 15:39:28 +01:00
  • f4b2f7742e allow patch updates to ioredis 4.6.0 Brian Gough 2019-04-11 15:24:27 +01:00
  • 01a1923e1f Merge pull request #41 from sharelatex/bg-handle-duplicate-events Brian Gough 2019-04-11 15:17:31 +01:00
  • 6374a641d5 fix unit tests Brian Gough 2019-04-11 15:07:42 +01:00
  • c6225d614e add /debug/events endpoint Brian Gough 2019-04-11 15:00:25 +01:00
  • 3d76f4b9bf Record a snapshot to mongo when a doc's comments/changes get collapsed James Allen 2019-04-11 13:25:03 +01:00
  • 2a31139254 log and skip duplicate events Brian Gough 2019-04-11 12:53:43 +01:00
  • 6f2a9ff24c Merge pull request #615 from sharelatex/cla-link John Lees-Miller 2019-04-10 16:50:10 +01:00
  • 234f7e1c4d Merge pull request #615 from sharelatex/cla-link John Lees-Miller 2019-04-10 16:50:10 +01:00
  • 63240d1a72 Update CLA and other links John Lees-Miller 2019-04-10 16:15:41 +01:00
  • 98bc755b9f Update CLA and other links John Lees-Miller 2019-04-10 16:15:41 +01:00
  • 36d0e8e199 Merge pull request #1654 from sharelatex/ns-add-status-page Chrystal Maria Griffiths 2019-04-10 10:38:26 +01:00
  • 5d6a307234 Merge pull request #1664 from sharelatex/as-fix-read-only-comment Chrystal Maria Griffiths 2019-04-10 10:38:04 +01:00
  • ab6565beb8 Merge pull request #1697 from sharelatex/cmg-leave-archived Chrystal Maria Griffiths 2019-04-10 10:34:06 +01:00
  • 9a32c2eebb Merge pull request #40 from sharelatex/bg-handle-duplicate-clients Brian Gough 2019-04-09 15:39:08 +01:00
  • 893515e83f handle duplicate entries in io.sockets.clients Brian Gough 2019-04-09 14:48:00 +01:00
  • f8066349c4 Merge pull request #1700 from sharelatex/bg-simplify-queue Brian Gough 2019-04-09 11:50:02 +01:00
  • 9c5c6922b9 Merge pull request #1626 from sharelatex/pr-history-drag-and-drop-selection Paulo Jorge Reis 2019-04-09 10:56:45 +01:00
  • 9d8f24615b Merge pull request #22 from sharelatex/csh-fix-npm-shrinkwrap Christopher Hoskin 2019-04-09 09:21:30 +01:00
  • 3c635c8d98 check version before it is modified by applyOp Brian Gough 2019-04-09 09:20:48 +01:00
  • ca9e6044c8 Merge pull request #1683 from sharelatex/jel-gallery-layout Jessica Lawshe 2019-04-08 16:56:09 +01:00
  • 2ae27fbc6a Merge pull request #1702 from sharelatex/revert-1650-ns-toggle-captchas nate stemen 2019-04-08 16:04:44 +01:00