github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-23 02:55:13 -04:00
Code Issues Projects Releases Packages Wiki Activity
17824 commits 3 branches 7 tags 188 MiB
Commit graph

17824 commits

This branch
This branch
All branches
Author SHA1 Message Date
Miguel Serrano
936f9f8142 Added explicit reference to Server Pro image in docker-compose (#649) 2019-10-18 15:41:28 +02:00
Brian Gough
bc8ccf26c7 Merge pull request #2249 from overleaf/bg-create-session-validation-token-for-all-sessions 
move session validation into SessionStoreManager

GitOrigin-RevId: 438ec738f0ccaf9f072629d6203a334cb8439b83
 2019-10-18 08:42:35 +00:00
Miguel Serrano
78d179c459 Fix token creation on admin registration (#648) 2019-10-18 10:03:05 +02:00
Jessica Lawshe
5d3c125ffb Merge pull request #2043 from overleaf/bg-preserve-undo-in-rich-text 
preserve the undo flag in rich text

GitOrigin-RevId: 3c7b770d9aa41daf76783333db6beb99f1156c9a
 2019-10-17 16:29:19 +00:00
Jessica Lawshe
34c04660a6 Merge pull request #2250 from overleaf/jel-saml-session-email 
Non canonical institution email in session

GitOrigin-RevId: b70971f6f42391391a42ba6ff214c14a275461d3
 2019-10-17 16:29:13 +00:00
Jessica Lawshe
93c0180d31 Merge pull request #2243 from overleaf/pr-fix-2388 
Prevent scrolling the dashboard background element.

GitOrigin-RevId: ba5b245d1a96bb27466a996c837ecb6463e46eb2
 2019-10-17 16:29:07 +00:00
Jessica Lawshe
1fa4621219 Merge pull request #2247 from overleaf/bg-fix-unit-tests-for-transfer-ownership 
add stub for EmailHandler in unit tests

GitOrigin-RevId: 1841d42e68dea07fbc37919974149365e3df5e07
 2019-10-17 16:29:00 +00:00
Ersun Warncke
0cc7783ad2 pr fixes 
GitOrigin-RevId: 8bbe27be51951304673a21e7ba6cd1e7cef1ea60
 2019-10-17 14:10:25 +00:00
Ersun Warncke
d59d8dddad sso bailout pages 
GitOrigin-RevId: e0e39268227896660a02d8b74cd00249bdf431eb
 2019-10-17 14:10:19 +00:00
Simon Detheridge
ce366fdbee Bump Dockerfile to node 10 2019-10-17 12:46:07 +01:00
Simon Detheridge
7543f2fcbd Catch errors from socket.io and attempt graceful cleanup 2019-10-17 12:45:56 +01:00
Alasdair Smith
6a2b3a39a9 Merge pull request #2248 from overleaf/as-fix-cjk-prod 
Disable CDN for PDFjs cmaps path

GitOrigin-RevId: 52658564f22f94b7bd9893c499c5c58429a360d0
 2019-10-16 16:29:04 +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
a9428c9ece Merge pull request #96 from overleaf/bg-add-ioredis-maxretriesperrequest 
add ioredis maxRetriesPerRequest
 2019-10-16 08:55:36 +01:00
Brian Gough
21a9126847 set maxRetriesPerRequest from environment variable 2019-10-16 08:44:08 +01:00
Jessica Lawshe
e27577bd5b Merge pull request #2231 from overleaf/jel-institution-sso-link-error 
Add SSO error handling for when identifier linked

GitOrigin-RevId: e2bfa4dba896767d985476ecb78fcee86512a381
 2019-10-15 16:22:37 +00:00
Eric Mc Sween
2603597150 Merge pull request #2221 from overleaf/em-ownership-transfer-emails 
Project ownership transfer emails

GitOrigin-RevId: 3d33147c18e2d652976b3dac7453c0407c81314e
 2019-10-15 13:30:10 +00:00
Eric Mc Sween
6f966ceb3d Merge pull request #2239 from overleaf/em-collabs-frontend 
Change collaborator permissions

GitOrigin-RevId: 3627181d201e6d96734f89a380703953424f0fdf
 2019-10-15 13:30:00 +00:00
Eric Mc Sween
cc1de97df8 Merge pull request #2235 from overleaf/ta-recurly-subscription-callbacks 
Sync Recurly Subscriptions on New and Updated Events

GitOrigin-RevId: 597a7cb529d8c872693aae20cdb81a8edb1b7778
 2019-10-15 13:29:53 +00:00
Eric Mc Sween
2011189dc4 Merge pull request #2200 from overleaf/ho-add-noindex-option 
adds settings.robotsNoindex setting to stop robots indexing site

GitOrigin-RevId: 0c2c3aee215dd3ef1cca8cde4e0693a4bd39c6ef
 2019-10-15 13:29:47 +00:00
Eric Mc Sween
0e6b455ab0 Merge pull request #2194 from overleaf/ho-res-send-status 
use sendStatus for status codes, prevents errors in logs

GitOrigin-RevId: 98613a3c894a01eb9112fa9472403caeeae45bc2
 2019-10-15 13:29:40 +00:00
Shane Kilkelly
f797a5885e Merge pull request #10 from overleaf/sk-upgrade-node-10 
Upgrade to node 10, and migrate to package-lock.json
 2019-10-15 11:34:09 +01:00
Miguel Serrano
5159c9cc8b Disable project-history via settings (#125) 2019-10-15 11:00:38 +02:00
Eric Mc Sween
750a4879e7 Merge pull request #2228 from overleaf/ns-title-overflow 
allow line breaks to happen

GitOrigin-RevId: d4255739d17969dbfa514e841bf21c738dbf9020
 2019-10-14 18:01:53 +00:00
Eric Mc Sween
33d1f603df Merge pull request #2226 from overleaf/spd-clearprojectokens 
Add script to clear tokens from a specific project

GitOrigin-RevId: a810e2b7fe2e34efb937bffc0e39c409076daa23
 2019-10-14 13:38:07 +00:00
Eric Mc Sween
9a492257af Merge pull request #2220 from overleaf/jel-email-confirmation 
Email confirmation only for non-institution SSO emails

GitOrigin-RevId: 95bd0ce077031c11b9d60d2f736a1abe7431a265
 2019-10-14 13:37:57 +00:00
Eric Mc Sween
526d4982a1 Merge pull request #2219 from overleaf/jel-institution-email-already-exists 
Check for email before adding institution identifier

GitOrigin-RevId: 71f498116c8c8df2c3c1a33eafce3e56c87e7ee0
 2019-10-14 13:37:50 +00:00
Eric Mc Sween
ed7b5a9450 Merge pull request #2218 from overleaf/as-eslint-globals 
Move around eslint globals

GitOrigin-RevId: 81144a0b763159b9425aff673211c07ec65b3be5
 2019-10-14 13:37:42 +00:00
Brian Gough
dff4d66209 Merge pull request #83 from overleaf/bg-upgrade-ioredis 
upgrade ioredis to v4.14.1
 2019-10-14 11:18:45 +01:00
Brian Gough
971d50ed58 Merge pull request #82 from overleaf/spd-redis-max-retries 
Add maxRetriesPerRequest setting for redis
 2019-10-14 11:14:42 +01:00
Brian Gough
f028148fe2 upgrade ioredis to v4.14.1 2019-10-14 11:10:20 +01:00
Brian Gough
7db9e73ecf Merge pull request #2234 from overleaf/bg-avoid-event-loop-metrics-during-startup 
start event loop monitoring when the process is ready

GitOrigin-RevId: 0a7759311b737e99579f61cc4cf90b775c26b76d
 2019-10-14 09:43:03 +00:00
Shane Kilkelly
1b18529aaa Merge pull request #11 from overleaf/sk-upgrade-node-10 
Upgrade to node 10, and migrate to package-lock.json
 2019-10-14 10:41:58 +01:00
Shane Kilkelly
c69429a794 Merge pull request #27 from overleaf/sk-upgrade-node-10 
Update to node 10, and move to package-lock.json
 2019-10-14 10:09:21 +01: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
Brian Gough
781e01b8b4 Merge pull request #95 from overleaf/bg-update-ioredis 
update to ioredis 4.14.1
 2019-10-14 09:21:39 +01:00
Brian Gough
75facb159d Merge pull request #2225 from overleaf/bg-validate-sessions 
validate the session with a token derived from the sesionid

GitOrigin-RevId: d34a5bb1717a97138e11e7661f7288523199e0e2
 2019-10-11 10:16:47 +00:00
Brian Gough
48b58899f7 Merge pull request #2224 from overleaf/bg-fix-use-of-parseint 
fix setting for zero values

GitOrigin-RevId: e6037c6e9940421acea730fdc088d4cf230fdb11
 2019-10-11 10:16:41 +00:00
Shane Kilkelly
2cc2be3d9c send messages to clients with concurrency of 2 2019-10-11 10:01:21 +01:00
Shane Kilkelly
06aa578bdc Make it an error when we get no data from joinProject 2019-10-11 09:57:16 +01:00
Simon Detheridge
85b23d7da7 Add maxRetriesPerRequest setting for redis 2019-10-10 16:56:58 +01:00
Brian Gough
9edb95b706 Merge pull request #2223 from overleaf/spd-redis-retries 
Add maxRetriesPerRequest redis setting

GitOrigin-RevId: 69810e40eaedaf05d9e3397b59b26ea43ecbe9ce
 2019-10-10 14:00:59 +00:00
Brian Gough
d376047c20 Merge pull request #2222 from overleaf/bg-invalidate-tokens 
invalidate tokens

GitOrigin-RevId: b8a65846d2b671f7f7b8a2ab75f76bb8255bd73b
 2019-10-10 11:39:18 +00:00
Shane Kilkelly
2078bb0cbe Merge pull request #2 from overleaf/sk-upgrade-node-10 
Upgrade to node 10, specify digest in pbkdf2
 2019-10-10 09:55:59 +01:00
Brian Gough
3813ff36fb Merge pull request #62 from overleaf/bg-fix-update-removal 
fix performance of update removal
 2019-10-09 14:39:02 +01:00
Jessica Lawshe
625b4c9339 Merge pull request #2216 from overleaf/jel-saml-beta-account-settings 
Allow SAML beta testing on Account Settings

GitOrigin-RevId: 6a2c60a3cbab3d9d0cdcc72e23f5d75f7702f89c
 2019-10-09 13:13:40 +00:00
Brian Gough
ebbe728ec1 fix performance of update removal 2019-10-09 11:11:15 +01:00
Shane Kilkelly
1735e8f56b Upgrade to node 10, specify digest in pbkdf2 2019-10-08 15:53:08 +01:00
Ersun Warncke
849f21fde3 add saml acceptance tests. get/set entitlement. 
GitOrigin-RevId: 65721aadb91678eafaf5a214a2921fe3dd276efa
 2019-10-08 13:29:32 +00:00
Jessica Lawshe
de8ac8ace7 Move add email function 
GitOrigin-RevId: f45e28a9ed357427ae606ad5f8b59acaef54e31b
 2019-10-08 13:29:23 +00:00