agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-15 14:43:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,248 Commits 8 Branches 23 Tags
efc7b85406e0f30b78c4fed20cfc8ef8bfdd67df
Commit Graph
18248 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Chrystal Griffiths bb06f82e04 Still send cursorData for logged in users 2019-02-12 14:00:47 +00:00
Henry Oswald fa40e2c95f Merge pull request #44 from sharelatex/ho-docker-no-keychange 
docker build script minimal
 2019-02-12 13:45:49 +00:00
Henry Oswald 0a0fc91f28 Update app.coffee 2019-02-12 13:27:13 +00:00
Alasdair Smith 9b97af8977 Merge pull request #1403 from sharelatex/as-swap-brand-prefix 
Swap brand prefix so OL is the default

GitOrigin-RevId: 60f4f03598fb6befc1ce790d39f546490612a1db
 2019-02-12 11:32:28 +00:00
Chrystal Griffiths 2ec760403f Revert to method not sending cursorData because of duplication 2019-02-11 11:52:14 +00:00
Simon Detheridge 255981bdc2 Merge pull request #1486 from sharelatex/ta-subscription-dash-fix 
Fix Subscirption Dashboard Messaging

GitOrigin-RevId: 601b0df74c6f9f6bcc1c3ba6ecbf64721bc6fb99
 2019-02-11 11:42:34 +00:00
Simon Detheridge 7dcc807caf Merge pull request #1479 from sharelatex/sk-check-read-token-against-v1 
Check generated read-tokens against v1

GitOrigin-RevId: 15749a41a295c0401b0a39968f2c3657f8abebb8
 2019-02-11 11:42:29 +00:00
Simon Detheridge 78b79999e9 Merge pull request #1492 from sharelatex/spd-dropbox-unlink-csrf 
Add csrf protection for unlinking Dropbox accounts

GitOrigin-RevId: 00bbf0b8d4dc9f97098a645267bf23a6c3e5eea3
 2019-02-11 11:42:24 +00:00
Simon Detheridge c7f30bdfec Merge pull request #1494 from sharelatex/spd-overleaf-v1-oauth-state 
Use 'state' parameter to prefent CSRF attacks when authenticating with v1

GitOrigin-RevId: bf5f8ddffa391d8f3ca84d3588df906b08eb018d
 2019-02-11 11:42:20 +00:00
Simon Detheridge ea807d053e Merge pull request #1489 from sharelatex/spd-mendeley-csrf 
Enforce use of csrf token in Mendeley / tpr OAuth

GitOrigin-RevId: b615ee195442123e0cd8ff19a864909ac2e6496d
 2019-02-11 11:42:15 +00:00
Simon Detheridge 9e07daba0b Merge pull request #1490 from sharelatex/ns-remove-ip-endpoint 
remove /ip endpoint

GitOrigin-RevId: 42ea1ff6db6cba5e74a6e6c133a4d9f2b93d4a2e
 2019-02-11 11:42:10 +00:00
Chrystal Griffiths cb12e1c6f6 Send an empty string for every nameless user 2019-02-08 15:39:51 +00:00
Henry Oswald 3bc4cb492a added log line 2019-02-07 16:30:53 +00:00
Brian Gough 79c1dc5c1a use explicit json content-type to avoid security issues with text/html 2019-02-07 15:54:13 +00:00
Henry Oswald 08723f8972 revert health check redis types 2019-02-07 15:53:26 +00:00
Henry Oswald ecaef6485b revert the removal of realtime keyspace 2019-02-07 15:27:51 +00:00
Henry Oswald b5564095f3 add /health_check/redis route back in 2019-02-07 15:10:40 +00:00
Henry Oswald 73bd264401 remove realtime keys in settings, no longer used 2019-02-07 14:55:24 +00:00
Henry Oswald 1fc1b4206e add shutDownInProgress check into sig listening 2019-02-07 13:57:38 +00:00
Henry Oswald 7999b33faa Merge branch 'master' of https://github.com/sharelatex/metrics-sharelatex 2019-02-07 09:47:56 +00:00
Henry Oswald 15d14d8e2b add injectMetricsRoute into statsd so it doens't blow up 2019-02-07 09:47:29 +00:00
Henry Oswald 2998750a33 fix redis version lock 2019-02-06 16:01:44 +00:00
Henry Oswald 4e1a2c787c Revert "turn down logging, use logger.info for less important data" 
This reverts commit c5f91428e3c7702fbbd3ffd1ef7a772d513f33f2.
 2019-02-06 15:29:22 +00:00
Henry Oswald d85bf5cedb remove extra logging line 2019-02-06 15:26:12 +00:00
Henry Oswald 54d16bcab9 remove redis from config, it doesn't use redis 2019-02-06 15:20:30 +00:00
Ersun Warncke 81e3db260c Merge pull request #1472 from sharelatex/ew-add-close-site-and-private-disconnect-route 
Add close site setting and private disconnect all users route

