github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity
19351 commits 3 branches 7 tags 221 MiB
Commit graph

527 commits

Author SHA1 Message Date
Alasdair Smith
617fe024bc Merge pull request #3134 from overleaf/as-react-i18n 
Load translations in the frontend using react-i18next

GitOrigin-RevId: 4e6ab1befcd783db2b3255bb4d04dc18e710a3dc
 2020-09-05 02:05:04 +00:00
Miguel Serrano
98fea0f22a Merge pull request #3155 from overleaf/revert-3153-msm-pdfjs-2-4-es5 
Revert "updated pdf-js to 2.4.456 using es5 distribution"

GitOrigin-RevId: ee55cb77c6abd7fc766aba378d1a1803ed763ff1
 2020-09-03 02:04:20 +00:00
Miguel Serrano
b5adbfc4d9 Merge pull request #3153 from overleaf/msm-pdfjs-2-4-es5 
updated pdf-js to 2.4.456 using es5 distribution

GitOrigin-RevId: 6890b26300a6984486c3a624cc20712574d8cbf0
 2020-09-03 02:04:14 +00:00
Miguel Serrano
19a2e40ea9 Merge pull request #3150 from overleaf/revert-3142-msm-pdfjs-2-4 
Revert "updated pdfjs to 2.4"

GitOrigin-RevId: 218eb7bebb9be3b0570ae24d24536a4a923d73da
 2020-09-02 02:04:57 +00:00
Miguel Serrano
d509b8e3da Merge pull request #3142 from overleaf/msm-pdfjs-2-4 
updated pdfjs to 2.4

GitOrigin-RevId: e218d0f355f69c247ef19e34d9cf2e284652f83c
 2020-09-02 02:04:52 +00:00
Miguel Serrano
7f5ac7a932 Merge pull request #3139 from overleaf/revert-3116-msm-pdfjs-2-4 
Revert "Update pdf.js to 2.4.456"

GitOrigin-RevId: 73c9d3fc7b7d746a36ac90c1bf85e2b6d9ca1ec9
 2020-08-26 02:04:40 +00:00
Hugh O'Brien
3aaab7270c Merge pull request #3116 from overleaf/msm-pdfjs-2-4 
Update pdf.js to 2.4.456

GitOrigin-RevId: 29ce64acd44914b2f890f7b05c77ef890c315d01
 2020-08-26 02:04:35 +00:00
Timothée Alby
bc90ffb1e8 Merge pull request #3105 from overleaf/ta-outline-go-to-pdf 
[Outline] Go To PDF on Double-Click

GitOrigin-RevId: 0be4207eb26d0712814097b71906b3c9c37d4790
 2020-08-25 02:04:05 +00:00
Jakob Ackermann
fa594e575b Merge pull request #3113 from overleaf/jpa-translations-mono-repo 
[misc] mono repo with translations

GitOrigin-RevId: 1ed86d211f6a2031aafc3e7462687af0e957f9fd
 2020-08-19 02:06:08 +00:00
Christopher Hoskin
cce77cb237 Merge pull request #3100 from overleaf/csh-issue-1123-bump-logger-220 
[misc] bump logger-sharelatex to version 2.2.0

GitOrigin-RevId: 52baf9ddd6d534fccc4956bd32cd85cfe54abc47
 2020-08-15 02:06:16 +00:00
Miguel Serrano
d2845d9a38 Merge pull request #3074 from overleaf/msm-update-oerror-logger-v3 
Update o-error to v3 and logger-sharelatex to v3

GitOrigin-RevId: 5e6386f65b7893949336aa4ff021212aebd98f4a
 2020-08-12 02:06:58 +00:00
Chrystal Maria Griffiths
0538ea2069 Merge pull request #3042 from overleaf/cmg-bump-angular-1.8.0 
Bump angular from 1.6.10 to 1.8.0

GitOrigin-RevId: 45146fd37e20b950172a2bd8df99d9fc8baefff1
 2020-08-10 15:55:23 +00:00
