Commit graph

17886 commits

Author SHA1 Message Date
James Allen
0de359b70b Merge pull request #1345 from sharelatex/ja-remove-git-warning
Remove warning about no git bridge in import modal

GitOrigin-RevId: 7b5f83c1ad5d419ddb418313cfb49b13672a1077
2019-01-04 16:33:49 +00:00
Christopher Hoskin
0421192449 Ignore any file ending in .map, wherever it is 2019-01-04 16:22:13 +00:00
Christopher Hoskin
c8d146b571 Bump settings to v1.1.0 2019-01-04 16:03:45 +00:00
Christopher Hoskin
b522fe1531 Remove grunt 2019-01-04 16:03:22 +00:00
Christopher Hoskin
f3d0ab6219 Bump settings to v1.1.0 2019-01-04 15:47:56 +00:00
Christopher Hoskin
f7b8678ff5 Add ajv as a dependency to stop prettier-eslint-cli from squawking 2019-01-04 15:31:02 +00:00
Christopher Hoskin
4079baa570 Revert "Pin eslint and friends to versions used by Nate to avoid peer invalid: ajv@^5.0.0, required by ajv-keywords@2.1.1"
This reverts commit 23bb3439ce4b606f5e3ef8a20ed98042a7f60a0c.
2019-01-04 15:28:48 +00:00
Christopher Hoskin
b7feb3f42a Pin eslint and friends to versions used by Nate to avoid peer invalid: ajv@^5.0.0, required by ajv-keywords@2.1.1 2019-01-04 15:19:23 +00:00
Christopher Hoskin
ae815df999 Add back in missing eslint and friends dependencies 2019-01-04 14:09:20 +00:00
Christopher Hoskin
d651e41bc1 Pin logger to version 1.5.9 2019-01-04 13:24:15 +00:00
Christopher Hoskin
a42be80d0b Remove grunt 2019-01-04 13:21:03 +00:00
Christopher Hoskin
72c03bc9da Remove references to coffeescript left over from decaf 2019-01-04 11:53:34 +00:00
Christopher Hoskin
03f7982bae Switch to v2 metrics 2019-01-04 11:37:48 +00:00
Christopher Hoskin
1d8e52cdd5 Merge branch 'master' into csh-ho-docker-issue-1338-bulk-upgrade 2019-01-04 11:30:18 +00:00
Christopher Hoskin
7280b18fe5 Get ready for decaffinate 2019-01-04 11:05:35 +00:00
Christopher Hoskin
f6dc55c16b Bump buildscripts to 1.1.10 2019-01-04 11:03:03 +00:00
Christopher Hoskin
ab81a16657 Merge pull request #33 from sharelatex/csh-ho-docker-issue-1338-bulk-upgrade
Services bulk upgrade - real-time
2019-01-04 10:59:03 +00:00
Christopher Hoskin
38144bdab5 Merge pull request #39 from sharelatex/csh-ho-docker-issue-1338-bulk-upgrade
Services bulk upgrade - document-updater
2019-01-04 10:57:17 +00:00
Alasdair Smith
9737a04125 Merge pull request #1338 from sharelatex/as-remove-import-modal
Don't show project import modal if feature flag is set

GitOrigin-RevId: f48d5e5cc795030d6c3332f5fde744d2e67f6366
2019-01-04 10:51:47 +00:00
Christopher Hoskin
a783c6b3cc Bump logger to 1.5.9 2019-01-04 09:33:08 +00:00
Christopher Hoskin
05a80c7cba Add app.map to .gitignore 2019-01-04 09:31:00 +00:00
Christopher Hoskin
0aa7315c27 Bump buildscripts to 1.1.10 2019-01-04 09:24:09 +00:00
Christopher Hoskin
d9ec90f0e2 Move to metrics v2 and shrinkwrap 2019-01-04 09:22:09 +00:00
Christopher Hoskin
1217d8a80a Merge branch 'master' into csh-ho-docker-issue-1338-bulk-upgrade 2019-01-04 09:18:40 +00:00
Ersun Warncke
ccb9ae6317 Merge pull request #1337 from sharelatex/mm-f1000-realrevisionurl
Real revisionURL for F1000 exports

GitOrigin-RevId: 6a9284c36680824fcc0be3b2f926deff27cb7cf8
2019-01-03 18:33:28 +00:00
Ersun Warncke
985f0a97bc Merge pull request #1332 from sharelatex/ew-block-while-project-importing
block loading project while importing