GitOrigin-RevId: d078c053ba4e5f5c048f30f2a6d509966736b3e0
 2019-02-06 14:24:52 +00:00
Henry Oswald 01d3f4bff4 Merge pull request #54 from sharelatex/ho-docker 
Update docker build process
 2019-02-06 13:42:03 +00:00
Henry Oswald 0151826eaf clear error if s3 keys are not set for tests 2019-02-06 12:23:15 +00:00
Henry Oswald 2adae20368 remove a console.log 2019-02-06 11:43:11 +00:00
Henry Oswald 7caf3d4935 remove debugging 2019-02-06 11:29:31 +00:00
Henry Oswald cef7e1e17b Merge branch 'master' into ho-docker 2019-02-06 11:28:16 +00:00
Henry Oswald 2a68ddca6e Merge pull request #20 from sharelatex/ho-docker 
Move to docker based builds
 2019-02-06 10:35:20 +00:00
Brian Gough c51461da09 Merge pull request #1480 from sharelatex/bg-allow-separate-websocket-url 
allow setting separate wsUrl for websockets

GitOrigin-RevId: afd4f441397c6b4b402e342f1dec01c971847a0f
 2019-02-06 10:20:36 +00:00
Henry Oswald f4602d0b38 Merge pull request #47 from sharelatex/ho-docker 
Move to docker build process
 2019-02-06 10:06:13 +00:00
Henry Oswald ee9bfcf7e8 Merge pull request #32 from sharelatex/ho-docker 
Dockerise builds
 2019-02-06 09:47:44 +00:00
Henry Oswald 8d74b9e2ec call app chat not chat-sharelatex 2019-02-05 18:50:57 +00:00
Henry Oswald 0f48c77e7e enable conversions for local docker compose 2019-02-05 17:19:33 +00:00
Henry Oswald 167e6cf044 Merge pull request #7 from sharelatex/ho-docker 
Update build scripts
 2019-02-05 16:08:28 +00:00
nate stemen 4840d9e9bd Merge pull request #1469 from sharelatex/ns-ta-refresh-features-on-donmain-confirm 
refresh features on donmain confirm

GitOrigin-RevId: e1c29f1c590aafefef188ddfbc50654194b0747f
 2019-02-05 15:58:58 +00:00
Henry Oswald e8848e35f3 Merge pull request #8 from sharelatex/ho-docker 
Move to docker based builds
 2019-02-05 15:24:35 +00:00
Henry Oswald 5eec00db51 don't run conversions test when disabled 2019-02-05 14:06:51 +00:00
Henry Oswald 3fccf79ca8 cleanup 2019-02-05 12:50:08 +00:00
Henry Oswald ca9231b04e set enable conversions to false by default but enable in compse 2019-02-05 11:19:18 +00:00
Christopher Hoskin bb9b0ba6bd Merge branch 'ho-docker' into cmg-csh-ho-docker-spelling 2019-02-04 19:47:36 +00:00
Paulo Reis f902eb7d4a Add the project name as a translation local var when rendering project invites. 
GitOrigin-RevId: 80f4b10adc142173c2194f56c55df8b3ce9f948b
 2019-02-04 17:59:05 +00:00
Henry Oswald 37d1c96051 add logging 2019-02-04 16:59:36 +00:00
Chrystal Maria Griffiths ef1bbba618 Merge pull request #1478 from sharelatex/cmg-fix-subscription-tests 
Fix subscription page failing tests

GitOrigin-RevId: dc8bef0aa4996b457d3c770e3ad446315b8bed6f
 2019-02-04 16:25:12 +00:00
Chrystal Maria Griffiths 24dd3698e2 Merge pull request #1474 from sharelatex/cmg-delete-markers 
Comment out callouts for delete markers

GitOrigin-RevId: 43f0d36ec9cf6ca4e9f2231c69408dbb5a105d4e
 2019-02-04 16:25:05 +00:00
Chrystal Maria Griffiths 91594eee6d Merge pull request #1473 from sharelatex/as-fix-notification-translation 
Inject data into translation string to workaround removed potential XSS

GitOrigin-RevId: 6d9fa7050dafa1d48e3622765586eb4350dc514b
 2019-02-04 16:24:57 +00:00
Chrystal Maria Griffiths f5a6992aaa Merge pull request #1475 from sharelatex/sk-dont-require-login-email-confirmation 
Don't require login for email confirmation action

GitOrigin-RevId: 653baa394a8cdc08e4a52681d64fbd18ae34baca
 2019-02-04 16:24:52 +00:00