Commit Graph

  • 5aac144d5b Merge pull request #1650 from sharelatex/ns-toggle-captchas nate stemen 2019-04-08 14:41:08 +01:00
  • 27c51ae5aa Fix npm shrinkwrap Christopher Hoskin 2019-04-08 14:35:44 +01:00
  • cc1f3fce5b check incoming hash when present Brian Gough 2019-04-08 13:43:24 +01:00
  • 144d936141 Merge pull request #1691 from sharelatex/cmg-tag-duplicates Paulo Jorge Reis 2019-04-08 11:19:20 +01:00
  • 9e63211a17 Merge pull request #1680 from sharelatex/cmg-hide-unarchive Paulo Jorge Reis 2019-04-08 11:19:03 +01:00
  • e6943e8e71 Merge pull request #1667 from sharelatex/pr-add-post-integration-survey-link Paulo Jorge Reis 2019-04-08 11:00:36 +01:00
  • 998d370362 Merge pull request #612 from sharelatex/remove-travis-icons James Allen 2019-04-01 10:30:08 +01:00
  • b9a1723eb8 Merge pull request #612 from sharelatex/remove-travis-icons James Allen 2019-04-01 10:30:08 +01:00
  • 9ff021cc88 Merge pull request #1676 from sharelatex/as-upgrade-pdfjs-2.0.943 Alasdair Smith 2019-04-01 10:14:05 +01:00
  • bc6e560448 increase timeout for long-running acceptance tests Brian Gough 2019-04-01 09:42:54 +01:00
  • 6457732be7 Remove travis build status icons John Lees-Miller 2019-04-01 08:25:50 +01:00
  • 32546b0484 Remove travis build status icons John Lees-Miller 2019-04-01 08:25:50 +01:00
  • b1a615bad9 Merge pull request #1684 from sharelatex/revert-1637-as-clear-undo-stack-remote-edit Alasdair Smith 2019-03-29 12:09:57 +00:00
  • 61cd448832 Merge pull request #1672 from sharelatex/ns-input-autocomplete Simon Detheridge 2019-03-28 15:00:54 +00:00
  • 385da07930 Merge pull request #1675 from sharelatex/spd-zip-file-limit-ui Simon Detheridge 2019-03-28 15:00:46 +00:00
  • 88446ffa9b Merge pull request #1677 from sharelatex/spd-hide-heapdump Simon Detheridge 2019-03-28 15:00:22 +00:00
  • 8016f15c8a Merge pull request #116 from sharelatex/csh-formalise-node-10.15 Christopher Hoskin 2019-03-28 11:59:08 +00:00
  • ce556499c0 remove unnecessary comparison in queue logic Brian Gough 2019-03-28 10:17:10 +00:00
  • 9a48142919 Merge pull request #1671 from sharelatex/bg-reorder-messages Brian Gough 2019-03-27 14:06:10 +00:00
  • 7b1832a96e Merge pull request #1668 from sharelatex/jel-plans-group-modal-selected Alasdair Smith 2019-03-27 10:08:45 +00:00
  • bb81a47d58 Merge pull request #1641 from sharelatex/spd-soft-delete-users Simon Detheridge 2019-03-26 13:43:59 +00:00
  • 5a690a5416 Formalise node 10.15 update Christopher Hoskin 2019-03-26 11:50:59 +00:00
  • 364561d5fb Merge pull request #1666 from sharelatex/cmg-rttc-typo Simon Detheridge 2019-03-25 16:19:04 +00:00
  • d9522f563d Merge pull request #1631 from sharelatex/ho-remove-recurly-sign Simon Detheridge 2019-03-25 15:39:38 +00:00
  • f9594707ca Merge pull request #1662 from sharelatex/as-fix-wrong-favicon Simon Detheridge 2019-03-25 15:39:06 +00:00
  • cd9ed1dd6b Merge pull request #1663 from sharelatex/cmg-rttc-typo Simon Detheridge 2019-03-25 15:38:53 +00:00
  • 90cb50f4ac Merge pull request #1609 from sharelatex/sk-upgrade-bcrypt-3 Shane Kilkelly 2019-03-25 09:33:54 +00:00
  • 900e2f70b4 change console.log for logger.log Henry Oswald 2019-03-22 20:42:06 +00:00
  • db162cfe0a Merge pull request #1656 from sharelatex/cmg-reintroduce-beta-fix-path Simon Detheridge 2019-03-22 12:48:28 +00:00
  • d2e053f456 Merge pull request #1610 from sharelatex/cmg-reintroduce-beta Simon Detheridge 2019-03-22 12:21:00 +00:00
  • 2bf6e4e072 Merge pull request #1638 from sharelatex/spd-delete-user-rate-limit Simon Detheridge 2019-03-22 12:15:11 +00:00
  • d184087a53 Merge pull request #1643 from sharelatex/spd-transfer-projects Simon Detheridge 2019-03-22 12:14:49 +00:00
  • 61ec1d195b Merge pull request #39 from sharelatex/bg-fix-message-ids Brian Gough 2019-03-22 11:54:03 +00:00
  • 936311f1fb fix eventlogger tests to use name with dashes Brian Gough 2019-03-22 11:20:38 +00:00
  • efa83b4cde stub out eventlogger in unit test Brian Gough 2019-03-22 11:19:31 +00:00
  • 6c71ae172b return out of order events for consistency Brian Gough 2019-03-22 11:19:08 +00:00
  • c5a09fcf0a add comment about downsampling Brian Gough 2019-03-22 11:18:34 +00:00
  • 695472a8aa fix event id parsing to allow for dashes in keys Brian Gough 2019-03-22 11:18:19 +00:00
  • a5ad2e48d4 Merge pull request #1629 from sharelatex/sk-censor-token-prefix Shane Kilkelly 2019-03-22 10:11:04 +00:00
  • 49a5056e78 Merge pull request #1637 from sharelatex/as-clear-undo-stack-remote-edit Shane Kilkelly 2019-03-22 10:10:56 +00:00
  • a51fefae6c Merge pull request #1630 from sharelatex/as-allow-deleted-inviter-import Shane Kilkelly 2019-03-22 10:10:45 +00:00
  • 1052e9e000 Merge pull request #47 from sharelatex/bg-add-message-ids Brian Gough 2019-03-22 09:07:52 +00:00
  • 0305ba0c6b Merge pull request #1639 from sharelatex/bg-add-message-ids Brian Gough 2019-03-21 16:02:46 +00:00
  • a4d4bf2bf7 Merge pull request #38 from sharelatex/bg-check-message-ids Brian Gough 2019-03-21 15:57:22 +00:00
  • 1ab5e52699 down-sample valid events by 1000 Brian Gough 2019-03-21 15:52:53 +00:00
  • e91b967bdb use per-channel event metrics Brian Gough 2019-03-21 14:56:31 +00:00
  • 8c82faa966 check order of messages on applied-ops channel Brian Gough 2019-03-21 14:50:27 +00:00
  • 57c5ec14bd check for a valid counter value in event log Brian Gough 2019-03-21 14:49:25 +00:00
  • 9b25374cd3 use time-based cleaning of event log Brian Gough 2019-03-21 14:48:51 +00:00
  • fd1425d83f include a unique id in every message published to redis Brian Gough 2019-03-21 12:10:15 +00:00
  • 494f749e72 Merge pull request #1651 from sharelatex/ho-check-exit-codes Henry Oswald 2019-03-21 11:02:12 +00:00
  • 983b1a0f57 Merge pull request #1648 from sharelatex/ho-simple-client-build Timothée Alby 2019-03-20 11:51:30 -05:00
  • 27251bc1ac Merge pull request #1646 from sharelatex/ho-fail-lint Timothée Alby 2019-03-20 10:18:06 -05:00
  • 74f26a5fa9 Merge pull request #48 from sharelatex/bg-fix-close-app-shutdown Brian Gough 2019-03-20 13:40:06 +00:00
  • 5de25032d8 Merge pull request #1634 from sharelatex/ta-no-institution-autocreate Timothée Alby 2019-03-19 18:41:15 -05:00
  • befe4be517 add check for duplicate events Brian Gough 2019-03-19 10:55:12 +00:00
  • 991cbf3fee Merge pull request #1636 from sharelatex/ho-fail-lint Henry Oswald 2019-03-18 15:25:10 +00:00
  • e6e3c023ed Merge pull request #1635 from sharelatex/as-fix-broken-chat-mathjax Alasdair Smith 2019-03-18 11:59:46 +00:00
  • 41f75b5936 Merge pull request #1543 from sharelatex/as-fix-potential-angular-xss Alasdair Smith 2019-03-18 10:24:54 +00:00
  • c704312c85 Merge pull request #1625 from sharelatex/bg-move-entities-safely Brian Gough 2019-03-18 09:16:32 +00:00
  • b9d3b1a842 fix beginShutdown to use server.close() Brian Gough 2019-03-15 15:35:28 +00:00
  • 429709dfcb Merge pull request #1621 from sharelatex/ns-update-spam-regexes Timothée Alby 2019-03-14 10:49:31 -05:00
  • ca2c854452 Merge pull request #1622 from sharelatex/sk-add-unit-test-for-bcrypt Timothée Alby 2019-03-14 10:49:07 -05:00
  • 1edf1964c8 Merge pull request #1607 from sharelatex/spd-succserror Timothée Alby 2019-03-14 10:48:37 -05:00
  • 970ca2e122 Merge pull request #1604 from sharelatex/ns-fix-capitalization Timothée Alby 2019-03-14 10:48:27 -05:00
  • e4c684786d Merge pull request #1580 from sharelatex/ta-entity-create-form-fix-2 Timothée Alby 2019-03-14 08:29:21 -05:00
  • a1e16c9676 Merge pull request #1600 from sharelatex/as-rttc-text-markers Jessica Lawshe 2019-03-13 11:38:06 -05:00
  • 4652b69488 Merge pull request #1617 from sharelatex/ho-logger-use-metrics-name Jessica Lawshe 2019-03-13 11:37:50 -05:00
  • 0b841aacef Merge pull request #1605 from sharelatex/jel-portal-team-data Jessica Lawshe 2019-03-13 11:37:06 -05:00
  • 32925f0c4e Merge pull request #1608 from sharelatex/bg-allow-reserved-names-safely Brian Gough 2019-03-13 11:04:32 +00:00
  • 0f22a626c8 Merge pull request #1595 from sharelatex/bg-remove-old-project-version-request Brian Gough 2019-03-13 09:00:40 +00:00
  • 888badbf0c Merge pull request #12 from sharelatex/ew-use-ring-buffer Ersun Warncke 2019-03-12 09:52:11 -04:00
  • 1809d6e403 filter out error logs in buffer Ersun Warncke 2019-03-12 08:23:37 -04:00
  • 0c5346460f log ops in filestore error Henry Oswald 2019-03-12 11:35:18 +00:00
  • 592716cd22 Merge pull request #21 from sharelatex/ta-update-build-scripts-1.1.16 Timothée Alby 2019-03-11 11:06:00 -05:00
  • 7586bb5dcb update build scripts to 1.1.16 Tim Alby 2019-03-11 10:28:18 -05:00
  • cb22e98766 default ring buffer size to zero Ersun Warncke 2019-03-11 10:27:35 -04:00
  • 5b5b06307a Merge pull request #1596 from sharelatex/ja-more-client-error-logging Timothée Alby 2019-03-07 10:30:18 -05:00
  • b86a949f50 Merge pull request #1485 from sharelatex/cmg-comments-track-changes Timothée Alby 2019-03-07 10:29:59 -05:00
  • 8187eb7fcb Merge pull request #1592 from sharelatex/ew-clean-stray-containers Timothée Alby 2019-03-07 10:29:48 -05:00
  • 89f31d71e3 Merge pull request #1603 from sharelatex/spd-admin-panel-buttons-not-working Timothée Alby 2019-03-07 10:29:26 -05:00
  • e1fb28ae28 Merge pull request #1598 from sharelatex/jel-wiki-search Timothée Alby 2019-03-07 10:29:15 -05:00
  • 72ae3f3aa5 Merge pull request #1601 from sharelatex/hb-metrics-email-bugfixes Timothée Alby 2019-03-07 10:28:53 -05:00
  • f699877959 Merge pull request #1540 from sharelatex/ns-less-spam-mail nate stemen 2019-03-06 14:36:50 -05:00
  • f5ecc5ad85 Merge pull request #1585 from sharelatex/spd-bin-run Simon Detheridge 2019-03-06 10:30:25 +00:00
  • 01fd6e9c8a Merge pull request #626 from sharelatex/bg-use-atomic-project-structure-version Brian Gough 2019-03-06 09:15:14 +00:00
  • b9e88c7998 Merge remote-tracking branch 'origin/bg-accept-larger-document-size-on-api-requests' Douglas Lovell 2019-03-05 11:44:05 -03:00
  • f090eb6d06 Merge remote-tracking branch 'origin/pr-update-files-to-hash' Douglas Lovell 2019-03-05 11:26:09 -03:00
  • 24da4799ed Merge remote-tracking branch 'origin/jel-payment-countries' Douglas Lovell 2019-03-05 11:25:44 -03:00
  • ce8695c951 Merge branch 'dcl-i1261b' Douglas Lovell 2019-03-05 11:25:06 -03:00
  • 44dd7c1c75 Merge remote-tracking branch 'origin/as-fix-email-address' Douglas Lovell 2019-03-05 11:24:40 -03:00
  • eadc6b838b Merge branch 'dcl-i1507e' Douglas Lovell 2019-03-05 11:24:10 -03:00
  • 3553fb2d9d Merge pull request #1581 from sharelatex/spd-wearing-middle Simon Detheridge 2019-03-04 12:02:28 +00:00
  • 939922485c Merge pull request #1555 from sharelatex/spd-email-escape-html Simon Detheridge 2019-03-04 12:01:15 +00:00
  • 96759a90f4 Merge pull request #1578 from sharelatex/jel-student-disclaimer Simon Detheridge 2019-03-04 12:00:17 +00:00
  • 97145847ef Merge pull request #1574 from sharelatex/sk-ignore-external-updates-from-gitbridge Simon Detheridge 2019-03-04 12:00:04 +00:00
  • 870f183595 Merge pull request #1476 from sharelatex/spd-character-sets Simon Detheridge 2019-03-04 11:59:47 +00:00
  • 68c7cc6fa3 Merge pull request #1577 from sharelatex/ho-jenkins-github-connection Henry Oswald 2019-03-04 11:55:29 +00:00
  • 491c29bad1 Merge pull request #1569 from sharelatex/hb-v2-metrics-email-opt-out Hugh O'Brien 2019-03-01 14:44:00 +00:00
  • 9b6ac8f715 Merge remote-tracking branch 'origin/ta-entity-create-form-fix' Douglas Lovell 2019-03-01 08:45:00 -03:00