From d4863ae148f0a1be53ab89f9c24eb061b620615a Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 20 Sep 2016 14:47:33 +0100 Subject: [PATCH 1/4] don't use cdn for blog posts which have a http on them --- services/web/app/coffee/Features/Blog/BlogController.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Blog/BlogController.coffee b/services/web/app/coffee/Features/Blog/BlogController.coffee index 4aaee6962a..2c39d723f4 100644 --- a/services/web/app/coffee/Features/Blog/BlogController.coffee +++ b/services/web/app/coffee/Features/Blog/BlogController.coffee @@ -28,7 +28,7 @@ module.exports = BlogController = try data = JSON.parse(data) if settings.cdn?.web?.host? - data?.content = data?.content?.replace(/src="([^"]+)"/g, "src='#{settings.cdn?.web?.host}$1'"); + data?.content = data?.content?.replace(/src="([^"\:]+)"/g, "src='#{settings.cdn?.web?.host}$1'"); catch err logger.err err:err, data:data, "error parsing data from data" res.render "blog/blog_holder", data From 1a67e4982eea47731d52741355663f721bc56756 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 20 Sep 2016 15:43:36 +0100 Subject: [PATCH 2/4] change blog regex to look for src's which start with a slash --- services/web/app/coffee/Features/Blog/BlogController.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Blog/BlogController.coffee b/services/web/app/coffee/Features/Blog/BlogController.coffee index 2c39d723f4..0f0d9383c7 100644 --- a/services/web/app/coffee/Features/Blog/BlogController.coffee +++ b/services/web/app/coffee/Features/Blog/BlogController.coffee @@ -28,7 +28,7 @@ module.exports = BlogController = try data = JSON.parse(data) if settings.cdn?.web?.host? - data?.content = data?.content?.replace(/src="([^"\:]+)"/g, "src='#{settings.cdn?.web?.host}$1'"); + data?.content = data?.content?.replace(/src="(\/[^"]+)"/g, "src='#{settings.cdn?.web?.host}$1'"); catch err logger.err err:err, data:data, "error parsing data from data" res.render "blog/blog_holder", data From c2e14ded131b3ffd2a74e375310af05ea02d4e1d Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 20 Sep 2016 16:55:12 +0100 Subject: [PATCH 3/4] Add null checks for fileRefs and docs, which are not present when calling mkdirp --- .../web/app/coffee/Features/Project/ProjectLocator.coffee | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/services/web/app/coffee/Features/Project/ProjectLocator.coffee b/services/web/app/coffee/Features/Project/ProjectLocator.coffee index 6c5ce708fc..44f68123d6 100644 --- a/services/web/app/coffee/Features/Project/ProjectLocator.coffee +++ b/services/web/app/coffee/Features/Project/ProjectLocator.coffee @@ -101,16 +101,15 @@ module.exports = ProjectLocator = getEntity = (folder, entityName, cb)-> if !entityName? return cb null, folder, "folder" - - for file in folder.fileRefs + for file in folder.fileRefs or [] if file?.name.toLowerCase() == entityName.toLowerCase() result = file type = "file" - for doc in folder.docs + for doc in folder.docs or [] if doc?.name.toLowerCase() == entityName.toLowerCase() result = doc type = "doc" - for childFolder in folder.folders + for childFolder in folder.folders or [] if childFolder?.name.toLowerCase() == entityName.toLowerCase() result = childFolder type = "folder" From 2478a95bcbf92611e6bd787dc48baddce750bc15 Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 21 Sep 2016 10:48:23 +0100 Subject: [PATCH 4/4] Don't watch files as grunt default --- services/web/Gruntfile.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/web/Gruntfile.coffee b/services/web/Gruntfile.coffee index 60fa6ba0dd..ece9e5bf11 100644 --- a/services/web/Gruntfile.coffee +++ b/services/web/Gruntfile.coffee @@ -380,8 +380,8 @@ module.exports = (grunt) -> grunt.registerTask 'test:modules:unit', 'Run the unit tests for the modules', ['compile:modules:server', 'compile:modules:unit_tests'].concat(moduleUnitTestTasks) - grunt.registerTask 'run', "Compile and run the web-sharelatex server", ['compile', 'env:run', 'parallel'] - grunt.registerTask 'runq', "Compile and run the web-sharelatex server", ['compile', 'env:run', 'exec'] + grunt.registerTask 'run:watch', "Compile and run the web-sharelatex server", ['compile', 'env:run', 'parallel'] + grunt.registerTask 'run', "Compile and run the web-sharelatex server", ['compile', 'env:run', 'exec'] grunt.registerTask 'default', 'run'