github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-02 10:00:47 -05:00
Code Issues Projects Releases Packages Wiki Activity
8500 commits 3 branches 7 tags 206 MiB
Commit graph

231 commits

Author SHA1 Message Date
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