From 7eb7f662b6c79f955acab6a9707ae4e04e427ceb Mon Sep 17 00:00:00 2001 From: Peter Martischka Date: Thu, 8 Apr 2010 14:27:54 +0200 Subject: added localbox.info to the topdomains of the config file, i think it's better for testing --- etherpad/etc/etherpad.localdev-default.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etherpad/etc/etherpad.localdev-default.properties b/etherpad/etc/etherpad.localdev-default.properties index 07dce96..98327fd 100644 --- a/etherpad/etc/etherpad.localdev-default.properties +++ b/etherpad/etc/etherpad.localdev-default.properties @@ -15,7 +15,7 @@ listen = 9000 logDir = ./data/logs modulePath = ./src motdPage = /ep/pad/view/ro.3PfHCD0ApLc/latest?fullScreen=1&slider=0&sidebar=0 -topdomains = localhost +topdomains = localhost,localbox.info transportPrefix = /comet transportUseWildcardSubdomains = true useHttpsUrls = false -- cgit v1.2.3-1-g7c22 From 2379c600538c2a83046571acedc3fc8dedcd8a6e Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Thu, 8 Apr 2010 09:25:39 -0400 Subject: Fix typo in previous conversion from SUPERDOMAINS --- etherpad/src/etherpad/pro/pro_utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etherpad/src/etherpad/pro/pro_utils.js b/etherpad/src/etherpad/pro/pro_utils.js index 2322262..1198b95 100644 --- a/etherpad/src/etherpad/pro/pro_utils.js +++ b/etherpad/src/etherpad/pro/pro_utils.js @@ -49,7 +49,7 @@ function getRequestSuperdomain() { var parts = request.domain.split('.'); while (parts.length > 0) { var domain = parts.join('.'); - if (domainEnabled[domain]) { + if (domainEnabled(domain)) { return domain; } parts.shift(); -- cgit v1.2.3-1-g7c22 From 746609a16cd1c1b8bb725f89fef1869af0875d5e Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Thu, 8 Apr 2010 21:25:39 +0800 Subject: Fix typo in previous conversion from SUPERDOMAINS --- etherpad/src/etherpad/pro/pro_utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etherpad/src/etherpad/pro/pro_utils.js b/etherpad/src/etherpad/pro/pro_utils.js index 2322262..1198b95 100644 --- a/etherpad/src/etherpad/pro/pro_utils.js +++ b/etherpad/src/etherpad/pro/pro_utils.js @@ -49,7 +49,7 @@ function getRequestSuperdomain() { var parts = request.domain.split('.'); while (parts.length > 0) { var domain = parts.join('.'); - if (domainEnabled[domain]) { + if (domainEnabled(domain)) { return domain; } parts.shift(); -- cgit v1.2.3-1-g7c22 From f6d14dabc09bd18a82bb191f8bea8006d12358d0 Mon Sep 17 00:00:00 2001 From: Peter Martischka Date: Thu, 8 Apr 2010 20:27:54 +0800 Subject: added localbox.info to the topdomains of the config file, i think it's better for testing --- etherpad/etc/etherpad.localdev-default.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etherpad/etc/etherpad.localdev-default.properties b/etherpad/etc/etherpad.localdev-default.properties index 07dce96..98327fd 100644 --- a/etherpad/etc/etherpad.localdev-default.properties +++ b/etherpad/etc/etherpad.localdev-default.properties @@ -15,7 +15,7 @@ listen = 9000 logDir = ./data/logs modulePath = ./src motdPage = /ep/pad/view/ro.3PfHCD0ApLc/latest?fullScreen=1&slider=0&sidebar=0 -topdomains = localhost +topdomains = localhost,localbox.info transportPrefix = /comet transportUseWildcardSubdomains = true useHttpsUrls = false -- cgit v1.2.3-1-g7c22 From 913d82d8712287afd80da42d89e94fcdc2a37d85 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Thu, 8 Apr 2010 18:42:18 +0200 Subject: Revert "added localbox.info to the topdomains of the config file, i think it's better for testing" This reverts commit f6d14dabc09bd18a82bb191f8bea8006d12358d0. --- etherpad/etc/etherpad.localdev-default.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etherpad/etc/etherpad.localdev-default.properties b/etherpad/etc/etherpad.localdev-default.properties index 98327fd..07dce96 100644 --- a/etherpad/etc/etherpad.localdev-default.properties +++ b/etherpad/etc/etherpad.localdev-default.properties @@ -15,7 +15,7 @@ listen = 9000 logDir = ./data/logs modulePath = ./src motdPage = /ep/pad/view/ro.3PfHCD0ApLc/latest?fullScreen=1&slider=0&sidebar=0 -topdomains = localhost,localbox.info +topdomains = localhost transportPrefix = /comet transportUseWildcardSubdomains = true useHttpsUrls = false -- cgit v1.2.3-1-g7c22 From 60c183f10a1951b19ca6ac12c3259f4415916c7c Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Thu, 8 Apr 2010 18:42:29 +0200 Subject: Revert "Fix typo in previous conversion from SUPERDOMAINS" This reverts commit 746609a16cd1c1b8bb725f89fef1869af0875d5e. --- etherpad/src/etherpad/pro/pro_utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etherpad/src/etherpad/pro/pro_utils.js b/etherpad/src/etherpad/pro/pro_utils.js index 1198b95..2322262 100644 --- a/etherpad/src/etherpad/pro/pro_utils.js +++ b/etherpad/src/etherpad/pro/pro_utils.js @@ -49,7 +49,7 @@ function getRequestSuperdomain() { var parts = request.domain.split('.'); while (parts.length > 0) { var domain = parts.join('.'); - if (domainEnabled(domain)) { + if (domainEnabled[domain]) { return domain; } parts.shift(); -- cgit v1.2.3-1-g7c22