Commit graph

352 commits

Author SHA1 Message Date
Alasdair Smith
64386d819f Merge pull request #2708 from overleaf/as-babel-polyfills
Automatically add polyfills to frontend

GitOrigin-RevId: 699a697478b8174ee569bd5e2d0fb0bc77c50931
2020-06-03 10:30:51 +00:00
Miguel Serrano
c806d27b22 Merge pull request #2873 from overleaf/as-fix-daterangepicker-jquery-version
Fix DateRangePicker's jQuery dep, fixing metrics charts

GitOrigin-RevId: 70dd046102e5f442684fdf099973f8fdf481e405
2020-05-30 03:17:47 +00:00
Miguel Serrano
d69b32c2e2 Merge pull request #2854 from overleaf/msm-npm-audit-fix
npm audit fix

GitOrigin-RevId: 25aa7dd7df62901e26575c1f1772f22b4668ac5c
2020-05-30 03:17:39 +00:00
Jakob Ackermann
2a8e2efe62 Merge pull request #2845 from overleaf/jpa-faster-web-ci
[misc] faster web ci

GitOrigin-RevId: bbd6b12040956f6b397c6ea4d8144e733299400b
2020-05-23 03:18:08 +00:00
Eric Mc Sween
3d411b98cf Merge pull request #2838 from overleaf/msm-fix-npm-warnings
Fix npm warnings

GitOrigin-RevId: afc57deb7c4d07d7e86c9c9964fe76ace7b46901
2020-05-21 03:22:19 +00:00
Alasdair Smith
8f5270899f Merge pull request #2707 from overleaf/as-transform-esm
Transform frontend module format from AMD to ESM

GitOrigin-RevId: 9adbcdc95e819a54114010c6fd3521d8f58ef2fe
2020-05-20 03:21:38 +00:00
Jessica Lawshe
3778c47aec Merge pull request #2822 from overleaf/spd-oio-moreurls-redux
Allow opening of data URLs and snip arrays in Open-in-Overleaf

GitOrigin-RevId: bf51b1f9e2ef42889825d43303cfb6074fd569a6
2020-05-13 03:23:12 +00:00
Jessica Lawshe
e3fe498823 Merge pull request #2774 from overleaf/jel-cms-terms-pdf-via-filename
Legal terms PDF via CMS

