Commit graph

89 commits

Author SHA1 Message Date
Simon Detheridge
b86f46a4f8 Merge pull request #1885 from overleaf/sk-dep-upgrades-2019-06
Update logger, metrics, and redis client

GitOrigin-RevId: fa425f37c9065dc644da44f62e89a9955ce09f66
2019-07-02 09:16:23 +00:00
Timothée Alby
2deac5f3a1 Merge pull request #1805 from overleaf/csh-issue-1457-recurly-xml-builder
Don't Build Recurly XML Requests Manually

GitOrigin-RevId: bebe7f747715a33e681dc58fb89b529411a13860
2019-06-04 11:23:49 +00:00
Simon Detheridge
e06a68ace6 Merge pull request #1779 from overleaf/spd-update-shrinkwrap
Update npm-shrinkwrap

GitOrigin-RevId: 93fc86aea307a0e631aebb03a0779862813d1eff
2019-05-16 10:59:59 +00:00
Ersun Warncke
7883554d73 Revert "Revert "add oauth2-server""
This reverts commit 946a7c2494d39fd7581cb8a068af7df647fb3bda.

GitOrigin-RevId: 2f02e9d9e2d0348e4ea1d447e0291fae72c0008a
2019-05-14 10:23:51 +00:00
Ersun Warncke
a00f4b219e Revert "add oauth2-server"
This reverts commit d10f565973f8b762c5aa51aa11e73105b016d3ae.

GitOrigin-RevId: 946a7c2494d39fd7581cb8a068af7df647fb3bda
2019-05-13 15:52:41 +00:00
Ersun Warncke
dc06069dff add oauth2-server
GitOrigin-RevId: d10f565973f8b762c5aa51aa11e73105b016d3ae
2019-05-13 12:04:46 +00:00
Christopher Hoskin
8aa8840db0 Merge pull request #1745 from overleaf/csh-issue-1118-node-10.15.3
Csh issue 1118 node 10.15.3

GitOrigin-RevId: 5b75d030d9d07bdb41dbca46f90fd950293e17b3
2019-05-07 10:58:52 +00:00
Shane Kilkelly
90cb50f4ac Merge pull request #1609 from sharelatex/sk-upgrade-bcrypt-3
Upgrade bcrypt to version 3, and specify minor-version of hash function

GitOrigin-RevId: 9282664a628e4b50839a1bb6f7ee895f3f9f15ca
2019-03-25 09:50:41 +00:00
nate stemen
f699877959 Merge pull request #1540 from sharelatex/ns-less-spam-mail
add spam checkers on project invite emails

GitOrigin-RevId: 305825efe6a824b1c0f5b347d2ed2427165d2cef
2019-03-11 11:07:09 +00:00
Simon Detheridge
870f183595 Merge pull request #1476 from sharelatex/spd-character-sets
Detect encoding of non-utf8 files and convert during load

GitOrigin-RevId: 1856a42457c52b125793dd001b92a014f358da69
2019-03-11 11:04:22 +00:00
Hugh O'Brien
72933bdd81 Merge pull request #1546 from sharelatex/sk-add-routes-script
Add a script to print all routes in the project

GitOrigin-RevId: 47e55bb24fb16864296222b7a87b21901c56f084
2019-03-11 11:02:51 +00:00
Henry Oswald
d55b38cc05 Merge pull request #1471 from sharelatex/ho-docker2
Move to docker image based builds

GitOrigin-RevId: 992aeaf69bfea4d1847a07c457575a63985d4407
2019-03-11 10:59:20 +00:00
James Allen
b85595b8ca Merge pull request #1426 from sharelatex/as-cleanup-grunt
Cleanup grunt config & dependencies

GitOrigin-RevId: e44445e727e8cf56d03bf33a8741b9a47418a620
2019-01-29 10:12:10 +00:00
Timothée Alby
88249226f4 Merge pull request #1388 from sharelatex/hb-csv-institution-members
Add CSV download for institutional members to hub

GitOrigin-RevId: 07f78b03725a8bddaadff5a8bd0455a29e59496e
2019-01-17 15:15:54 +00:00
Shane Kilkelly
126edeb4bb Merge pull request #1396 from sharelatex/as-cleanup-eslint
Cleanup some unused eslint config

GitOrigin-RevId: 6579ad615188ea32a8817964bf95c5c9b121faef
2019-01-17 10:11:46 +00:00
James Allen
e624f697d2 Merge pull request #1352 from sharelatex/spd-zip-files-with-backslashes
Handle import of zip files that include filenames with backslashes

GitOrigin-RevId: 9f84cf6e0a648ee04bac89fe385931d603709a41
2019-01-07 11:33:35 +00:00
Ersun Warncke
362c1f64db Merge pull request #1252 from sharelatex/ew-collabratec-upload-fix-v1-proxy
upgrade to latest (forked) version of multer, proxy collabratec uploads

GitOrigin-RevId: 682caf12a81ee828e544a5e3903ea49bbd173fe0
2018-12-13 13:09:26 +00:00
Paulo Jorge Reis
af2d959504 Merge pull request #1072 from sharelatex/spd-open-with-overleaf
Implement v1 open-with-overleaf API in v2 (part 1)

