Commit Graph

  • ec1867198f Merge pull request #1313 from sharelatex/as-import-copy Simon Detheridge 2019-01-03 12:04:22 +00:00
  • df2dd2cb80 Merge pull request #1308 from sharelatex/spd-open-in-overleaf-form-character-encoding James Allen 2019-01-03 10:01:06 +00:00
  • 93bf6fcb19 Merge pull request #1323 from sharelatex/spd-open-in-overleaf-documentation James Allen 2019-01-03 10:00:57 +00:00
  • 6bcf209fab Merge pull request #1306 from sharelatex/sk-take-git-bridge-out-of-beta James Allen 2019-01-03 09:59:54 +00:00
  • 2f15f5d6f0 Bump logger to v1.5.8 Christopher Hoskin 2019-01-03 10:09:43 +00:00
  • 3e9d2b9656 Bump build scripts to 1.1.10 Christopher Hoskin 2019-01-03 10:06:42 +00:00
  • f73856064b Switch to v2 metrics Christopher Hoskin 2019-01-03 10:03:49 +00:00
  • 99709e558c Merge branch 'ho-docker' into csh-ho-docker-issue-1338-bulk-upgrade Christopher Hoskin 2019-01-03 09:57:06 +00:00
  • d5017f41fe Fix npm-shrinkwrap Christopher Hoskin 2019-01-03 09:45:27 +00:00
  • c9a9ad06a7 Merge pull request #17 from sharelatex/ns-decaffeinate nate stemen 2019-01-02 11:40:37 -05:00
  • 95c8e29e66 Merge pull request #1322 from sharelatex/csh-issue-1309-node-6.15.1 Christopher Hoskin 2019-01-02 15:46:23 +00:00
  • a4eda59189 add getDic Henry Oswald 2019-01-02 14:46:44 +00:00
  • f3b764601f Merge branch 'master' into csh-ho-docker-issue-1338-bulk-upgrade Christopher Hoskin 2019-01-02 12:42:24 +00:00
  • 594b403bd3 Move metrics init to start of app.coffee Christopher Hoskin 2019-01-02 09:55:31 +00:00
  • 3b6eba33ba Remove Metrics.inc "startup" from app.coffee Christopher Hoskin 2019-01-02 09:53:53 +00:00
  • aab5a1af6a Merge branch 'master' into csh-ho-docker Christopher Hoskin 2019-01-02 09:51:35 +00:00
  • 6214256568 Bump logger to v1.5.8 Christopher Hoskin 2019-01-02 09:47:38 +00:00
  • 9e7f84cd0d Bump node version to 6.15.1 Christopher Hoskin 2018-12-27 08:23:18 +00:00
  • adc4c3bdb8 use public rc files Nate Stemen 2018-12-21 13:55:29 -05:00
  • c313b255bb Merge pull request #1309 from sharelatex/sk-git-bridge-acceptance-tests-2 Ersun Warncke 2018-12-21 08:06:09 -04:00
  • 7bf860cde5 Merge pull request #1312 from sharelatex/ja-add-rate-limits Ersun Warncke 2018-12-21 08:06:00 -04:00
  • 6c3a28d963 Merge pull request #8 from sharelatex/ho-log-levels Henry Oswald 2018-12-21 11:04:27 +00:00
  • 9f65be5771 Prettier: convert individual decaffeinated files to Prettier format Nate Stemen 2018-12-20 14:14:14 -05:00
  • ee4d9766fd Decaffeinate: convert individual files to js Nate Stemen 2018-12-20 14:14:12 -05:00
  • c47ec473e6 Rename individual coffee files to js files Nate Stemen 2018-12-20 14:14:11 -05:00
  • c82e899c2a Prettier: convert test/acceptance decaffeinated files to Prettier format Nate Stemen 2018-12-20 14:14:11 -05:00
  • 08c43ea4bf Rename test/acceptance/coffee to test/acceptance/js Nate Stemen 2018-12-20 14:14:09 -05:00
  • ca55bac90f decaffeinate: Run post-processing cleanups on DeletingAMessageTests.coffee and 7 other files decaffeinate 2018-12-20 14:14:08 -05:00
  • 41eed6df4e decaffeinate: Convert DeletingAMessageTests.coffee and 7 other files to JS decaffeinate 2018-12-20 14:14:05 -05:00
  • c34b906598 decaffeinate: Rename DeletingAMessageTests.coffee and 7 other files from .coffee to .js decaffeinate 2018-12-20 14:14:02 -05:00
  • 03093dc283 Prettier: convert app/js decaffeinated files to Prettier format Nate Stemen 2018-12-20 14:13:59 -05:00
  • 976d1675e6 Rename app/coffee dir to app/js Nate Stemen 2018-12-20 14:13:56 -05:00
  • 45f865ebbb decaffeinate: Run post-processing cleanups on MessageFormatter.coffee and 6 other files decaffeinate 2018-12-20 14:13:56 -05:00
  • 0a12cee071 decaffeinate: Convert MessageFormatter.coffee and 6 other files to JS decaffeinate 2018-12-20 14:13:53 -05:00
  • 36a9f79d11 decaffeinate: Rename MessageFormatter.coffee and 6 other files from .coffee to .js decaffeinate 2018-12-20 14:13:50 -05:00
  • d54fc7efc6 Decaffeinate: add eslint and prettier rc files Nate Stemen 2018-12-20 14:13:48 -05:00
  • 273b81b806 forgot prettier-eslint-cli package. thanks @40thieves Nate Stemen 2018-12-20 14:06:35 -05:00
  • b751f70436 bump settings-sharelatex version to latest release Nate Stemen 2018-12-20 13:56:51 -05:00
  • cf12ec1154 use the aws sdk to copy files in S3PersistorManager Brian Gough 2018-12-07 17:02:34 +00:00
  • 2cf7fefaeb Merge pull request #1307 from sharelatex/pr-git-bridge-modal James Allen 2018-12-20 15:31:50 +00:00
  • 5a7f72c9f9 Merge pull request #1302 from sharelatex/jel-cms-iframe-attr James Allen 2018-12-20 15:31:39 +00:00
  • 7112e65dc5 Merge pull request #1303 from sharelatex/project-import-refactor Alasdair Smith 2018-12-20 11:50:58 +00:00
  • 0c1e754736 Merge pull request #1289 from sharelatex/sk-labeled-versions-in-git-bridge-v2 Shane Kilkelly 2018-12-20 10:36:47 +00:00
  • 97e357f772 Merge pull request #1260 from sharelatex/ja-remove-deprecated-v1-team-status Shane Kilkelly 2018-12-20 10:36:03 +00:00
  • efadf662f2 Merge pull request #2 from sharelatex/afc-js-settings nate stemen 2018-12-19 15:18:08 -05:00
  • 531f5fb6ee Merge pull request #1280 from sharelatex/spd-open-in-overleaf-conversions Simon Detheridge 2018-12-19 15:52:44 +00:00
  • d2465f8d6a Merge pull request #1297 from sharelatex/ja-rate-limit-v2-login Simon Detheridge 2018-12-19 15:47:38 +00:00
  • b0b87a7b6e Merge pull request #1299 from sharelatex/spd-redirect-bypass-header Simon Detheridge 2018-12-19 15:47:01 +00:00
  • 366dbbd54f Merge pull request #1288 from sharelatex/cmg-cancel-comments-ff Chrystal Maria Griffiths 2018-12-19 10:27:22 +00:00
  • 2b556df43c Merge pull request #1294 from sharelatex/mm-exportstatus-fields Chrystal Maria Griffiths 2018-12-19 10:24:01 +00:00
  • bfeefe8406 Merge pull request #1282 from sharelatex/ew-collabratec-support-imported-projects Ersun Warncke 2018-12-18 10:56:40 -04:00
  • 740dce07a9 Merge remote-tracking branch 'origin/hb-publisher-management' Douglas Lovell 2018-12-18 10:22:44 -03:00
  • e139abb110 Merge pull request #1273 from sharelatex/ja-password-reset-v1 Paulo Jorge Reis 2018-12-18 11:14:41 +00:00
  • 4563ce864c Merge pull request #1285 from sharelatex/pr-history-compare-labels-fixes Paulo Jorge Reis 2018-12-18 11:09:56 +00:00
  • 3e5bb147ec Merge pull request #107 from sharelatex/csh-issue-1309-node-6.15 Christopher Hoskin 2018-12-18 11:16:25 +00:00
  • 19bd4791dd Add npm-shrinkwrap.json Christopher Hoskin 2018-12-18 11:03:06 +00:00
  • 1160620afc Merge pull request #1278 from sharelatex/revert-1240-as-import-status-page Alasdair Smith 2018-12-17 15:27:54 +00:00
  • b57342128d package-lock not supported until npm 5 Christopher Hoskin 2018-12-17 15:31:45 +00:00
  • dd3774b7a9 Bump node to 6.15.1 Christopher Hoskin 2018-12-17 15:29:56 +00:00
  • 56784c4089 Merge pull request #1240 from sharelatex/as-import-status-page Alasdair Smith 2018-12-17 13:46:59 +00:00
  • 4ff98f0237 Import history compare controller. Paulo Reis 2018-12-17 12:39:34 +00:00
  • d5c651c132 Merge pull request #1276 from sharelatex/pr-fix-history-v1 Paulo Jorge Reis 2018-12-17 12:01:44 +00:00
  • 8e25bbf61a Merge pull request #48 from overleaf/sk-extend-request-timeouts Shane Kilkelly 2018-12-17 10:48:26 +00:00
  • 217bc180ac Merge pull request #1251 from sharelatex/pr-history-labels-compare Paulo Jorge Reis 2018-12-17 09:53:20 +00:00
  • 40add6985f Remove override of connect timeout Shane Kilkelly 2018-12-17 09:39:19 +00:00
  • bd8642cedd Merge pull request #1272 from sharelatex/jel-login-password-error-view Jessica Lawshe 2018-12-14 14:56:36 -06:00
  • 2195af88dd Set timeouts on Post requests too Shane Kilkelly 2018-12-14 16:34:48 +00:00
  • 46904bfe73 Set timeouts on http requests to 3 minutes, up from the default of 20 seconds. Shane Kilkelly 2018-12-14 16:13:58 +00:00
  • 7666c8a481 Merge pull request #1236 from sharelatex/jel-password-reset Jessica Lawshe 2018-12-14 09:45:18 -06:00
  • a2ed182942 add process.env['LOG_LEVEL'] varable to let us change the logging level Henry Oswald 2018-12-14 14:30:01 +00:00
  • 424a8c3d2a Merge pull request #106 from sharelatex/csh-prom-metrics Christopher Hoskin 2018-12-14 10:21:40 +00:00
  • 0bc82e6936 Merge pull request #46 from overleaf/sk-increase-push-timeout Shane Kilkelly 2018-12-14 09:46:46 +00:00
  • 26ff545415 Merge pull request #47 from overleaf/sk-print-good-error-when-404 Shane Kilkelly 2018-12-14 09:46:26 +00:00
  • f6ef1cd6a3 d'oh add individual decaffed files before committing Nate Stemen 2018-12-13 16:59:55 -05:00
  • 9c44a2c9fc download rc files in script and quote filenames Nate Stemen 2018-12-13 16:55:47 -05:00
  • 392884356e Revert "Bump buildscript to 1.1.10" Christopher Hoskin 2018-12-13 17:37:16 +00:00
  • 45a7adab6e Revert "Initialise metrics at begining of app" Christopher Hoskin 2018-12-13 17:33:45 +00:00
  • a72b29efd8 Merge pull request #1259 from sharelatex/ja-sso-settings-link Shane Kilkelly 2018-12-13 14:50:19 +00:00
  • 1836932256 Merge pull request #1247 from sharelatex/sk-git-bridge-acceptance-tests Shane Kilkelly 2018-12-13 14:50:02 +00:00
  • c423e483ba Merge pull request #1256 from sharelatex/sk-file-upload-retry Shane Kilkelly 2018-12-13 14:49:44 +00:00
  • b49de8e57c Bump buildscript to 1.1.10 Christopher Hoskin 2018-12-13 14:45:40 +00:00
  • f9b0ac0e80 Initialise metrics at begining of app Christopher Hoskin 2018-12-13 14:24:44 +00:00
  • 533ec9128e Bump metrics-sharelatex to v2.0.12 Christopher Hoskin 2018-12-13 14:21:32 +00:00
  • f0fd0299fe Merge pull request #15 from sharelatex/ho-profiler Henry Oswald 2018-12-13 14:18:35 +00:00
  • 2559b63f04 Bump metrics-sharelatex.git to v2.0.11 Christopher Hoskin 2018-12-13 14:15:19 +00:00
  • 362c1f64db Merge pull request #1252 from sharelatex/ew-collabratec-upload-fix-v1-proxy Ersun Warncke 2018-12-13 08:54:49 -04:00
  • 2505be283a turn down logging, use logger.info for less important data Henry Oswald 2018-12-13 11:03:08 +00:00
  • 9ee39ae930 Wrap the generic repository-missing message correctly Shane Kilkelly 2018-12-13 12:37:42 +00:00
  • abcaf8242e Include message along with error description lines Shane Kilkelly 2018-12-13 12:37:21 +00:00
  • a766482a00 Remove stray import Shane Kilkelly 2018-12-13 12:37:09 +00:00
  • bf7be6071d Handle GitUserException, with multiple lines of output Shane Kilkelly 2018-12-13 11:41:07 +00:00
  • 2f18feb136 Keep the default constructor for MissingRepositoryException Shane Kilkelly 2018-12-13 11:40:08 +00:00
  • 27e1152095 Fix wording of the generic-error when a repository is missing Shane Kilkelly 2018-12-13 10:34:09 +00:00
  • 3bc9ce995a Merge pull request #1264 from sharelatex/hb-set-reversedHostname-on-user-create James Allen 2018-12-13 09:08:38 +00:00
  • 65c1943c63 Merge pull request #1249 from sharelatex/ja-single-process-acceptance-tests-2 James Allen 2018-12-13 09:07:55 +00:00
  • d0744d779e Merge pull request #1233 from sharelatex/ja-owner-userstubs James Allen 2018-12-13 09:07:45 +00:00
  • dfead32d69 Update package.json Henry Oswald 2018-12-13 09:19:05 +00:00
  • 1a34f3db1b Update package.json Henry Oswald 2018-12-13 08:46:58 +00:00
  • 6e25c872e3 Merge pull request #1255 from sharelatex/ta-remove-teams-redirect Timothée Alby 2018-12-12 16:42:29 +02:00
  • 4861a86a21 Merge pull request #1254 from sharelatex/ta-fix-error-log Timothée Alby 2018-12-12 16:42:11 +02:00