Shane Kilkelly
c8e7ea91db Merge pull request #3047 from overleaf/sk-upgrade-redis 
Upgrade to redis-sharelatex v1.0.13

GitOrigin-RevId: c4ac85a631adfb7d0d4e20e4c6c57e63a02e4c90
 2020-08-10 15:54:35 +00:00
Timothée Alby
948cddd293 Merge pull request #3054 from overleaf/ta-lint-warnings 
Fail Lint on Warnings

GitOrigin-RevId: 385d5842c5318a8d5b6dc016ec3d304e2a85deb4
 2020-08-10 15:53:47 +00:00
Alasdair Smith
0868d67d59 Merge pull request #3037 from overleaf/as-install-missing-dep 
Install missing sanitize-html dependency

GitOrigin-RevId: d58a4fe27fbf28031fdc07b76bc9e38f5843c42a
 2020-07-23 02:06:33 +00:00
Eric Mc Sween
88b5a4534c Merge pull request #3022 from overleaf/as-react-linting 
Add some more React linting

GitOrigin-RevId: 77ffa24d2c1ac68b547a0b5706287567bf5eda5d
 2020-07-21 02:06:23 +00:00
Hugh O'Brien
d9d8f9a531 Merge pull request #2956 from overleaf/as-c8 
Add frontend test coverage command

GitOrigin-RevId: ae4e760e343807ebdc94292d21434d4154694f0c
 2020-07-14 02:06:41 +00:00
Miguel Serrano
b573374d0e Merge pull request #2950 from overleaf/as-jsdom-tests 
JSDOM tests

GitOrigin-RevId: d9e39c61fb2028c5b5577488d74720ef2985eebc
 2020-07-11 02:04:35 +00:00
Jakob Ackermann
48b138f227 Merge pull request #2929 from overleaf/jpa-ci-3m30s-with-custom-cloudbuild 
[misc] another batch of CI improvements

GitOrigin-RevId: 470fd762ba541d5dce92f0e99830fb2fd8fc4747
 2020-07-03 02:04:13 +00:00
Eric Mc Sween
fdb79de3a6 Merge pull request #2947 from overleaf/as-migrate-publish-modal-fetch 
Migrate publish modal requests from $.ajax to fetch

GitOrigin-RevId: de9fe1884fef5c8f375b820907720beba1a641e4
 2020-07-01 02:10:43 +00:00
Timothée Alby
1012dbc3c4 Merge pull request #2961 from overleaf/ta-spike-outline 
Document Outline Spike

GitOrigin-RevId: adc315a3546147eb10c7a40ae70f9cab1cbf7b8d
 2020-06-30 02:10:19 +00:00
Jakob Ackermann
153a9c5790 Merge pull request #2953 from overleaf/jpa-nocache 
[misc] Server: invoke the nocache middleware explicitly and add test

GitOrigin-RevId: 3238b07ebf5963ae95ef3f353e4745d283795fba
 2020-06-27 02:10:30 +00:00
Chrystal Maria Griffiths
6c614a6adc Merge pull request #2885 from overleaf/as-remove-transforms 
Remove transforms after being run

GitOrigin-RevId: a998e9ce9c58a501d366f6b288277bd604f9f39e
 2020-06-06 02:10:05 +00:00
Chrystal Maria Griffiths
c89b1912ca Merge pull request #2877 from overleaf/as-upgrade-react-dom-testing-library 
Upgrade React & DOM testing library

GitOrigin-RevId: b3ee2e726a549d7ddb55fe74497e8787237708eb
 2020-06-06 02:10:00 +00:00
Jessica Lawshe
d6c29ebe4f Merge pull request #2868 from overleaf/as-upgrade-react-16.13.1 
Upgrade to React v16.13.1

GitOrigin-RevId: 6bf465610430c2bed97f3b49fde83b1a60e7c77c
 2020-06-03 10:31:03 +00:00
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
Shane Kilkelly
81b09c7800 Merge pull request #1071 from sharelatex/sk-enable-git-bridge-in-v2 
Enable git-bridge in v2

