From 5df9f49a4e2dee3dc9f5244e4dd2ba9d7c905870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Sk=C3=A5nberg-Tippen?= Date: Tue, 10 Mar 2015 18:56:46 +0000 Subject: [PATCH 1/7] Rename 'javscript' to 'javascript' --- services/web/app/views/layout.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/views/layout.jade b/services/web/app/views/layout.jade index 5b236f789b..325d40a03f 100644 --- a/services/web/app/views/layout.jade +++ b/services/web/app/views/layout.jade @@ -3,7 +3,7 @@ html(itemscope, itemtype='http://schema.org/Product') block vars head - script(type="text/javscript"). + script(type="text/javascript"). // Stop superfish from loading window.similarproducts = true From 6014085e8ec1305dc0517d66f4bbb182e2df28a1 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Tue, 5 May 2015 14:33:18 +0100 Subject: [PATCH 2/7] prevent loading error for ace language tools extension in development --- services/web/app/views/project/editor.jade | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/web/app/views/project/editor.jade b/services/web/app/views/project/editor.jade index 23abd96759..0ccdcd88f4 100644 --- a/services/web/app/views/project/editor.jade +++ b/services/web/app/views/project/editor.jade @@ -99,6 +99,9 @@ block content }, "ace/ext-searchbox": { deps: ["ace/ace"] + }, + "ace/ext-language_tools": { + deps: ["ace/ace"] } }, config:{ From 8fc41e9e053b20cec9c21ab73853f597cbd926f3 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Sun, 10 May 2015 13:10:03 +0100 Subject: [PATCH 3/7] added templateLinks property to example config for ShareLaTeX server pro --- services/web/config/settings.defaults.coffee | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index 2e951e2251..6d923bea61 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -362,5 +362,13 @@ module.exports = # fieldName: 'LDAP User' # placeholder: 'LDAP User ID' # emailAtt: 'mail' + + #templateLinks: [{ + # name : "CV projects", + # url : "/templates/cv" + #},{ + # name : "all projects", + # url: "/templates/all" + #}] From 92836f49fc2e11b13a79b5c044334c8e791e9c52 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Mon, 11 May 2015 10:06:59 +0100 Subject: [PATCH 4/7] avoid unnecessary spell checks on session change --- .../directives/aceEditor/spell-check/SpellCheckManager.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.coffee index 868f33ca10..a210af929f 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.coffee @@ -22,7 +22,8 @@ define [ @closeContextMenu() @editor.on "changeSession", (e) => - @runSpellCheckSoon(200) + if @$scope.spellCheckEnabled and @$scope.spellCheckLanguage and @$scope.spellCheckLanguage != "" + @runSpellCheckSoon(200) e.oldSession?.getDocument().off "change", onChange e.session.getDocument().on "change", onChange From 1bb7ae399641b66714d9bdebc37a9cb4884021d8 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Mon, 11 May 2015 14:12:24 +0100 Subject: [PATCH 5/7] always remove the spinner, even if it is not spinning --- .../web/public/coffee/ide/pdfng/directives/pdfSpinner.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/web/public/coffee/ide/pdfng/directives/pdfSpinner.coffee b/services/web/public/coffee/ide/pdfng/directives/pdfSpinner.coffee index 4f5c96f3ab..da764995ad 100644 --- a/services/web/public/coffee/ide/pdfng/directives/pdfSpinner.coffee +++ b/services/web/public/coffee/ide/pdfng/directives/pdfSpinner.coffee @@ -17,9 +17,9 @@ define [ element.append(spinner) stop: (element) -> - element.find('.fa-spin').removeClass('fa-spin') + element.find('.fa-spinner').removeClass('fa-spin') remove: (element) -> - element.find('.fa-spin').remove() + element.find('.fa-spinner').remove() ] From 7c6ed0ff771266394d1ca989e2694df75584eb8c Mon Sep 17 00:00:00 2001 From: Diego Giovane Pasqualin Date: Mon, 11 May 2015 16:43:29 -0300 Subject: [PATCH 6/7] Update bcrypt to 0.8.3 This new version compiles successfully on nodejs newer than 0.10. --- services/web/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/package.json b/services/web/package.json index 4eccc36c58..4206cd1e6b 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -12,7 +12,7 @@ "dependencies": { "archiver": "0.9.0", "async": "0.6.2", - "bcrypt": "0.7.5", + "bcrypt": "0.8.3", "bufferedstream": "1.6.0", "connect-redis": "1.4.5", "dateformat": "1.0.4-1.2.3", From 3051d7dab6562e42d1663be80e2aa478dcd0b3fe Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Mon, 18 May 2015 09:14:02 +0100 Subject: [PATCH 7/7] modify LockManager test to avoid dependence on timing --- .../coffee/infrastructure/LockManager/getLockTests.coffee | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/web/test/UnitTests/coffee/infrastructure/LockManager/getLockTests.coffee b/services/web/test/UnitTests/coffee/infrastructure/LockManager/getLockTests.coffee index 5441577da6..bb77c4c9dd 100644 --- a/services/web/test/UnitTests/coffee/infrastructure/LockManager/getLockTests.coffee +++ b/services/web/test/UnitTests/coffee/infrastructure/LockManager/getLockTests.coffee @@ -36,9 +36,11 @@ describe 'LockManager - getting the lock', -> describe "when the lock is initially set", -> beforeEach (done) -> startTime = Date.now() + tries = 0 @LockManager.LOCK_TEST_INTERVAL = 5 @LockManager.tryLock = (doc_id, callback = (error, isFree) ->) -> - if Date.now() - startTime < 20 + if (Date.now() - startTime < 20) or (tries < 2) + tries = tries + 1 callback null, false else callback null, true