From 280ae0c3f15c75499a1088a9c8dd6241cfcbdc73 Mon Sep 17 00:00:00 2001 From: Simon Bohlin Date: Wed, 14 Apr 2010 22:26:06 +0200 Subject: Add forgotten static file robots.txt --- etherpad/src/static/robots.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 etherpad/src/static/robots.txt diff --git a/etherpad/src/static/robots.txt b/etherpad/src/static/robots.txt new file mode 100644 index 0000000..4f9540b --- /dev/null +++ b/etherpad/src/static/robots.txt @@ -0,0 +1 @@ +User-agent: * \ No newline at end of file -- cgit v1.2.3 From 3acc9a3470cc06f969c266d8635380fe9eb52380 Mon Sep 17 00:00:00 2001 From: Simon Bohlin Date: Wed, 14 Apr 2010 23:34:01 +0200 Subject: Add clarifying comments --- etherpad/src/main.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/etherpad/src/main.js b/etherpad/src/main.js index 6d99e16..d925638 100644 --- a/etherpad/src/main.js +++ b/etherpad/src/main.js @@ -275,7 +275,7 @@ function checkHost() { return; } - // redirect to etherpad.com + // redirect to main site var newurl = "http://etherpad.com"+request.path; if (request.query) { newurl += "?"+request.query; } response.redirect(newurl); @@ -303,11 +303,13 @@ function checkHTTPS() { http: 80, https: 443 }; + + // Require HTTPS for the following paths: var _requiredHttpsPrefixes = [ - '/ep/admin', // pro and etherpad + '/ep/admin', // pro and main site '/ep/account', // pro only - '/ep/store', // etherpad.com only - '/ep/pro-account' // etherpad.com only + '/ep/store', // main site only + '/ep/pro-account' // main site only ]; var httpsRequired = false; @@ -373,8 +375,9 @@ function handlePath() { [DirMatcher('/ep/pro-help/'), forward(pro_help_control)] ]); - var etherpadDotComDispatcher = new Dispatcher(); - etherpadDotComDispatcher.addLocations([ + // these paths are main site only + var mainsiteDispatcher = new Dispatcher(); + mainsiteDispatcher.addLocations([ ['/', maincontrol.render_main], [DirMatcher('/ep/beta-account/'), forward(pro_beta_control)], [DirMatcher('/ep/pro-signup/'), forward(pro_signup_control)], @@ -392,6 +395,7 @@ function handlePath() { [PrefixMatcher('/ep/'), forward(maincontrol)] ]); + // these paths are pro only var proDispatcher = new Dispatcher(); proDispatcher.addLocations([ ['/', pro_main_control.render_main], @@ -399,7 +403,7 @@ function handlePath() { ]); // dispatching logic: first try common, then dispatch to - // etherpad.com or pro. + // main site or pro. if (commonDispatcher.dispatch()) { return; @@ -412,7 +416,7 @@ function handlePath() { return; } } else { - if (etherpadDotComDispatcher.dispatch()) { + if (mainsiteDispatcher.dispatch()) { return; } } -- cgit v1.2.3 From f8aa31de5a701b7f3f7eb1a0397a97b3787631b3 Mon Sep 17 00:00:00 2001 From: Simon Bohlin Date: Thu, 15 Apr 2010 00:43:04 +0200 Subject: Linkify links --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e8df528..c60e847 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # About Etherpad EtherPad is a web-based realtime collaborative document editor. -EtherPad currently lives at http://etherpad.org +EtherPad currently lives at -For instructions to build and run EtherPad, see: http://doc.etherpad.org/ep/tag/?query=installation +For instructions to build and run EtherPad, see: -- cgit v1.2.3 From cd2bbd0e602244403ca379f9f4d9d15bbde545a7 Mon Sep 17 00:00:00 2001 From: Simon Bohlin Date: Thu, 15 Apr 2010 21:27:35 +0200 Subject: Replacing 'etherpad.com' with 'main site' in some code comments --- etherpad/src/etherpad/legacy_urls.js | 2 +- etherpad/src/static/js/store.js | 2 +- infrastructure/com.etherpad/licensing.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etherpad/src/etherpad/legacy_urls.js b/etherpad/src/etherpad/legacy_urls.js index 458f3b6..d8aa629 100644 --- a/etherpad/src/etherpad/legacy_urls.js +++ b/etherpad/src/etherpad/legacy_urls.js @@ -14,7 +14,7 @@ * limitations under the License. */ -/* legacy URLs only apply to the public etherpad.com site. (not Pro or PNE). */ +/* legacy URLs only apply to the public main site. (not Pro or PNE). */ var _legacyURLs = { '/ep/beta-signup': '/', diff --git a/etherpad/src/static/js/store.js b/etherpad/src/static/js/store.js index 96a6487..5750f42 100644 --- a/etherpad/src/static/js/store.js +++ b/etherpad/src/static/js/store.js @@ -74,7 +74,7 @@ store.eepnetTrial.submit = function() { $('#dlsignup').hide(); $('#processingmsg').fadeIn('fast'); - // first stubmit to etherpad.com... + // first submit... var data = {}; $(".signupData").each(function() { data[$(this).attr("id")] = $(this).val(); diff --git a/infrastructure/com.etherpad/licensing.scala b/infrastructure/com.etherpad/licensing.scala index 9318f78..68019f5 100644 --- a/infrastructure/com.etherpad/licensing.scala +++ b/infrastructure/com.etherpad/licensing.scala @@ -134,7 +134,7 @@ object Licensing { println("Done."); } case "genmainkey" => { - println("Generating key for etherpad.com..."); + println("Generating main key..."); config.values("licenseGeneratorKey") = args(1); val out = new PrintWriter(new FileOutputStream(args(2))); out.print(generateKey("etherpad", "AppJet", -1, 0, -1, 0, 0, 0)) -- cgit v1.2.3