GitOrigin-RevId: 24586c7c80b53ae171199ecde538df794f78ecc7
 2018-11-14 11:29:35 +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
48eb49a763 add sso passport modules 2018-09-19 10:20:27 -04:00
Henry Oswald
5ed95694da Merge pull request #801 from sharelatex/ho-mailchimp 
Add non checked checkbox for newsletter subscription on signup and use mailchimp as newsletter provider.
 2018-08-16 11:40:39 +01:00
Tim Alby
4a65a526ce require minilist package 2018-08-13 17:03:48 +02:00
Henry Oswald
17a63258c6 changed newsletter to use mailchimp 2018-08-04 17:52:12 +01:00
Tim Alby
97c145433e use EmailHelper.parseEmail on registration 
Also changed EmailHelper to use the regexp already used in
UserRegistrationHandler rather than the `mimelib` package as it is
deprecated.
 2018-06-11 12:31:18 +02:00
Jessica Lawshe
b4a989f0b7 Add contentful 2018-06-04 09:51:40 -05:00
Tim Alby
a9f1989eca add test_unit_app task 2018-05-23 15:47:28 +02: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
hugh-obrien
39d25fdff9 webpack compiling for publish menu 2018-04-10 15:59:30 +01:00
hugh-obrien
a250004036 initial publish modal setup 2018-04-10 15:59:24 +01:00
Alasdair Smith
8537c7b9b6 Add production webpack npm script 2018-03-15 09:42:26 +00:00
Alasdair Smith
8bde5120dd Change frontend test commands so its easier to run locally in debug mode 2018-03-07 09:52:08 +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
James Allen
01d84bd983 Handle error cases when downloading URL 2018-03-05 10:37:00 +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
Brian Gough
38cb2885d8 Merge pull request #364 from sharelatex/bg-support-debug-mode 
add support for debugging
 2018-02-26 11:34:29 +00:00
Alasdair Smith
22b8c114a2 Upgrade mocha to latest 2018-02-23 17:00:29 +00:00
Alasdair Smith
325f91ed2e Add scripts for running linting 2018-02-23 11:41:21 +00:00
Brian Gough
d364bfc353 add support for debugging 2018-02-23 11:36:08 +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
24ec7b77ab Convert frontend test runs to use Docker/karma 2018-02-20 14:01:50 +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
ec8637ead1 Add back webpack script 2018-01-31 17:26:29 +00:00
Alasdair Smith
e01615c174 Install webpack & babel 2018-01-31 17:24:19 +00:00
Alasdair Smith
c156187bab Remove unused contentful dependency 
This package is unused, and was causing problems with installing babel. Because
it dependended on an older version of babel, and was interpreted by npm first
(as it is a regular dep), the older version of babel would be "hoisted" to the
top level of node_modules

Then when latest versions of babel are installed they would be interpreted second
and thus would nest their dependencies within their own node_modules, filling the
disk with unnecessary copies of core-js.

Removing the unnecessary dep solves these problems
 2018-01-31 12:30:39 +00:00
James Allen
98c620a99b Revert "Install webpack and babel" 
This reverts commit 5cfd0ac2d21be5ea0049ced4e522c7a57ddae0c1.
 2018-01-22 17:52:39 +00:00
Alasdair Smith
4a0628d801 Remove unnecessary test script 2018-01-15 16:23:10 +00:00
Alasdair Smith
4642d55b7b Add basic example script 2018-01-15 16:23:10 +00:00
Alasdair Smith
9fbd7f2818 Install webpack and babel 2018-01-15 16:23:10 +00:00
James Allen
662122bb1c CI and local dev environment improvements 
The need for this became very noticeable due to the slowness of filesystem access in docker-in-mac, with a full compile taking over a minute for me in docker. Using make to introduce incremental compile makes this near instantaneous outside of docker (if only a few files have changed), and quick enough inside docker.

