Merge branch 'etherpad-lite' into davstorage-ajaxplorer

software/etherpad-lite/common.cfg

@@ -45,8 +45,8 @@ eggs = ${instance-recipe:egg}
 [etherpad-lite-repository]
 recipe = slapos.recipe.build:gitclone
 repository = http://github.com/ether/etherpad-lite.git
-branch = develop
 git-executable = ${git:location}/bin/git
+revision = cb3ab51ee14aefb2f9e71bdd9907c0a83c3aebb3
 
 [template]
 # Default template for the instance.
@@ -59,7 +59,7 @@ mode = 0644
 [instance-etherpad-lite]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-etherpad-lite.cfg
-md5sum = fd7249be8988155110234c7bb877abb9
+md5sum = 64ae9271f20e432ddc0516fe1bb17076
 output = ${buildout:directory}/template-etherpad-lite.cfg
 mode = 0644
 
@@ -68,7 +68,7 @@ recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/templates/${:filename}
 mode = 0644
 filename = settings.json.in
-md5sum = 19ab39e6b3256c82fd54ce074488b136
+md5sum = f9baee09003676fc1141f9bf4481f6a3
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [template-run-script]

software/etherpad-lite/instance-etherpad-lite.cfg

@@ -2,7 +2,6 @@
 parts =
   etherpad-lite
   publish-connection-informations
-#  frontend-etherpad
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -70,10 +69,3 @@ slave = true
 config = url
 config-url = http://$${etherpad-conf-generation:ip}:$${etherpad-conf-generation:port}
 return = site_url
-
-[frontend-etherpad]
-recipe = slapos.cookbook:check_url_available
-path = $${basedirectory:promises}/frontend-etherpad
-url = $${request-frontend:connection-site_url}
-dash_path = ${dash:location}/bin/dash
-curl_path = ${curl:location}/bin/curl
\ No newline at end of file

software/etherpad-lite/software.cfg

@@ -14,14 +14,15 @@ develop =
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/slapos.git
-branch = etherpad-lite
 git-executable = ${git:location}/bin/git
+revision = 45243101321daeecaf755b9788b11259dd6bdfff
 
 [slapos.toolbox-repository]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/slapos.toolbox.git
 branch = master
 git-executable = ${git:location}/bin/git
+revision = fc91b7f26c2fd69cedafcef9de3c8b22a50f8976
 
 [check-recipe]
 recipe = plone.recipe.command
@@ -29,4 +30,64 @@ stop-on-error = true
 update-command = ${:command}
 command =
   grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
-  grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
\ No newline at end of file
+  grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
+  
+[versions]
+Jinja2 = 2.7
+MarkupSafe = 0.18
+Werkzeug = 0.9.3
+buildout-versions = 1.7
+itsdangerous = 0.22
+meld3 = 0.6.10
+plone.recipe.command = 1.1
+slapos.recipe.build = 0.11.6
+slapos.recipe.cmmi = 0.2
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.4.3
+# Required by: 
+# slapos.core==0.35.1
+Flask = 0.10.1
+# Required by:
+# slapos.cookbook==0.78.2.dev
+inotifyx = 0.2.0-1
+# Required by:
+# slapos.cookbook==0.78.2.dev
+lock-file = 2.0
+# Required by:
+# slapos.cookbook==0.78.2.dev
+# slapos.core==0.35.1
+# xml-marshaller==0.9.7
+lxml = 3.2.3
+# Required by:
+# slapos.cookbook==0.78.2.dev
+netaddr = 0.7.10
+# Required by:
+# slapos.core==0.35.1
+netifaces = 0.8-1
+# Required by:
+# slapos.core==0.35.1
+pyflakes = 0.7.3
+# Required by:
+# slapos.cookbook==0.78.2.dev
+pytz = 2013b
+# Required by:
+# slapos.cookbook==0.78.2.dev
+# slapos.core==0.35.1
+# zc.buildout==1.6.0-dev-SlapOS-010
+# zc.recipe.egg==1.3.2
+setuptools = 0.9.8
+# Required by:
+# slapos.cookbook==0.78.2.dev
+slapos.core = 0.35.1
+# Required by:
+# slapos.core==0.35.1
+supervisor = 3.0
+# Required by:
+# slapos.core==0.35.1
+unittest2 = 0.5.1
+# Required by:
+# slapos.cookbook==0.78.2.dev
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.core==0.35.1
+zope.interface = 4.0.5
\ No newline at end of file

software/etherpad-lite/templates/settings.json.in

@@ -52,7 +52,7 @@
   */
   
   //the default text of a pad
-  "defaultPadText" : "Welcome to Etherpad!\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\nGet involved with Etherpad at http:\/\/etherpad.org\n",
+  "defaultPadText" : "Bienvenue sur Etherpad!\n\nLe texte que vous écrivez est synchronisez en ce moment même, pour que tout le monde puisse voir la page avec le même texte. Cela vous permet de collaborer sur des documents sans aucun problème!\n",
   
   /* Users must have a session to access pads. This effectively allows only group pads to be accessed. */
   "requireSession" : false,