[MERGE] forward port branch saas-10 up to bc1a0a3

6 files changed, 57 insertions, 2 deletions

diff --git a/doc/_extensions/odoo/layout.html b/doc/_extensions/odoo/layout.html
index a7ed5078040..000019b32cf 100644
--- a/doc/_extensions/odoo/layout.html
+++ b/doc/_extensions/odoo/layout.html
@@ -230,7 +230,7 @@
       <main class="container-fluid {{ ' '.join(classes) }}">
         {% if pagename != master_doc %}
         <div class="row">
-          {% if 'has-toc' not in meta %}
+          {% if 'has-toc' not in meta and not (pagename in toc) %}
           <aside>
             <div class="navbar-aside text-center">
               {{ toc }}
@@ -242,7 +242,7 @@
             </div>
           </aside>
           {% endif %}
-          <article class="doc-body {% if 'has-toc' in meta %}doc-toc{% endif %}">
+          <article class="doc-body {% if 'has-toc' in meta %}doc-toc{% endif %}{% if pagename in toc%}index-category{% endif %}">
             {% endif %}
             {% block body %} {% endblock %}
           {% if pagename != master_doc %}</article>
diff --git a/doc/_extensions/odoo/static/style.css b/doc/_extensions/odoo/static/style.css
index 1d48dea23b0..d521ff30677 100644
--- a/doc/_extensions/odoo/static/style.css
+++ b/doc/_extensions/odoo/static/style.css
@@ -12353,6 +12353,13 @@ article.doc-body section.doc-content:first-of-type > p:first-child {
     font-size: 22.5px;
   }
 }
+article.doc-body.index-category {
+  min-height: 300px;
+  min-height: 30vh;
+}
+article.doc-body.index-category li.toctree-l1 {
+  padding: 5px 0;
+}
 .content-switcher {
   margin-top: 1.5em;
 }
diff --git a/doc/_extensions/odoo/static/style.less b/doc/_extensions/odoo/static/style.less
index 44811836068..5fd9fe17804 100644
--- a/doc/_extensions/odoo/static/style.less
+++ b/doc/_extensions/odoo/static/style.less
@@ -742,6 +742,15 @@ article.doc-body {
       .lead;
     }
   }
+
+  &.index-category {
+    min-height: 300px;
+    min-height: 30vh;
+
+    li.toctree-l1 {
+      padding: 5px 0;
+    }
+  }
 }
 
 .content-switcher {
diff --git a/doc/cla/corporate/BeOpen.md b/doc/cla/corporate/BeOpen.md
new file mode 100644
index 00000000000..ae1486a2db6
--- /dev/null
+++ b/doc/cla/corporate/BeOpen.md
@@ -0,0 +1,15 @@
+Belgium, 2016-08-09
+
+BeOpen agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Kim Huysmans kim.huysmans@rhea.be https://github.com/huysmki
+
+List of contributors:
+
+Kim Huysmans kim.huysmans@rhea.be https://github.com/huysmki
diff --git a/doc/cla/corporate/iraiser.md b/doc/cla/corporate/iraiser.md
new file mode 100644
index 00000000000..72e852aedaf
--- /dev/null
+++ b/doc/cla/corporate/iraiser.md
@@ -0,0 +1,17 @@
+France, 2016-05-18
+
+iRaiser agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Bruno PLANCHER bplancher@iraiser.eu https://github.com/bplancher
+
+List of contributors:
+
+Bruno PLANCHER bplancher@iraiser.eu https://github.com/bplancher
+Damien NICOLAS dnicolas@iraiser.eu https://github.com/gordonzola
+
diff --git a/doc/setup/deploy.rst b/doc/setup/deploy.rst
index 94d9fcbd28a..3209154c41b 100644
--- a/doc/setup/deploy.rst
+++ b/doc/setup/deploy.rst
@@ -231,6 +231,12 @@ just about any SSL termination proxy, but requires the following setup:
 * your SSL termination proxy should also automatically redirect non-secure
 connections to the secure port
 
+.. warning::
+
+  In case you are using the Point of Sale module in combinaison with a `POSBox`_,
+  you must disable the HTTPS configuration for the route ``/pos/web`` to avoid
+  mix-content errors.
+
 Configuration sample
 --------------------
 
@@ -434,3 +440,4 @@ of the supported browsers by Odoo version is the following:
 .. _use an SSH tunnel:
     http://www.postgresql.org/docs/9.3/static/ssh-tunnels.html
 .. _WSGI: http://wsgi.readthedocs.org/
+.. _POSBox: https://www.odoo.com/page/point-of-sale-hardware#part_2
\ No newline at end of file