With incremental compile via make, it compiles quickly enough that re-compiling and restarting the web service automatically when backend files change is quick enough now. This is how the service is run via docker-compose in https://github.com/sharelatex/sharelatex-dev-environment, so it shouldn't be necessary to manually restart the container each time a coffee file changes.

At the moment Jenkins pull web modules in via the GitSCM plugin, but I believe this is creating a dependency in Jenkins, where any commits to any of the modules causes all of the web branches to rebuild. By doing it via our own scripts we can hopefully avoid this. It also creates a build process which is reproducible locally.

**Note that at the moment in this PR all modules pull from `ja-dockerize-dev` branches, but these should be merged first, and this PR updated to point to the master branches before merging**. This is necessary for other changes to build process/docker-compose workflow.

As well as a Makefile for web, there is now a `Makefile.module`. This is copied into each module directory by the top-level Makefile, and is written in a way to be flexible and support unit tests, acceptance tests, front-end js for the ide and main, and the modules `app/coffee` directory, while allowing modules to have some of these missing (not all modules have e.g. acceptance tests, or front-end JS). This will allows us to refine the build process in future, without needing to update the Makefile in each module repo separately (I found this to be a painful part of this development).

This makes web compatible with the docker-compose workflow at https://github.com/sharelatex/sharelatex-dev-environment, where each service is running in its own docker container, with networking managed by docker.

Previously the Makefile was set up to run unit tests in docker with `make unit_tests`. This now just runs them natively. In the CI, they are run in docker anyway (all steps in Jenkins are), and locally, they run fine natively with `npm run test:unit`, or can be run in docker via https://github.com/sharelatex/sharelatex-dev-environment with `bin/run web_sl npm run test:unit`.

Previously we did a lot of juggling with only mounting source files (coffee, less, etc) into the docker container for acceptance tests. This was to avoid creating root owned files if the whole directory was mounted. Now instead the whole web directory is mounted read-only, with the compilation step done outside of the container before running the tests.

This allows the host and container to share the `node_modules` folder as well, which avoids needing to `npm install` twice on the CI box, and should speed up the build by a few minutes.

On macOS, this would cause a problem with compiled modules if you tried to use the same `node_modules` to run the app natively. However, if running via docker-compose in https://github.com/sharelatex/sharelatex-dev-environment, this is no longer a problem.
 2018-01-15 09:36:41 +00:00
Tim Alby
08b74c95f5 proxy requests to analytics service 2018-01-10 15:03:14 +02:00
James Allen
d7a26e27e5 Run front end tests in CI 2017-12-19 13:58:47 +00:00
James Allen
8ea779af58 Add some front end tests for HistoryManager 2017-12-19 13:58:47 +00:00
Henry Oswald
bd7e2d956d add mandrill as email option 2017-12-11 11:05:04 +00:00
James Allen
e62ec77161 Merge pull request #180 from sharelatex/ja-quiet-npm 
Run npm with -q flag for less verbose test output
 2017-12-01 08:32:46 +00:00
Hayden Faulds
e916fc906a add mkdirp dev dependency 2017-11-30 13:15:39 +00:00
James Allen
870e87ebe1 Run npm with -q flag for less verbose test output 2017-11-30 11:00:28 +00:00
James Allen
50b3045548 Tidy up docker-compose and makefile 2017-11-29 13:49:36 +00:00
James Allen
4c504ad8eb Remove debugging command 2017-11-27 17:10:58 +00:00
James Allen
5e0fc24c1a Allow modules to specific their own acceptance tests 2017-11-27 17:10:58 +00:00
James Allen
d9d7c96958 Get module unit tests running inside Docker as well as main tests 2017-11-27 17:10:58 +00:00
James Allen
fbf8cc2d03 Run acceptance tests via docker compose 2017-11-27 17:10:58 +00:00
Brian Gough
41819db7c5 remove unnecessary redis package 2017-10-30 15:41:32 +00:00
Brian Gough
e474344204 remove unnecessary ioredis package 2017-10-30 15:41:09 +00:00
Brian Gough
ebd28a8353 upgrade ioredis vis redis sharelatex 2017-10-30 15:40:56 +00:00
Brian Gough
d6d76f132e replace unzip with yauzl 2017-10-16 14:15:38 +01:00
James Allen
38b8450cee Add jsonwebtoken package 2017-10-03 10:29:49 +01:00
James Allen
1502da85cf Set up acceptance tests to run in docker container 2017-09-27 10:37:20 +02:00
Shane Kilkelly
54070c7734 pin chai 2017-09-12 11:21:34 +01:00
Tim Alby
d6834ff417 add security headers using Helmet 
- use all Helmet's default headers except `X-DNS-Prefetch-Control`
- use `Referrer-Policy`
- use cache headers when:
  - a user is logged in, OR
  - a project is displayed
 2017-09-12 11:17:59 +02:00
