Commit graph

17862 commits

Author SHA1 Message Date
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
nate stemen
c9a9ad06a7 Merge pull request #17 from sharelatex/ns-decaffeinate
decaffeinate this service
2019-01-02 11:40:37 -05:00
Christopher Hoskin
95c8e29e66 Merge pull request #1322 from sharelatex/csh-issue-1309-node-6.15.1
Bump node to 6.15.1

GitOrigin-RevId: 7ae516d1231cd79baf0ff29768768a53b1f5f080
2019-01-02 16:03:52 +00:00
Henry Oswald
a4eda59189 add getDic 2019-01-02 15:23:40 +00:00
Christopher Hoskin
f3b764601f Merge branch 'master' into csh-ho-docker-issue-1338-bulk-upgrade 2019-01-02 12:42:24 +00:00
Christopher Hoskin
594b403bd3 Move metrics init to start of app.coffee 2019-01-02 09:55:31 +00:00
Christopher Hoskin
3b6eba33ba Remove Metrics.inc "startup" from app.coffee 2019-01-02 09:53:53 +00:00
Christopher Hoskin
aab5a1af6a Merge branch 'master' into csh-ho-docker 2019-01-02 09:51:35 +00:00
Christopher Hoskin
6214256568 Bump logger to v1.5.8 2019-01-02 09:47:38 +00:00
Christopher Hoskin
9e7f84cd0d Bump node version to 6.15.1 2018-12-27 08:23:18 +00:00
Nate Stemen
adc4c3bdb8 use public rc files 2018-12-21 13:55:29 -05:00
Ersun Warncke
c313b255bb Merge pull request #1309 from sharelatex/sk-git-bridge-acceptance-tests-2
Add more acceptance tests for git-bridge api

GitOrigin-RevId: 404c857fb73686d7073cd314dd4ee050a5b2e3bc
2018-12-21 12:23:02 +00:00
Ersun Warncke
7bf860cde5 Merge pull request #1312 from sharelatex/ja-add-rate-limits
Add rate limits to adding emails and changing password

GitOrigin-RevId: e73c17985cc9c74d60f8856b3b47b28fecd0d489
2018-12-21 12:22:56 +00:00
Henry Oswald
6c3a28d963 Merge pull request #8 from sharelatex/ho-log-levels
add process.env['LOG_LEVEL'] varable to let us change the logging level
2018-12-21 11:04:27 +00:00
Nate Stemen
9f65be5771 Prettier: convert individual decaffeinated files to Prettier format 2018-12-20 14:14:14 -05:00
Nate Stemen
ee4d9766fd Decaffeinate: convert individual files to js 2018-12-20 14:14:12 -05:00
Nate Stemen
c47ec473e6 Rename individual coffee files to js files 2018-12-20 14:14:11 -05:00
Nate Stemen
c82e899c2a Prettier: convert test/acceptance decaffeinated files to Prettier format 2018-12-20 14:14:11 -05:00
Nate Stemen
08c43ea4bf Rename test/acceptance/coffee to test/acceptance/js 2018-12-20 14:14:09 -05:00
decaffeinate
ca55bac90f decaffeinate: Run post-processing cleanups on DeletingAMessageTests.coffee and 7 other files 2018-12-20 14:14:08 -05:00
decaffeinate
41eed6df4e decaffeinate: Convert DeletingAMessageTests.coffee and 7 other files to JS 2018-12-20 14:14:05 -05:00
decaffeinate
c34b906598 decaffeinate: Rename DeletingAMessageTests.coffee and 7 other files from .coffee to .js 2018-12-20 14:14:02 -05:00
Nate Stemen
03093dc283 Prettier: convert app/js decaffeinated files to Prettier format 2018-12-20 14:13:59 -05:00
Nate Stemen
976d1675e6 Rename app/coffee dir to app/js 2018-12-20 14:13:56 -05:00
decaffeinate
45f865ebbb decaffeinate: Run post-processing cleanups on MessageFormatter.coffee and 6 other files 2018-12-20 14:13:56 -05:00