Commit Graph

  • bba6008e4d Merge pull request #321 from sharelatex/ace-syntax-validator-minimal-change Brian Gough 2016-09-26 09:25:50 +01:00
  • ab4916067e Merge branch 'master' into sk-passport Shane Kilkelly 2016-09-26 09:18:24 +01:00
  • dd14e51713 Handle null, undefined and false in isUserLoggedIn Shane Kilkelly 2016-09-23 16:53:07 +01:00
  • 8a2b7d0461 server side protect passwords which are too long Henry Oswald 2016-09-23 16:51:46 +01:00
  • 0d0f0e8604 wip Henry Oswald 2016-09-23 15:44:47 +01:00
  • f9030a0a38 get user_id directly Shane Kilkelly 2016-09-23 16:25:23 +01:00
  • 7384a08cb4 Pass req to function. Shane Kilkelly 2016-09-23 16:21:07 +01:00
  • 67f8ec756c Revert "wip" Henry Oswald 2016-09-23 16:19:11 +01:00
  • 7c0e338352 fix bug where users are always shown downgrade option when not required Henry Oswald 2016-09-23 16:18:22 +01:00
  • 5c2fbaafd3 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex Henry Oswald 2016-09-23 15:45:42 +01:00
  • 0802ab6ddc wip Henry Oswald 2016-09-23 15:44:47 +01:00
  • 2bedd08ff9 Add test for new ulimit options Shane Kilkelly 2016-09-23 15:34:29 +01:00
  • 4efdddbbac Add CHKTEX_ULIMIT_OPTIONS Shane Kilkelly 2016-09-23 15:32:37 +01:00
  • 4f9826c87b show beta program link for everyone on /settings Brian Gough 2016-09-23 15:28:15 +01:00
  • 0eaa359f6c use syntax validator for beta programme users only Brian Gough 2016-09-15 14:16:28 +01:00
  • 975b70e4fe add latex syntax highlighting Brian Gough 2016-09-14 15:17:50 +01:00
  • d152095920 destroy ace sessions when no longer in use Brian Gough 2016-09-15 14:18:58 +01:00
  • 0a350c8e3f infrastructure for using ace syntax checking Brian Gough 2016-09-14 15:17:24 +01:00
  • 02587377a2 Remove ReferalMiddleware, dead code. Shane Kilkelly 2016-09-23 14:42:57 +01:00
  • 6e8185aeaf Merge branch 'master' into sk-passport Shane Kilkelly 2016-09-23 10:28:35 +01:00
  • 6c716ca252 Fix acceptance tests by updating invite-accept url Shane Kilkelly 2016-09-23 10:28:17 +01:00
  • 72ca1d6316 Merge branch 'master' into sk-passport Shane Kilkelly 2016-09-23 10:01:11 +01:00
  • 2b317cab6c Merge pull request #320 from sharelatex/ja-validate-filenames James Allen 2016-09-23 09:42:48 +01:00
  • f4ff72a2e4 Merge pull request #318 from sharelatex/ja-invite-emails-once Paulo Jorge Reis 2016-09-22 17:36:10 +01:00
  • e15976be21 Use token in URL to force its precense when invite and allow easy dynamic notifications James Allen 2016-09-22 17:24:06 +01:00
  • dbac4bd008 update session when user settings change Shane Kilkelly 2016-09-22 16:58:25 +01:00
  • 7e449c60ed fix tests Shane Kilkelly 2016-09-22 16:04:42 +01:00
  • 636b1fe9e2 Copy to session.user, for compatibility Shane Kilkelly 2016-09-22 15:49:09 +01:00
  • a0f156e1a9 wipe out more session access Shane Kilkelly 2016-09-22 15:33:50 +01:00
  • 21f88bb20e Use ide.validFileRegex, not hard coded regex James Allen 2016-09-22 14:57:59 +01:00
  • 9506797384 Update log parser to better handle Runaway argument errors James Allen 2016-09-22 14:47:48 +01:00
  • ff1c72ee14 Fix up more session access Shane Kilkelly 2016-09-22 14:30:34 +01:00
  • 638359e052 Don't delete knitr cache files James Allen 2016-09-22 14:14:29 +01:00
  • c959e0c65d Set req.user Shane Kilkelly 2016-09-22 13:54:13 +01:00
  • 6df569253a Fix session touch Shane Kilkelly 2016-09-22 13:48:09 +01:00
  • 7f24dd6f55 Fix tests for UserInfoController. Shane Kilkelly 2016-09-22 13:37:27 +01:00
  • 6758ab4ee2 fix comments for user create Henry Oswald 2016-09-22 12:45:45 +01:00
  • 1fca396be2 fix comments for user create Henry Oswald 2016-09-22 12:45:45 +01:00
  • 8ebbffe4ba Update docker-compose.yml Henry Oswald 2016-09-22 12:32:25 +01:00
  • 1c3be11b8c Update docker-compose.yml Henry Oswald 2016-09-22 12:32:25 +01:00
  • a3a7bdb890 make errors more clear Henry Oswald 2016-09-22 12:30:43 +01:00
  • 5e1f7d86fd make errors more clear Henry Oswald 2016-09-22 12:30:43 +01:00
  • a3ace1fccd Increase timeout because slow tests Shane Kilkelly 2016-09-22 11:33:54 +01:00
  • 3b73d97931 Use getLoggedInUserId Shane Kilkelly 2016-09-22 11:33:38 +01:00
  • cce93b95a5 Fetch updates before doc content when building a diff James Allen 2016-09-22 11:18:10 +01:00
  • 05a048db9a Add in a little more logging James Allen 2016-09-22 11:13:26 +01:00
  • 64c9a3ae18 Fix logic, was wrong way around Shane Kilkelly 2016-09-22 11:16:50 +01:00
  • 1fca735f02 added check db init script ShareLaTeX 2016-09-21 17:10:27 +00:00
  • 22a3225e70 added check db init script ShareLaTeX 2016-09-21 17:10:27 +00:00
  • e5283e39a5 added contacts runit ShareLaTeX 2016-09-21 17:09:53 +00:00
  • 046faae590 added contacts runit ShareLaTeX 2016-09-21 17:09:53 +00:00
  • ad10fda872 added notificaitons service ShareLaTeX 2016-09-21 17:09:23 +00:00
  • ea7f7af88d added notificaitons service ShareLaTeX 2016-09-21 17:09:23 +00:00
  • 5c42b1bbe3 spell check notifications Henry Oswald 2016-09-21 17:54:46 +01:00
  • b32cdab053 spell check notifications Henry Oswald 2016-09-21 17:54:46 +01:00
  • 52f68e2c60 install texcount on default image Henry Oswald 2016-09-21 16:59:37 +01:00
  • e98a23759c install texcount on default image Henry Oswald 2016-09-21 16:59:37 +01:00
  • 4386ab1225 Don't allow files to be created with / or * characters James Allen 2016-09-21 16:31:02 +01:00
  • 8cc0549dde Merge branch 'master' of https://github.com/sharelatex/sharelatex-docker-image Henry Oswald 2016-09-21 15:24:32 +01:00
  • e0d548a284 Merge branch 'master' of https://github.com/sharelatex/sharelatex-docker-image Henry Oswald 2016-09-21 15:24:32 +01:00
  • e029c80698 moved run.sh to run Henry Oswald 2016-09-21 15:24:07 +01:00
  • cb90144ae5 moved run.sh to run Henry Oswald 2016-09-21 15:24:07 +01:00
  • fe1caa806a Merge pull request #319 from sharelatex/fix-pdf-renderer-for-edge Brian Gough 2016-09-21 15:20:56 +01:00
  • 41cc9e68b5 update npm shrink-wrap Shane Kilkelly 2016-09-21 15:15:44 +01:00
  • 4c04a5df3f Sanitize resource path along with rootResourcePath James Allen 2016-09-21 15:09:01 +01:00
  • de2e0478c6 disable pdfjs fontface on Microsoft Edge Brian Gough 2016-09-21 13:58:14 +01:00
  • 6cfe468a3b move settings file to early on ShareLaTeX 2016-09-21 12:47:07 +00:00
  • 66dcbb9b96 move settings file to early on ShareLaTeX 2016-09-21 12:47:07 +00:00
  • c12450f533 Merge branch 'master' into sk-passport Shane Kilkelly 2016-09-21 13:17:54 +01:00
  • dde5b7b830 Regenerate session on login, protect against session-fixation attack. Shane Kilkelly 2016-09-21 13:03:37 +01:00
  • 662f113503 throw errors in grunt when checking Henry Oswald 2016-09-21 12:43:58 +01:00
  • 1e81ab7bef throw errors in grunt when checking Henry Oswald 2016-09-21 12:43:58 +01:00
  • 0f1389a115 added check make back in and list of make grunt tasks Henry Oswald 2016-09-21 12:08:11 +01:00
  • 2443aa9e75 added check make back in and list of make grunt tasks Henry Oswald 2016-09-21 12:08:11 +01:00
  • d904e50041 Make project invite notification dynamic and accept via ajax request James Allen 2016-09-21 11:59:35 +01:00
  • 779ace2fb7 Merge branch 'master' into ja-invite-emails-once James Allen 2016-09-21 10:48:43 +01:00
  • 2478a95bcb Don't watch files as grunt default James Allen 2016-09-21 10:48:23 +01:00
  • bb7985208b Lower case email before considering if it's duplciated when sharing James Allen 2016-09-21 10:48:04 +01:00
  • a93c939dbc Send invite email and notification in the background James Allen 2016-09-21 10:11:35 +01:00
  • bb71433727 Remove getLoggedInUser Shane Kilkelly 2016-09-21 09:27:51 +01:00
  • eca1dfa482 Remove dead code Shane Kilkelly 2016-09-21 09:27:35 +01:00
  • 9e2b010238 remove helpers we don’t use Henry Oswald 2016-09-20 17:08:38 +01:00
  • c41540fc02 remove helpers we don’t use Henry Oswald 2016-09-20 17:08:38 +01:00
  • 192b77c573 add checkMongoConnect and checkRedisConnect funcs to grunt Henry Oswald 2016-09-20 17:07:52 +01:00
  • 7d4286d368 add checkMongoConnect and checkRedisConnect funcs to grunt Henry Oswald 2016-09-20 17:07:52 +01:00
  • c2e14ded13 Add null checks for fileRefs and docs, which are not present when calling mkdirp James Allen 2016-09-20 16:55:12 +01:00
  • 1a67e4982e change blog regex to look for src's which start with a slash Henry Oswald 2016-09-20 15:43:36 +01:00
  • 21ca9697ca log user_id not user Henry Oswald 2016-09-20 15:11:14 +01:00
  • 777cbf1c80 move comment for user is false next to if statment Henry Oswald 2016-09-20 14:50:26 +01:00
  • d4863ae148 don't use cdn for blog posts which have a http on them Henry Oswald 2016-09-20 14:47:33 +01:00
  • 4eada48638 Merge branch 'master' into sk-passport Shane Kilkelly 2016-09-19 15:40:25 +01:00
  • 89d1a9a51c Merge pull request #317 from sharelatex/ja-fix-doc-deletes James Allen 2016-09-19 14:38:51 +01:00
  • 0917fe10ca Return type when finding element by path so that we don't need a heuristic James Allen 2016-09-19 14:32:58 +01:00
  • ebe3ba4fb8 Merge pull request #316 from sharelatex/pdfjs-font-patch Brian Gough 2016-09-19 11:24:50 +01:00
  • 64dc1784d3 switch to patched version of pdfjs Brian Gough 2016-09-19 10:31:24 +01:00
  • a3abd2a4a5 Merge pull request #15 from sharelatex/ja-copy-paste-diff James Allen 2016-09-19 11:07:51 +01:00
  • 6f50d56ceb apply pdfjs font patch Brian Gough 2016-09-19 10:30:34 +01:00
  • dd4a509d51 add copy of unpatched pdfjs-1.3.91 Brian Gough 2016-09-19 10:29:55 +01:00
  • a8bad0539c Create/delete larger files in df test Winston Li 2016-09-19 10:07:46 +01:00
  • fe058e8695 Use df equivalent as default for calculating used space Winston Li 2016-09-19 10:01:07 +01:00