GitOrigin-RevId: 488f4eeefc29086a72295ccbc7c63d2f927add12
2018-11-15 10:04:33 +00:00
Alasdair Smith
659242b457 Merge pull request #1037 from sharelatex/as-decaffeinate
Decaffeinate frontend

GitOrigin-RevId: 1c8c53dedecfe55f9936a13408df17b852f996de
2018-11-05 10:19:25 +00:00
Ersun Warncke
365158f283 Merge pull request #1047 from sharelatex/ew-oauth-authorization
add oauth middlewear

GitOrigin-RevId: b68360763e1060fdbcbb4348d3d691a803fbfa41
2018-10-30 18:31:47 +00:00
Simon Detheridge
8a6b7df071 Merge pull request #1080 from sharelatex/as-fix-linting
Fix linting not running on modules

GitOrigin-RevId: 12a27fc9e1c9b41202e04b6272e5b42289603f3a
2018-10-30 10:16:29 +00:00
Brian Gough
8c3b5acdd0 update to metrics v1.8.0 for metrics.globalGauge 2018-10-09 11:46:19 +01:00
Ersun Warncke
256e374af0 update shrinkwrap 2018-09-19 12:13:14 -04:00
Alasdair Smith
cb2c470325 Fix missing packages in shrinkwrap 2018-06-28 15:19:19 +01:00
Alberto Fernández Capel
ddb53e0272 Pin translations-sharelatex to master 2018-05-16 13:59:33 +01:00
Alberto Fernández Capel
15c52af0aa Remove unused dependency 2018-05-16 13:59:33 +01:00
Alberto Fernández Capel
de645afff9 Move handlebars loader to dev dependencies 2018-05-16 13:59:33 +01:00
Alberto Fernández Capel
1087fa6797 Make jQuery version match the one statically linked
In 14148648e6/app/views/layout.pug (L60)
2018-05-16 13:59:33 +01:00
Alberto Fernández Capel
fe75936ff7 Add dependencies needed for metrics app 2018-05-16 13:59:33 +01:00
hugh-obrien
6c3482f2a1 add reactDOM, fix publish menu configs 2018-04-10 15:59:39 +01:00
Alberto Fernández Capel
a2ec6849dd Clean up npm-shrinkwrap.json
I followed these steps (from master, in the docker dev env):

 - rm -rf node_modules/*
 - npm install
 - npm shrinkwrap --dev
2018-03-15 12:23:40 +00:00
Alasdair Smith
2453e55ebb Remove eslint loader
After using the webpack set up a bit more, having linting block compiles in
dev is more annoying than helpful. Linting pre commit is more valuable
2018-03-06 11:18:40 +00:00
Alasdair Smith
45e7482335 Install chai-expect and chai-friendly eslint plugins 2018-02-28 11:45:10 +00:00
Alasdair Smith
f11f208772 Revert "Revert "Upgrade to mocha 5.0.1"" 2018-02-27 15:03:21 +00:00
Alasdair Smith
315587605c Revert "Upgrade to mocha 5.0.1" 2018-02-27 12:25:42 +00:00
Alasdair Smith
4c2790a71b Merge pull request #366 from sharelatex/as-upgrade-mocha
Upgrade to mocha 5.0.1
2018-02-27 11:06:34 +00:00
Alasdair Smith
864bf771a4 Merge pull request #362 from sharelatex/as-linting
Linting new ES code
2018-02-27 11:06:11 +00:00
Alasdair Smith
22b8c114a2 Upgrade mocha to latest 2018-02-23 17:00:29 +00:00
Alasdair Smith
45bcbf9eb1 Install eslint & standard 2018-02-23 11:25:01 +00:00
Alasdair Smith
6b0b96a357 Install karma-webpack 2018-02-23 11:06:12 +00:00
Alasdair Smith
8fa343bc94 Uninstall unused karma-tap-reporter dependency 2018-02-22 14:04:39 +00:00
Alasdair Smith
27bfb1f02d Install karma-mocha-reporter 2018-02-22 14:02:14 +00:00
Alasdair Smith
289500082a Install karma & it's dependencies 2018-02-20 14:00:57 +00:00
Shane Kilkelly
9a7b3c2b23 Merge pull request #320 from sharelatex/sk-retry-analytics-requests
Add a retry to analytics requests
2018-02-13 09:38:56 +00:00
Shane Kilkelly
0efc8136cb Use requestretry node package 2018-02-12 15:16:21 +00:00
Alasdair Smith
d8e87997c1 Install codemirror 2018-02-09 10:02:36 +00:00
Alasdair Smith
ed5f31b248 Update grunt-contrib-less to latest version
Note that this also updates less to 2.7.

This change is required so that variables can be injected by the Less
compiler. This is useful for allowing feature flags.
2018-02-05 15:52:56 +00:00
Alasdair Smith
e01615c174 Install webpack & babel 2018-01-31 17:24:19 +00:00
Alasdair Smith
a51012c96f Regenerate shrinkwrap after removing contentful dependency 2018-01-31 17:19:42 +00:00
James Allen
98c620a99b Revert "Install webpack and babel"
This reverts commit 5cfd0ac2d21be5ea0049ced4e522c7a57ddae0c1.
2018-01-22 17:52:39 +00:00