Commit Graph

  • 65012e5037 Merge branch 'dcl-i1507c' Douglas Lovell 2019-03-01 08:44:40 -03:00
  • f887bcb121 Merge pull request #1556 from sharelatex/cmg-search-clearing Hugh O'Brien 2019-02-28 10:57:55 +00:00
  • 72933bdd81 Merge pull request #1546 from sharelatex/sk-add-routes-script Hugh O'Brien 2019-02-28 10:57:35 +00:00
  • 0d4c92054b Merge pull request #1557 from sharelatex/ew-update-clean Jessica Lawshe 2019-02-27 11:46:24 -06:00
  • dc06e166c3 Merge pull request #1562 from sharelatex/jel-blog-sidebar Jessica Lawshe 2019-02-27 11:24:56 -06:00
  • e5d453454e Merge pull request #1561 from sharelatex/jel-subscription-events Jessica Lawshe 2019-02-27 11:24:43 -06:00
  • 46c6d11574 Merge pull request #1544 from sharelatex/pr-fix-sl-history-toolbar Paulo Jorge Reis 2019-02-27 10:26:15 +00:00
  • e4153ae3e4 Merge pull request #1554 from sharelatex/ew-build-tests Henry Oswald 2019-02-26 10:19:31 +00:00
  • d12dd862c8 Merge pull request #1551 from sharelatex/ho-docker-debug Henry Oswald 2019-02-26 10:15:23 +00:00
  • b9edc0f414 Merge pull request #1548 from sharelatex/ho-tpds-linode-hosts Henry Oswald 2019-02-26 10:15:12 +00:00
  • 6e960492ff Merge pull request #1550 from sharelatex/spd-fix-broken-team-invite-accept Simon Detheridge 2019-02-25 16:24:03 +00:00
  • 2421593d85 run unit and acceptance tests in parallel (#1545) Ersun Warncke 2019-02-25 09:18:42 -04:00
  • 5d8b8ff012 Merge pull request #1530 from sharelatex/spd-dont-cancel-groups-on-invite Simon Detheridge 2019-02-25 10:24:33 +00:00
  • f84e94dc88 Merge pull request #1533 from sharelatex/as-fix-extra-bracket Simon Detheridge 2019-02-25 10:24:10 +00:00
  • c6b8ab3245 Merge pull request #1542 from sharelatex/as-fix-noopener Simon Detheridge 2019-02-25 10:23:04 +00:00
  • 838fe00058 Merge pull request #1531 from sharelatex/spd-notify-users-on-affiliation-upgrade Simon Detheridge 2019-02-25 10:22:47 +00:00
  • b8bb118fe3 Merge pull request #1528 from sharelatex/jel-portal-print Jessica Lawshe 2019-02-20 12:20:45 -06:00
  • 0df9c6440b test commit Henry Oswald 2019-02-19 15:40:19 +00:00
  • d55b38cc05 Merge pull request #1471 from sharelatex/ho-docker2 Henry Oswald 2019-02-19 14:51:34 +00:00
  • 57450bb0fb Merge pull request #1522 from sharelatex/ew-smoke-test-remove-rate-limit Ersun Warncke 2019-02-19 08:24:31 -04:00
  • 1ee4a1816c Merge pull request #1483 from sharelatex/jel-cms-table-style Brian Gough 2019-02-18 13:39:14 +00:00
  • 15a6169a06 Merge pull request #1526 from sharelatex/revert-1467-as-global-search-keybind Brian Gough 2019-02-18 13:36:40 +00:00
  • 43899589dc Merge pull request #1514 from sharelatex/bg-avoid-text-html-content-type-in-responses Brian Gough 2019-02-18 13:25:01 +00:00
  • 2ab346e762 Merge pull request #1511 from sharelatex/as-inc-linked-file-rev Brian Gough 2019-02-18 13:24:46 +00:00
  • b31022e329 remove jsx and react from eslint config and add eslint modules Ersun Warncke 2019-03-08 12:16:21 -04:00
  • a2b5793f49 add eslint and prettier Ersun Warncke 2019-03-08 12:06:24 -04:00
  • 266c6c368e have track changes make calls to web_api not web Henry Oswald 2019-03-08 15:32:58 +00:00
  • 83597e8723 use ring buffer for logging and include with error Ersun Warncke 2019-03-08 10:09:44 -04:00
  • 1da276fe2b Merge pull request #55 from overleaf/sk-refuse-v1-ids-redux Shane Kilkelly 2019-03-08 12:09:53 +00:00
  • 8f72cb89c8 Reject v1 ids earlier in the pipeline Shane Kilkelly 2019-03-08 11:25:45 +00:00
  • 78220d6430 Merge pull request #54 from overleaf/sk-upgrade-jgit-5.2-redux Shane Kilkelly 2019-03-07 14:03:25 +00:00
  • 5a6e00e12b decaf Ersun Warncke 2019-03-06 16:08:38 -04:00
  • 788fad5ce7 Remove a deprecated method, no longer compatible with JGit 5.2 Shane Kilkelly 2019-03-06 11:43:27 +00:00
  • 600aa8d9cf Do mvn clean before build. Shane Kilkelly 2019-03-06 11:41:59 +00:00
  • c1e7969342 Revert "Revert "Upgrade JGit dependency to 5.2.1"" Shane Kilkelly 2019-03-06 10:59:40 +00:00
  • 0943248334 Revert "Upgrade JGit dependency to 5.2.1" Shane Kilkelly 2019-03-06 10:31:07 +00:00
  • 6d9e8d38e9 Merge pull request #53 from overleaf/sk-refuse-v1-ids Shane Kilkelly 2019-03-06 10:17:17 +00:00
  • a517035e2c Refuse to process project-ids that look like they come from v1 Shane Kilkelly 2019-03-05 11:03:39 +00:00
  • 5ebfe68af2 Merge pull request #52 from overleaf/sk-upgrade-jgit-5.2 Shane Kilkelly 2019-03-06 10:16:09 +00:00
  • 4d7f9f3c1a add sentry into settings.defaults Henry Oswald 2019-03-05 17:34:27 +00:00
  • b9e3853a47 add sentry into settings.defaults Henry Oswald 2019-03-05 17:33:52 +00:00
  • 4445b390af add sentry into settings.defaults Henry Oswald 2019-03-05 17:33:23 +00:00
  • 37b039abf0 add sentry to settings.defaults.coffee Henry Oswald 2019-03-05 17:20:16 +00:00
  • e54a376d0e Merge branch 'master' of github.com:sharelatex/track-changes-sharelatex Henry Oswald 2019-03-05 17:10:40 +00:00
  • d47dcca0d6 add sentry dsn to config Henry Oswald 2019-03-05 17:10:18 +00:00
  • f89a5baeab Merge pull request #113 from sharelatex/ho-osx-epoll Christopher Hoskin 2019-03-04 14:57:01 +00:00
  • efb80b8135 Merge pull request #115 from sharelatex/csh-issue-204-clsi-log-stackdriver Christopher Hoskin 2019-03-04 14:56:17 +00:00
  • da7e65715b Bump logger to v1.6.0 Christopher Hoskin 2019-03-04 12:05:28 +00:00
  • 845397639e Upgrade JGit dependency to 5.2.1 Shane Kilkelly 2019-03-04 10:15:34 +00:00
  • e448cad7ce Merge pull request #98 from sharelatex/sk-update-readme Shane Kilkelly 2019-03-01 11:16:32 +00:00
  • e3494f95d7 Merge pull request #98 from sharelatex/sk-update-readme Shane Kilkelly 2019-03-01 11:16:32 +00:00
  • e359037958 remove bit from readme Shane Kilkelly 2019-03-01 11:16:12 +00:00
  • f8b3741292 remove bit from readme Shane Kilkelly 2019-03-01 11:16:12 +00:00
  • d6def184c6 Merge pull request #19 from sharelatex/ho-docker Christopher Hoskin 2019-02-25 09:17:10 +00:00
  • 18518ce803 Merge pull request #16 from sharelatex/cmg-csh-ho-docker-spelling Christopher Hoskin 2019-02-25 09:07:59 +00:00
  • 67f3cc7f31 Fix aspell-ta Christopher Hoskin 2019-02-23 01:40:28 +00:00
  • 6877baf314 increase acceptance test timeout to 1 minute Brian Gough 2019-02-22 13:23:26 +00:00
  • b48d45f996 Merge pull request #114 from sharelatex/bg-avoid-text-html-content-type-in-responses Brian Gough 2019-02-22 11:35:24 +00:00
  • 60cee0a219 Merge pull request #55 from sharelatex/bg-avoid-text-html-content-type-in-responses Brian Gough 2019-02-22 10:20:16 +00:00
  • 11f07d1f09 Merge pull request #45 from sharelatex/bg-avoid-text-html-content-type-in-responses Brian Gough 2019-02-22 09:24:30 +00:00
  • 49c9108788 Fix aspell or, te and no. Still need to fix ta Christopher Hoskin 2019-02-21 10:15:23 +00:00
  • 59c18c470d Clarify which dicts are from Ubuntu Christopher Hoskin 2019-02-21 09:09:07 +00:00
  • 9869be319e Merge branch 'master' into cmg-csh-ho-docker-spelling Christopher Hoskin 2019-02-21 08:56:17 +00:00
  • 52b172ae87 Merge pull request #18 from sharelatex/ho-docker Christopher Hoskin 2019-02-20 07:36:15 +00:00
  • 5119db43a7 Merge pull request #37 from sharelatex/ho-continual-pub-sub-traffic Henry Oswald 2019-02-19 11:28:06 +00:00
  • 03d6d80fdb Update the readme with a short explanation of how this code works Shane Kilkelly 2019-02-19 10:20:17 +00:00
  • 9727c374b7 Update the readme with a short explanation of how this code works Shane Kilkelly 2019-02-19 10:20:17 +00:00
  • 26e903f384 setup continualPubsubTraffic Henry Oswald 2019-02-15 15:23:59 +00:00
  • d0c9c469e8 Merge pull request #36 from sharelatex/cmg-fix-acceptance-test Chrystal Maria Griffiths 2019-02-15 15:39:11 +00:00
  • 507c4e5ce2 Fix test to accommodate changes to anonymous users Chrystal Griffiths 2019-02-15 15:18:17 +00:00
  • 0b88a63444 Merge pull request #35 from sharelatex/cmg-anonymous-display-name Chrystal Maria Griffiths 2019-02-15 14:53:18 +00:00
  • 946beb78f9 Merge pull request #46 from sharelatex/ho-pendingUpdates-key Henry Oswald 2019-02-15 14:03:52 +00:00
  • 937e8fe071 use redis cluster key in defaults for pendingupdates Henry Oswald 2019-02-15 13:58:29 +00:00
  • e379691767 Merge pull request #1521 from sharelatex/as-fix-noreferrer-noopener Chrystal Maria Griffiths 2019-02-15 13:18:10 +00:00
  • bf5a28b258 Merge pull request #1509 from sharelatex/as-update-google-config Chrystal Maria Griffiths 2019-02-15 13:17:30 +00:00
  • d52c30f272 Merge pull request #1512 from sharelatex/as-rate-limit-confirm-uni-domain-endpoint Chrystal Maria Griffiths 2019-02-15 13:16:39 +00:00
  • 96f283e2c6 Merge pull request #1477 from sharelatex/as-confirm-quick-action-archive-leave Chrystal Maria Griffiths 2019-02-15 13:16:21 +00:00
  • b1c40d2c58 Merge pull request #1501 from sharelatex/cmg-anonymous-display-name Chrystal Maria Griffiths 2019-02-15 13:16:06 +00:00
  • 9abea8ae5f Merge pull request #1516 from sharelatex/as-sanitize-team-notice Chrystal Maria Griffiths 2019-02-15 13:15:46 +00:00
  • 778af6ca40 Merge pull request #1510 from sharelatex/ns-moar-contrast Chrystal Maria Griffiths 2019-02-15 13:15:18 +00:00
  • 429e392fbb Merge pull request #1518 from sharelatex/jel-search-result-url Jessica Lawshe 2019-02-14 12:07:44 -06:00
  • c9eab36031 Merge pull request #1455 from sharelatex/jel-cms-color-block Jessica Lawshe 2019-02-14 12:07:34 -06:00
  • cc613f4370 Merge pull request #1507 from sharelatex/mm-pubmodal-show-errors Brian Gough 2019-02-14 14:45:38 +00:00
  • 1940e9b061 Merge pull request #1523 from sharelatex/bg-avoid-unwanted-fallback-on-network-errors Brian Gough 2019-02-14 14:21:33 +00:00
  • e78487922e Merge pull request #1513 from sharelatex/sk-migrate-read-and-write-token-prefix-post-deploy Shane Kilkelly 2019-02-14 10:49:32 +00:00
  • 349d731745 Merge pull request #1493 from sharelatex/sk-read-write-token-match-on-prefix Shane Kilkelly 2019-02-14 10:45:48 +00:00
  • 25a0ea8752 Merge pull request #1495 from sharelatex/sk-migrate-read-and-write-token-prefix Shane Kilkelly 2019-02-14 10:08:48 +00:00
  • 00cdc008d5 Merge pull request #1508 from sharelatex/bg-add-websocket-fallback-option Brian Gough 2019-02-13 09:02:10 +00:00
  • 038c81f868 use explicit json content-type to avoid security issues with text/html Brian Gough 2019-02-12 16:54:59 +00:00
  • 8c5d74faef use explicit json content-type to avoid security issues with text/html Brian Gough 2019-02-12 16:45:11 +00:00
  • c4dd8b5da8 Merge pull request #1502 from sharelatex/jel-social-metatags Timothée Alby 2019-02-12 10:27:34 -05:00
  • fb5caf7b63 Merge pull request #1504 from sharelatex/jel-portal-sign-in-redirect Timothée Alby 2019-02-12 10:26:46 -05:00
  • f01f80c2bb Merge pull request #1505 from sharelatex/ns-fix-regex Timothée Alby 2019-02-12 10:26:35 -05:00
  • b39626751a Merge pull request #1499 from sharelatex/ta-open-redirect-fix Timothée Alby 2019-02-12 10:26:20 -05:00
  • 6fb6086ba1 remove console.log Henry Oswald 2019-02-12 14:28:42 +00:00
  • 8bc3ff69e1 Merge pull request #30 from sharelatex/ho-docker Henry Oswald 2019-02-12 14:15:18 +00:00
  • 26acdfd072 Add comment explaining why not sending anon data up Chrystal Griffiths 2019-02-12 14:06:59 +00:00
  • bb06f82e04 Still send cursorData for logged in users Chrystal Griffiths 2019-02-12 14:00:47 +00:00
  • fa40e2c95f Merge pull request #44 from sharelatex/ho-docker-no-keychange Henry Oswald 2019-02-12 13:45:49 +00:00
  • 0a0fc91f28 Update app.coffee Henry Oswald 2019-02-12 13:27:13 +00:00