James Allen
b4254f06ef Update Project schema for overleaf imports 2017-08-21 17:49:08 +02:00
James Allen
eac0ce8353 Initial spike of Overleaf based logins 2017-08-08 14:00:21 +02:00
Paulo Reis
2fcbafa72d Add HTML encoder lib. 2017-07-28 17:30:57 +01:00
Joe Green
10683cbd8c upgraded mongoose package 2017-07-27 10:58:20 +01:00
James Allen
e19f5a1a5e Update redis-sharelatex and shrinkwrap 2017-05-09 17:18:04 +01:00
James Allen
3f51911513 Update to latest redis-sharelatex 2017-05-04 15:25:58 +01:00
Shane Kilkelly
bb65da88fe Merge branch 'master' into node-6.9 2017-04-05 10:15:51 +01:00
Shane Kilkelly
60b298d9ee upgrade to latest metrics 2017-03-31 14:43:19 +01:00
Shane Kilkelly
ca3497b6f6 Update metrics version to 1.7.0 2017-03-21 13:46:42 +00:00
Shane Kilkelly
98d7dc6f88 Make work on both 0.10 and 6.9 2017-02-27 13:54:57 +00:00
Shane Kilkelly
8d7c39ff42 Merge branch 'master' into node-6.9 2017-02-27 11:25:39 +00:00
Shane Kilkelly
bd997fc574 pin sinon js to 1.17, version 2 betas cause breakage 2017-02-27 11:01:25 +00:00
James Allen
2df8479db3 Move translations back to devDependencies so it's not missed by shrinkwrap 2017-02-21 15:25:28 +01:00
James Allen
f180b25850 Convert track changes text to translation strings 2017-02-17 16:28:53 +01:00
Shane Kilkelly
621a07aff2 Merge branch 'master' into node-6.9 2017-02-14 11:01:14 +00:00
Shane Kilkelly
4e9426e6bf Merge branch 'master' into sk-pug 2017-01-30 14:36:10 +00:00
Shane Kilkelly
3ed85dad42 Merge branch 'master' into sk-upgrade-uuid 2017-01-30 11:09:50 +00:00
James Allen
32b0c6a4fb Merge pull request #398 from sharelatex/ja-track-changes 
Fix style issues in IE 10
 2017-01-25 15:55:15 +01:00