GitOrigin-RevId: b96589e5cae9faf269abefd4ea732992a350e68c
2019-01-03 18:14:19 +00:00
Christopher Hoskin
c6fa764a6a Add app.js.map to .gitignore 2019-01-03 18:04:50 +00:00
Christopher Hoskin
b7e8bf3c4c Bump logger to 1.5.7 2019-01-03 17:58:10 +00:00
Christopher Hoskin
f6aa8bcc84 Merge pull request #41 from sharelatex/csh-ho-docker-issue-1338-bulk-upgrade
Services bulk upgrade - filestore
2019-01-03 17:51:56 +00:00
Christopher Hoskin
8a696622b2 Merge pull request #13 from sharelatex/csh-ho-docker-issue-1338-bulk-upgrade
Services bulk upgrade - spelling
2019-01-03 17:49:15 +00:00
Christopher Hoskin
e3e99a6214 Bump logger to v1.5.9 2019-01-03 16:30:36 +00:00
Christopher Hoskin
6763809748 Bump logger to v1.5.9 2019-01-03 16:27:45 +00:00
Christopher Hoskin
cda65ad1ca Bump build scripts to 1.1.10 2019-01-03 16:21:33 +00:00
Christopher Hoskin
cd362f22be Move to v2 metrics 2019-01-03 16:17:31 +00:00
Christopher Hoskin
ba24e2686e Merge branch 'master' into csh-ho-docker-issue-1338-bulk-upgrade 2019-01-03 16:08:40 +00:00
Christopher Hoskin
2c154d93b0 Add app.js.map to .gitignore 2019-01-03 15:28:33 +00:00
Simon Detheridge
258ce15d91 Merge pull request #1334 from sharelatex/spd-password-tweaks
Make password verification on backend match frontend when changing passwords

GitOrigin-RevId: e15aa103549d4d5753118b09cd0fc0551efa2654
2019-01-03 15:25:31 +00:00
Simon Detheridge
c4d0cf9fd0 Merge pull request #1325 from sharelatex/ew-enable-collabratec-v2-for-all
Enable collabratec v2 for all users

GitOrigin-RevId: 586dccdcfee8f9d219838b73e0a217b0e10550b8
2019-01-03 15:25:26 +00:00
Christopher Hoskin
0f74fc5a1f Add dev to npm-shrinkwrap 2019-01-03 15:19:14 +00:00
Christopher Hoskin
0a98eb436b Merge pull request #31 from sharelatex/csh-issue-1309-node-6.15.1
Bump node version to 6.15.1
2019-01-03 13:48:43 +00:00
Brian Gough
04176d479b Merge pull request #39 from sharelatex/bg-use-aws-sdk-to-copy-files
use the aws sdk to copy files in S3PersistorManager
2019-01-03 13:42:31 +00:00
Simon Detheridge
ec1867198f Merge pull request #1313 from sharelatex/as-import-copy
Improved copy for import status page

GitOrigin-RevId: fa3e6792e7c703ea3a5127186385dcf661fef5e8
2019-01-03 12:19:35 +00:00
James Allen
df2dd2cb80 Merge pull request #1308 from sharelatex/spd-open-in-overleaf-form-character-encoding
Open in Overleaf: Fix character-encoding problems when passing content via 'snip' parameter

GitOrigin-RevId: d5d9faef8583696dfe7c94e4b5dfd88fc5bf6f4a
2019-01-03 10:20:55 +00:00
James Allen
93bf6fcb19 Merge pull request #1323 from sharelatex/spd-open-in-overleaf-documentation
Open in Overleaf: Add '/devs' documentation page

GitOrigin-RevId: 4ab5a296570bee147cd79bccb436392f941c076b
2019-01-03 10:20:50 +00:00
James Allen
6bcf209fab Merge pull request #1306 from sharelatex/sk-take-git-bridge-out-of-beta
Take git-bridge out of beta-program

GitOrigin-RevId: ba95dcd1c818f11f44915ea3731d29aa50473622
2019-01-03 10:20:44 +00:00
Christopher Hoskin
2f15f5d6f0 Bump logger to v1.5.8 2019-01-03 10:09:43 +00:00
Christopher Hoskin
3e9d2b9656 Bump build scripts to 1.1.10 2019-01-03 10:06:42 +00:00
Christopher Hoskin
f73856064b Switch to v2 metrics 2019-01-03 10:03:49 +00:00
Christopher Hoskin
99709e558c Merge branch 'ho-docker' into csh-ho-docker-issue-1338-bulk-upgrade 2019-01-03 09:57:06 +00:00
Christopher Hoskin
d5017f41fe Fix npm-shrinkwrap 2019-01-03 09:45:27 +00:00