GitOrigin-RevId: 06e7de6a2b3891e91ea662175fd57c95d01c5f79
2020-05-07 03:28:12 +00:00
Miguel Serrano
a9d107fbc9 updated webpack, less v3 and related dependencies (#2808)
GitOrigin-RevId: 4253b795637508d643790bc5fe4ce08049b492d1
2020-05-07 03:27:41 +00:00
Miguel Serrano
45a6cfc33c Revert "updated mocha, webpack, less and related dependencies (#2786)" (#2802)
This reverts commit 7eaf4de8a720c76669301382e895b4f7e1638e24.

GitOrigin-RevId: 774275efe40f205c9c7b2e8276b83d3cb52bd3f5
2020-05-05 03:22:26 +00:00
Miguel Serrano
45f87dc927 updated mocha, webpack, less and related dependencies (#2786)
GitOrigin-RevId: 7eaf4de8a720c76669301382e895b4f7e1638e24
2020-05-05 03:22:17 +00:00
Simon Detheridge
17fe8e5590 Merge pull request #2779 from overleaf/msm-update-archiver
Update acorn and archiver dependencies

GitOrigin-RevId: 82bb4b4922306c0001303cd22f74b7d659662e3b
2020-04-30 03:19:42 +00:00
Simon Detheridge
7c00b2d838 Merge pull request #2772 from overleaf/revert-2767-spd-oio-moreurls
Revert "Add support for data urls and snip arrays to Open-in-Overleaf"

GitOrigin-RevId: c1e3806686764553d8801517b913f9133642fdb2
2020-04-25 03:19:03 +00:00
Simon Detheridge
9d8e682819 Merge pull request #2767 from overleaf/spd-oio-moreurls
Add support for data urls and snip arrays to Open-in-Overleaf

GitOrigin-RevId: 2c41406940b90c422cec8a823bf004fcc2655ed2
2020-04-25 03:18:50 +00:00
Eric Mc Sween
27941dc8af Merge pull request #2760 from overleaf/em-faster-uploads
Make a single Mongo update when uploading projects

GitOrigin-RevId: de102d3e112c9014ca5885f963e35971e4db6cee
2020-04-24 03:30:55 +00:00
Miguel Serrano
12793d8139 Update express and passport dependencies (#2754)
GitOrigin-RevId: 179346f304690a489aaf70f5215869e4155fdbce
2020-04-23 03:29:43 +00:00
Miguel Serrano
3687eb77f4 Update some minor/patch dependencies (#2747)
GitOrigin-RevId: 4ec132fe91eb867221259b62fcb8d9eccb1c913c
2020-04-23 03:28:58 +00:00
Miguel Serrano
c494526b55 Updated dev dependencies (minor/patch only) (#2743)
GitOrigin-RevId: e1027bbdc5c2372326429d80d44d03cf77674a8d
2020-04-16 03:17:17 +00:00
Shane Kilkelly
d6bd911a6e Merge pull request #2720 from overleaf/sk-remove-nodemailer-sendgrid
Remove nodemailer sendgrid

GitOrigin-RevId: af84dd78291957371d679de43bc4570960a7b635
2020-04-09 03:20:45 +00:00
Timothée Alby
dea9730503 Merge pull request #2694 from overleaf/ta-jl-otp
Two Factor Authentication for Staff

GitOrigin-RevId: 7028e93cb4a4cd88c138a52b0528817056b930d9
2020-04-08 03:14:35 +00:00
Henry Oswald
694267603a Merge pull request #2711 from overleaf/ho-redis-1-0-12
bump redis to 1.0.12

GitOrigin-RevId: 9065a809617cd856db3d0af10811c705eb0efe77
2020-04-02 03:19:22 +00:00
Alasdair Smith
db610f7efb Merge pull request #2657 from overleaf/revert-2650-revert-2570-as-sentry-source-maps
Bring back upload source maps to Sentry

GitOrigin-RevId: 22024e3ec2462d0bc9ad9c14e8d1c21880c55cd1
2020-04-01 03:21:16 +00:00
Eric Mc Sween
199e310f25 Merge pull request #2700 from overleaf/em-upgrade-metrics
Upgrade metrics-sharelatex to 2.6.2

GitOrigin-RevId: 29694016768e239a46d58aa3483375187addb09c
2020-03-26 04:17:47 +00:00
Eric Mc Sween
0ca191c947 Merge pull request #2688 from overleaf/em-upgrade-metrics
Upgrade metrics-sharelatex to 2.6.1

GitOrigin-RevId: 7ef2621b2e351b23bfffa9c5c4ce329bf53fcdef
2020-03-25 04:16:54 +00:00
Eric Mc Sween
7ade96473f Merge pull request #2682 from overleaf/em-revert-metrics-upgrade
Revert "Upgrade sharelatex-metrics to 2.6.0"

GitOrigin-RevId: 20665136094346dfd200c4fee3a85d99bbbef60d
2020-03-17 04:18:27 +00:00
Eric Mc Sween
574e6262a9 Merge pull request #2669 from overleaf/em-bump-metrics
Upgrade sharelatex-metrics to 2.6.0

GitOrigin-RevId: 0db5be16384f50ae39ce5831f006a94e7fa786b9
2020-03-17 04:18:07 +00:00
Ersun Warncke
c0049d8b67 patch xml-crypto to fix carriage return normalization (#2671)
* patch xml-crypto to fix carriage return normalization

Co-authored-by: Ersun Warncke <ersun.warncke@overleaf.com>
GitOrigin-RevId: 65c79216b1f8602dd4b31596578d319e47904e2b
2020-03-13 04:19:58 +00:00
Alasdair Smith
ad361a6617 Merge pull request #2650 from overleaf/revert-2570-as-sentry-source-maps
Revert "Upload source maps to Sentry"

GitOrigin-RevId: 6f6a122209553b9fde664ff55ebec37f7cb6ef7e
2020-03-04 04:21:39 +00:00
Eric Mc Sween
a11a4ac614 Merge pull request #2570 from overleaf/as-sentry-source-maps
Upload source maps to Sentry

GitOrigin-RevId: badbce7a5a72c3c2b5ad61d1ab2e458a52128e37
2020-03-04 04:21:34 +00:00
Eric Mc Sween
1f89083ab2 Merge pull request #2632 from overleaf/as-remove-minjs
Remove mirroring frontend JS to public/minjs directory

GitOrigin-RevId: f199530161dcd6d54800d148188f4e0b21b8df66
2020-03-03 04:21:53 +00:00
Simon Detheridge
19266bbc8a Merge pull request #2598 from overleaf/sk-upgrade-mongoose-4.13.19
Upgrade mongoose to 4.13.19

GitOrigin-RevId: 73c111d5d351a16efc01738e2148e9ab5daf4541
2020-02-19 04:20:34 +00:00
Jessica Lawshe
222ba263ff Merge pull request #2552 from overleaf/jel-update-pdfjs
Update PDF.js

GitOrigin-RevId: 231ab11eccc32e4eddc87fc8829dd28843e41a51
2020-02-12 04:21:05 +00:00
Alasdair Smith
0d6cd8fca6 Merge pull request #2523 from overleaf/revert-2520-revert-2488-as-import-pr-708
Bring back reverted Vendor web fonts PR

GitOrigin-RevId: 7430df7cefca120def048f8bbe2799b30772c686
2020-01-29 12:07:22 +00:00
Simon Detheridge
294418b4ee Merge pull request #2509 from overleaf/as-corejs-polyfills
Switch to use core-js for polyfilling

GitOrigin-RevId: efbc9df7343082a030427bf9cf78a1c6e81ce2f5
2020-01-17 04:19:55 +00:00
Henry Oswald
94e3051d2e Merge pull request #2529 from overleaf/revert-2527-ho-angular-revert-1.6.10
Revert "Revert "Upgrade angular, angular-sanitize and angular-mocks to v1.6.10""

GitOrigin-RevId: eb9db384b0dbc5ed366b79746f2721cd05ef6689
2020-01-17 04:19:47 +00:00
Henry Oswald
a3ce442448 Merge pull request #2527 from overleaf/ho-angular-revert-1.6.10
Revert "Upgrade angular, angular-sanitize and angular-mocks to v1.6.10"

GitOrigin-RevId: 8d13387dd99425eae07e5e4b451d8a8fe7e4e8d3
2020-01-17 04:19:34 +00:00
Alasdair Smith
9e36de9da0 Merge pull request #2520 from overleaf/revert-2488-as-import-pr-708
Revert "[Imported] Vendor web fonts, (#708)"

GitOrigin-RevId: a9276168b880326fda51ba3d172d6cbfbdf74f6a
2020-01-15 04:20:50 +00:00
Alasdair Smith
a084d620ae Merge pull request #2488 from overleaf/as-import-pr-708
[Imported] Vendor web fonts, (#708)

GitOrigin-RevId: b286a0d4bac9d84f70bf9d4ff99220f67ce67425
2020-01-15 04:20:37 +00:00
Timothée Alby
1af8f0358b Merge pull request #2501 from overleaf/as-unvendor-algoliasearch
Unvendor Algolia search client

GitOrigin-RevId: ad0ea56c66a516bd8a26a76d454cbc8d0594a03f
2020-01-11 04:15:10 +00:00
Eric Mc Sween
99d0ebe8b1 Merge pull request #2495 from overleaf/em-strict-type
Merge getType and getStrictType

GitOrigin-RevId: ef0967457f21187be37e96697f9f4262a275d26d
2020-01-07 04:21:36 +00:00
Alasdair Smith
3fc6757094 Correctly install moment
Currently we depend on it via transient dependencies (i.e. "deps of
deps"). This properly install it as a top-level dependency.

GitOrigin-RevId: 51d7cb2e8b4a4d4ce9a4e25a0cb5ea2342415f9c
2020-01-07 04:21:19 +00:00
Alasdair Smith
b2444b42cf Merge pull request #2443 from overleaf/as-upgrade-jquery-2.2.4
Upgrade jQuery to v2.2.1

GitOrigin-RevId: b22f7777f741b68a02824a6414bf7c28428eb975
2020-01-07 04:21:10 +00:00
Alasdair Smith
a1bc0548f2 Merge pull request #2440 from overleaf/as-upgrade-angular
Upgrade angular, angular-sanitize and angular-mocks to v1.6.10

GitOrigin-RevId: 7be5c3ccf7923f055406950da8460f13420b4e45
2020-01-03 04:21:40 +00:00
Alasdair Smith
f2ad7ebfc3 Merge pull request #2429 from overleaf/as-move-deps-to-bundle
Move jQuery and Angular dependencies to bundle

GitOrigin-RevId: cee1507044438c8c435d934476f6ea6281215ccd
2019-12-17 04:22:53 +00:00
nate stemen
2d9b089e16 Merge pull request #2401 from overleaf/cmg-ns-pretty-less
Fix inconsistent use of tabs and spaces in less files

GitOrigin-RevId: c69667f0dc6bc70ea3623890e2b2b741e358d454
2019-12-06 04:19:26 +00:00
Alasdair Smith
26190da566 Merge pull request #2349 from overleaf/as-webpack-css
Compile CSS using webpack

GitOrigin-RevId: 489834038667dde572ea5d9b4b9392b362259a09
2019-11-28 10:39:09 +00:00
Eric Mc Sween
4f9eb281b7 Merge pull request #2356 from overleaf/em-upgrade-test-deps
Upgrade test dependencies

GitOrigin-RevId: 0bda49dea086f525211836b6008f67bafa2bbe48
2019-11-18 14:53:42 +00:00
Hugh O'Brien
bf9473fb41 Merge pull request #2320 from overleaf/as-unify-webpack-output
Unify webpack output

GitOrigin-RevId: 5f5ae88f0698236fdce17cf87b4b524078dba4dd
2019-11-18 11:21:42 +00:00
Alasdair Smith
b326e1455a Merge pull request #2308 from overleaf/as-ignore-webpack-manifest-in-dev
Simplify JS asset path building in dev

GitOrigin-RevId: c6208f32e788363a477b9ece401e2faca5be931e
2019-10-31 12:01:49 +00:00
Eric Mc Sween
66ed04eef5 Merge pull request #2293 from overleaf/as-remove-unused-user
Remove unused arg parsing when creating server

GitOrigin-RevId: f998c9039280e40f56e5e4814e5a10b1ac89a69e
2019-10-28 14:29:18 +00:00
Eric Mc Sween
ecab52d108 Merge pull request #2292 from overleaf/as-remove-crawler-logger
Remove unused crawler logger and profile/heapdump routes

GitOrigin-RevId: e731f9a0cf969481b26c8074beca86431187449b
2019-10-28 14:29:09 +00:00
Eric Mc Sween
082f790fb6 Merge pull request #2180 from overleaf/as-clean-up-makefile
Clean up how tests are run in Makefile

GitOrigin-RevId: 9b52ead16392cca09bdf7edc4365f10dc468ccf2
2019-10-23 12:58:39 +00:00
Alasdair Smith
9cf73f965c Merge pull request #1440 from overleaf/as-amd-webpack
Bundle all frontend code with webpack

GitOrigin-RevId: 1bd93dad516c456fe1649193868e841e20459b0b
2019-10-16 10:36:21 +00:00
Brian Gough
3a4981cbb8 Merge pull request #2233 from overleaf/bg-upgrade-ioredis
upgrade to ioredis-4.14.1 via redis-sharelatex-1.0.11

GitOrigin-RevId: f6b20e95b03121682db902b80ffb3650d5517011
2019-10-14 09:01:08 +00:00
Ersun Warncke
849f21fde3 add saml acceptance tests. get/set entitlement.
GitOrigin-RevId: 65721aadb91678eafaf5a214a2921fe3dd276efa
2019-10-08 13:29:32 +00:00
Eric Mc Sween
45e5808a35 Merge pull request #2202 from overleaf/em-collab-set-permissions
Endpoint for setting a collaborator's permissions

GitOrigin-RevId: eb4d4dcc476908f5a42fefd7b81ef6fcc000be5b
2019-10-07 12:29:00 +00:00
Timothée Alby
5f107374a6 Merge pull request #2195 from overleaf/em-collab-permissions
Move collaborators code to async/await

GitOrigin-RevId: 55b5dd8154d024e2cee738208c45a8139870b92b
2019-10-07 08:46:36 +00:00
Simon Detheridge
11ce07ec50 Merge pull request #1999 from overleaf/spd-migrations
Add database migrations using 'east'

GitOrigin-RevId: da067292e9db1fad050545858bc7cc39245d3395
2019-10-01 12:09:58 +00:00
Eric Mc Sween
3ec74ac6f2 Merge pull request #2164 from overleaf/em-ownership-transfer
Project ownership transfer backend endpoint

GitOrigin-RevId: b7d267f2c105e8f51d5013289ac4afeb077c1e21
2019-09-30 15:01:03 +00:00
Timothée Alby
a23ecc9bf8 Merge pull request #2105 from overleaf/ta-user-membership-refactor
UserMembershipAuthorization Refactor

GitOrigin-RevId: 7711cda4a134823cbacee42731319fbb8aa648d0
2019-09-24 08:58:05 +00:00
Eric Mc Sween
869fcf7952 Merge pull request #2089 from overleaf/em-mailchimp-unsubscribe
Handle error on Mailchimp unsubscribe when deleting users

GitOrigin-RevId: 8923480e6d50de45003fd7741610f995753a412b
2019-09-03 15:25:01 +00:00
Chrystal Maria Griffiths
1335d21136 Merge pull request #2097 from overleaf/em-chai-spies
Remove chai-spies

GitOrigin-RevId: 7fa41fe32c1be985d761b7327950995d6afe7c4e
2019-08-27 10:49:50 +00:00
Alasdair Smith
c5da705fa0 Use babel-eslint for parsing (#2073)
Eslint's default parser cannot handle some newer es6+ syntax (e.g.
dynamic import() function). Babel-eslint uses babel for parsing instead
which can handle the newer syntax

GitOrigin-RevId: 0a5666ac3bdc3c0885842dcdbc6f6d3b4dbf2d4b
2019-08-19 15:20:06 +00:00
Ersun Warncke
39cb437bb6 more package.json changes
GitOrigin-RevId: 00ae56b88127d858250d56c876c5a65afc338cd8
2019-08-13 08:49:50 +00:00
Ersun Warncke
6ff5ef92ce add version for timekeeper
GitOrigin-RevId: ec3664df27823ae2ee63982070dcd0615de19e5b
2019-08-13 08:49:44 +00:00
Alasdair Smith
48481e431e Merge pull request #2034 from overleaf/as-upgrade-babel
Upgrade babel to v7

GitOrigin-RevId: 1626f0d3343a5cb32a71dba5a8f32657b2d7237c
2019-08-09 09:54:37 +00:00
Eric Mc Sween
2df7a8eaad Merge pull request #2032 from overleaf/as-upgrade-webpack
Upgrade webpack to v4

GitOrigin-RevId: a92c487fee79c29c5314273bf05439c9dbb0ce4d
2019-08-06 12:34:03 +00:00
Alasdair Smith
1b3f4033e7 Merge pull request #2009 from overleaf/as-remove-coffee-script
Remove coffee-script & other unused dependencies

GitOrigin-RevId: 22736dbed80b2654ad8498862d424c2de7ef0393
2019-08-05 14:47:58 +00:00
Timothée Alby
018b2cc474 Merge pull request #2010 from overleaf/ta-http-errors
Add More Http Errors

GitOrigin-RevId: d7aab42e1c7cec8757d6f2c6fc839a6c3f204351
2019-07-31 08:33:25 +00:00
Timothée Alby
8af619ac28 Merge pull request #1931 from overleaf/ta-error-type
Implement ErrorType Errors

GitOrigin-RevId: fef4d6016ad413b0de635a882e53fed6ee5f1f85
2019-07-19 09:50:57 +00:00
Alasdair Smith
827814175f Remove sixpack (#1974)
* Remove unused sixpack AB test

* Remove unused sixpack AB test

* Remove unused sixpackDomain global

* Remove unused Sixpack file

* Remove sixpack from frontend

* Remove unused sixpack-client package

GitOrigin-RevId: cdd4acf91cb045db93485f09dcb5ec63e43d01dc
2019-07-18 14:35:29 +00:00
Simon Detheridge
bf740f1e25 Merge pull request #1959 from overleaf/spd-integration-soft-deletion
Integration: Merge soft-deletion features into master
GitOrigin-RevId: 83baf730be2f256ad0d02271600392fda144b761
2019-07-18 14:34:22 +00:00
Ersun Warncke
8b48dbd0a3 upgrade passport-saml
GitOrigin-RevId: b113977347289bee2bce02750481aa089805d907
2019-07-18 11:12:36 +00:00
Eric Mc Sween
65849456d0 Merge pull request #1925 from overleaf/as-babel-plugin-angular-annotate
Enable Angular "annotations" via Babel plugin

GitOrigin-RevId: 343610025e3ba791fb284a0b696a1ea33e125a80
2019-07-16 09:22:21 +00:00
Henry Oswald
95a7069178 Merge pull request #1953 from overleaf/ho-update-error-package
Ho update error package

GitOrigin-RevId: 83904fc3f29ad830223d4f961c0ee3d967d5625b
2019-07-08 15:41:39 +00:00
Henry Oswald
97356e3e23 Merge pull request #1941 from overleaf/ho-pubsub-redis-connection
use pubsub redis connection

GitOrigin-RevId: 9c0686098c63f9d573abe5c3d0a450db3f609ef1
2019-07-08 15:41:33 +00:00
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
Alasdair Smith
0ca81de78c Merge pull request #1717 from overleaf/as-decaffeinate-backend
Decaffeinate backend

GitOrigin-RevId: 4ca9f94fc809cab6f47cec8254cacaf1bb3806fa
2019-05-29 09:32:21 +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
Henry Oswald
68c7cc6fa3 Merge pull request #1577 from sharelatex/ho-jenkins-github-connection
point to the web-sharelatex-internal repo for github-> jenkins

GitOrigin-RevId: 9f31bed9296181484baf9dc11d488763f1b57b50
2019-03-11 11:04:10 +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
e4153ae3e4 Merge pull request #1554 from sharelatex/ew-build-tests
Bump timeout for unit tests

GitOrigin-RevId: 2354d4620d1c91e99c80612659a43509b54cdbc9
2019-03-11 11:01:45 +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
Brian Gough
0879226f74 Merge pull request #1330 from sharelatex/as-fix-prettier-ignore
Fix linting ignoring index.js files in modules

GitOrigin-RevId: 8ac9fa8f8655553680678b206848d1a66718d821
2019-01-15 10:55:36 +00:00
Simon Detheridge
8717ddffad Merge pull request #1331 from sharelatex/as-publish-modal-tests
Publish modal tests

GitOrigin-RevId: 7e068ce05c02d61793419a5344501ca0ea51ed5f
2019-01-11 14:44:05 +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
James Allen
65c1943c63 Merge pull request #1249 from sharelatex/ja-single-process-acceptance-tests-2
Move to running acceptance tests in same process as web server

GitOrigin-RevId: 65757f0b57ac621cafb0066b5c5a7abb30333edd
2018-12-13 09:25:50 +00:00
Paulo Jorge Reis
02eb683298 Merge pull request #1113 from sharelatex/pr-compile-only-ol-dark-dev
Move LESS compilation process to Makefile

GitOrigin-RevId: 5a3871759eda2685ec0690899b0904d45c7db0a6
2018-11-16 12:02:47 +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