Shane Kilkelly
abbffb8e4b Remove deprecated node-uuid package, replace with uuid. 2017-01-23 10:03:16 +00:00
Shane Kilkelly
57cd54bf55 WIP: migrate from jade to pug 2017-01-20 12:03:02 +00:00
Paulo Reis
e0f3593bff Add autoprefixer to Grunt tasks. 2017-01-18 15:38:18 +00:00
Shane Kilkelly
1ef1912cf8 Point to fork of rolling-rate-limiter that supports ioredis 2017-01-13 15:21:05 +00:00
Shane Kilkelly
5c25d15a18 WIP: try switch to rolling rate limiter 2017-01-12 09:25:18 +00:00
Shane Kilkelly
64f69069b2 Experimental: upgrade to node 6.9.2 (latest LTS release) 2016-12-21 10:23:42 +00:00
Henry Oswald
bcf9a17fb3 Merge branch 'master' into node-4.2 2016-12-20 15:23:02 +00:00
Shane Kilkelly
ef0a5801d5 Create a RedisWrapper, and use it for rate limiting. 2016-12-19 12:17:02 +00:00
Henry Oswald
d87067bc2f Merge branch 'announcments' 2016-11-15 10:38:01 +00:00
Henry Oswald
47ed17aab3 remove unneeded package and comma in jade 2016-11-14 10:50:49 +00:00
Henry Oswald
5a13ee1077 use anlaytis api 
- don’t talk to postgres
- show recent blog post announcments
- proxy all events to analytics api
 2016-11-11 17:03:09 +00:00
Shane Kilkelly
8726a8fb4d Add passport-saml dependency 2016-11-11 09:09:00 +00:00
Shane Kilkelly
bfa0e7cf89 WIP: start moving web sessions to cluster 2016-11-08 15:32:36 +00:00
Shane Kilkelly
9cb3d8c4b8 Enable hook from module into passport init. 2016-11-01 14:06:54 +00:00
James Allen
49fecc9ef4 Use v1.6.0 of metrics 2016-10-24 10:51:20 +01:00
Henry Oswald
7b83a941ee Merge branch 'master' into node-4.2 2016-10-19 13:04:26 +01:00
Shane Kilkelly
e4f4325150 Basic passport integration 2016-09-02 16:17:37 +01:00
James Allen
93cd511211 Send events to custom DB backend 2016-08-10 16:42:56 +01:00
Henry Oswald
23cb6a9419 Merge branch 'master' into node-4.2 2016-07-28 13:54:06 +01:00
Paulo Reis
8eae4e4044 Revert "Use custom shrinkwrap to ignore the translations package." 
This reverts commit 25a8a7cd9a59f738277ce893318c69db539384d6.
 2016-07-12 13:42:46 +01:00
Paulo Reis
112a64ce84 Use custom shrinkwrap to ignore the translations package. 2016-07-12 13:37:26 +01:00
Henry Oswald
a9f3a29b72 moved translations to dev dependency so its not included in shrinkwrap. 2016-07-12 10:17:58 +01:00
Henry Oswald
85936a1391 moved css min to exec, import was not working via grunt 2016-07-10 11:04:51 +01:00
Henry Oswald
7cb266d904 removed imagemin 2016-06-30 14:59:05 +01:00
Brian Gough
afc89d8d27 added missing package grunt-execute 2016-06-28 10:42:36 +01:00
Henry Oswald
d35a48e683 minfiy css as well 2016-06-18 21:49:32 +01:00
Henry Oswald
1d26be30a9 added grunt imagemin used to compress images 2016-06-18 16:50:56 +01:00
Henry Oswald
560b7f7177 grunt will auto recompile client and less now, run concurrently 2016-06-15 12:08:11 +01:00
Henry Oswald
79929eae73 Merge branch 'clsichecks' 2016-06-06 14:34:22 +01:00
Henry Oswald
2339cda318 added contentful uni pages as fallback 2016-06-06 09:28:53 +01:00
Henry Oswald
bc59b15bd8 mark grunt at 0.4.1. in package.json 2016-06-02 15:24:10 +01:00
Henry Oswald
1dd4ea176a Merge branch 'master' into node-4.2 2016-06-02 15:20:57 +01:00
Henry Oswald
734b5613a5 fix package.json 2016-06-02 15:20:18 +01:00
Henry Oswald
8529cb50b6 rolled back underscore and added lodash in 2016-06-02 13:18:07 +01:00
Henry Oswald
66ad587c9c bump underscore to 1.8.3 2016-06-01 16:46:11 +01:00
Henry Oswald
2abebd850c Merge branch 'project_url_query' into clsi-dynamic-load 2016-05-19 13:08:20 +01:00