Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop

bin/buildForWindows.sh

@@ -41,7 +41,7 @@ echo "do a normal unix install first..."
 bin/installDeps.sh || exit 1
 
 echo "copy the windows settings template..."
-cp settings.json.template_windows settings.json
+cp settings.json.template settings.json
 
 echo "resolve symbolic links..."
 cp -rL node_modules node_modules_resolved

bin/installOnWindows.bat

@@ -32,7 +32,7 @@ del /S var\minified*
 
 echo _
 echo Setting up settings.json...
-IF NOT EXIST settings.json copy settings.json.template_windows settings.json
+IF NOT EXIST settings.json copy settings.json.template settings.json
 
 echo _
 echo Installed Etherpad-lite!

settings.json.template_windows

@@ -1,48 +0,0 @@
-/*
-  This file must be valid JSON. But comments are allowed
-
-  Please edit settings.json, not settings.json.template
-*/
-{
-  //Ip and port which etherpad should bind at
-  "ip": "0.0.0.0",
-  "port" : 9001,
-  
-  //The Type of the database. You can choose between sqlite and mysql
-  "dbType" : "dirty",
-  //the database specific settings
-  "dbSettings" : {
-                   "filename" : "var/dirty.db"
-                 },
-                 
-  /* An Example of MySQL Configuration
-   "dbType" : "mysql",
-   "dbSettings" : {
-                    "user"    : "root", 
-                    "host"    : "localhost", 
-                    "password": "", 
-                    "database": "store"
-                  },
-  */
-  
-  //the default text of a pad
-  "defaultPadText" : "Welcome to Etherpad Lite!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nEtherpad Lite on Github: http:\/\/j.mp/ep-lite\n",
-  
-  /* Users must have a session to access pads. This effectively allows only group pads to be accessed. */
-  "requireSession" : false,
-
-  /* Users may edit pads but not create new ones. Pad creation is only via the API. This applies both to group pads and regular pads. */
-  "editOnly" : false,
-  
-  /* if true, all css & js will be minified before sending to the client. This will improve the loading performance massivly, 
-     but makes it impossible to debug the javascript/css */
-  "minify" : false,
-  
-  /* This is the path to the Abiword executable. Setting it to null, disables abiword.
-     Abiword is needed to enable the import/export of pads*/  
-  "abiword" : null,
-
-  /* cache 6 hours = 1000*60*60*6 */
-  "maxAge": 21600000
-
-}

src/static/js/admin/plugins.js

@@ -126,6 +126,7 @@ $(document).ready(function () {
   socket.on('installed-results', function (data) {
     $("#installed-plugins *").remove();
     for (plugin_name in data.results) {
+      if (plugin_name == "ep_etherpad-lite") continue; // Hack...
       var plugin = data.results[plugin_name];
       var row = $("#installed-plugin-template").clone();