From a80f1ddcda416c76760acd920a7114382749a71e Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Thu, 2 May 2019 14:57:02 +0000 Subject: [FIX] doc: git guidelines, don't use # for task/opw MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use task-#xxx is wrong since it will refer to an unexising or wrong hash of github. closes odoo/odoo#33121 Signed-off-by: Jérémy Kersten (jke) --- doc/reference/guidelines.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/reference/guidelines.rst b/doc/reference/guidelines.rst index df8f0b5d4c2..d71f62971cd 100644 --- a/doc/reference/guidelines.rst +++ b/doc/reference/guidelines.rst @@ -1102,10 +1102,10 @@ description. Try to follow the preferred structure for your commit messages End the message with references, such as task or bug numbers, PR numbers, and OPW tickets, following the suggested format: - Related to task #taskId - Fixes #12345 (link and close issue on Github) - Closes #7865 (link and close PR on Github) - OPW-112233 + task-123 (related to task) + Fixes #123 (close related issue on Github) + Closes #123 (close related PR on Github) + opw-123 (related to ticket) Tag and module name ------------------- -- cgit v1.2.3 From 8b7658489259fac1ffcd6f0b3d83390ef7e5700b Mon Sep 17 00:00:00 2001 From: Yenthe666 Date: Sun, 14 Apr 2019 08:26:38 +0000 Subject: [FIX] doc: fix typo in qweb documentation closes odoo/odoo#32670 Signed-off-by: Martin Trigaux (mat) --- doc/reference/qweb.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/reference/qweb.rst b/doc/reference/qweb.rst index a806c3fda8f..813866d9d0e 100644 --- a/doc/reference/qweb.rst +++ b/doc/reference/qweb.rst @@ -99,7 +99,7 @@ Extra conditional branching directives ``t-elif`` and ``t-else`` are also available::
-

Happy bithday!

+

Happy birthday!

Welcome master!

Welcome!

-- cgit v1.2.3 From 07224616fa51e894ab1d7d038b210934c6596d97 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 6 May 2019 13:38:37 +0000 Subject: [FIX] doc: avoid duplicated reference The status link was duplicated, making it skipped during rendering Use correct indent closes odoo/odoo#32843 Signed-off-by: Martin Trigaux (mat) --- doc/webservices/upgrade.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/webservices/upgrade.rst b/doc/webservices/upgrade.rst index 92984b4b29d..25310f0e70e 100644 --- a/doc/webservices/upgrade.rst +++ b/doc/webservices/upgrade.rst @@ -423,7 +423,7 @@ should be empty if everything went fine. URL_PARAMS="key=${KEY}&request=${REQUEST_ID}" curl -sS "${PROCESS_URL}?${URL_PARAMS}" -.. _upgrade-api-status-method: +.. _upgrade-api-skip-tests: Asking to skip the tests @@ -433,7 +433,7 @@ This action asks the Upgrade Platform to skip the tests for your request. If you don't want Odoo to test and validate the migration, you can bypass the testing stage and directly get the migrated dump. The ``skip_test`` method ----------------------- +------------------------ .. py:function:: https://upgrade.odoo.com/database/v1/skip_test -- cgit v1.2.3 From 2b28dd89b8b76761108391023a0cc51900c0a816 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 6 May 2019 12:47:18 +0000 Subject: [FIX] doc: Sphinx 2.0 compatibility * order of parameters to translator swapped * context['meta'] always set, defaulting to None if the document has no metadata * [3.0 prep] modifying script_files deprecated, use add_javascript / add_js_file * remove deprecated call to l_ (which was useless anyway as the documentation is not translated) Fixes #33107 closes odoo/odoo#33187 Signed-off-by: Xavier Morel (xmo) --- doc/_extensions/exercise_admonition.py | 4 ++-- doc/_extensions/odoo_ext/__init__.py | 8 +++++++- doc/_extensions/odoo_ext/layout.html | 7 ------- doc/_extensions/odoo_ext/translator.py | 9 +++++++-- 4 files changed, 16 insertions(+), 12 deletions(-) (limited to 'doc') diff --git a/doc/_extensions/exercise_admonition.py b/doc/_extensions/exercise_admonition.py index 4256ca73b78..07cb11a5389 100644 --- a/doc/_extensions/exercise_admonition.py +++ b/doc/_extensions/exercise_admonition.py @@ -20,5 +20,5 @@ class exercise(nodes.Admonition, nodes.Element): pass class Exercise(admonitions.BaseAdmonition): node_class = exercise -from sphinx.locale import admonitionlabels, l_ -admonitionlabels['exercise'] = l_('Exercise') +from sphinx.locale import admonitionlabels +admonitionlabels['exercise'] = 'Exercise' diff --git a/doc/_extensions/odoo_ext/__init__.py b/doc/_extensions/odoo_ext/__init__.py index 3cca5f7c435..16b4a5326f7 100644 --- a/doc/_extensions/odoo_ext/__init__.py +++ b/doc/_extensions/odoo_ext/__init__.py @@ -21,6 +21,10 @@ def setup(app): location="odoo extension") app.config.html_translator_class = 'odoo_ext.translator.BootstrapTranslator' + add_js_file = getattr(app, 'add_js_file', None) or app.add_javascript + for f in ['jquery.min.js', 'bootstrap.js', 'doc.js', 'jquery.noconflict.js']: + add_js_file(f) + switcher.setup(app) app.add_config_value('odoo_cover_default', None, 'env') app.add_config_value('odoo_cover_external', {}, 'env') @@ -28,7 +32,9 @@ def setup(app): app.connect('html-page-context', update_meta) def update_meta(app, pagename, templatename, context, doctree): - meta = context.setdefault('meta', {}) + meta = context.get('meta') + if meta is None: + meta = context['meta'] = {} meta.setdefault('banner', app.config.odoo_cover_default) def navbarify(node, navbar=None): diff --git a/doc/_extensions/odoo_ext/layout.html b/doc/_extensions/odoo_ext/layout.html index 47efef8dc84..9f25d7b4c55 100644 --- a/doc/_extensions/odoo_ext/layout.html +++ b/doc/_extensions/odoo_ext/layout.html @@ -1,12 +1,5 @@ {% extends "basic/layout.html" %} -{% set script_files = script_files + [ -'_static/jquery.min.js', -'_static/bootstrap.js', -'_static/doc.js', -'_static/jquery.noconflict.js', -] %} - {% set classes = [] %} {% if pagename == master_doc %} {% set classes = classes + ['index'] %} diff --git a/doc/_extensions/odoo_ext/translator.py b/doc/_extensions/odoo_ext/translator.py index 491f02a2ad3..0914b0e319e 100644 --- a/doc/_extensions/odoo_ext/translator.py +++ b/doc/_extensions/odoo_ext/translator.py @@ -10,7 +10,7 @@ except ImportError: from urllib import url2pathname # pylint: disable=deprecated-module from docutils import nodes -from sphinx import addnodes, util +from sphinx import addnodes, util, builders from sphinx.locale import admonitionlabels from odoo.tools import pycompat @@ -43,7 +43,12 @@ class BootstrapTranslator(nodes.NodeVisitor, object): '' ] - def __init__(self, builder, document): + def __init__(self, document, builder): + # order of parameter swapped between Sphinx 1.x and 2.x, check if + # we're running 1.x and swap back + if not isinstance(builder, builders.Builder): + builder, document = document, builder + super(BootstrapTranslator, self).__init__(document) self.builder = builder self.body = [] -- cgit v1.2.3 From a48318cb33e27e095a0629544e21e4d1ce6b2447 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Mon, 6 May 2019 17:16:07 +0000 Subject: [CLA] update Tecnativa signature Remove Tecnativa's old employees, add new ones closes odoo/odoo#33197 Signed-off-by: Martin Trigaux (mat) --- doc/cla/corporate/tecnativa.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/cla/corporate/tecnativa.md b/doc/cla/corporate/tecnativa.md index 9f3601d16a0..5249fe08571 100644 --- a/doc/cla/corporate/tecnativa.md +++ b/doc/cla/corporate/tecnativa.md @@ -17,7 +17,7 @@ Rafael Blasco rafael.blasco@tecnativa.com https://github.com/rafaelbn Sergio Teruel sergio.teruel@tecnativa.com https://github.com/sergio-teruel Carlos Dauden carlos.dauden@tecnativa.com https://github.com/carlosdauden Jairo Llopis jairo.llopis@tecnativa.com https://github.com/yajo -Vicent Cubells vicent.cubells@tecnativa.com https://github.com/cubells -Luis Montalba luis.montalba@tecnativa.com https://github.com/luismontalba David Vidal david.vidal@tecnativa.com https://github.com/chienandalu -Cristina Martín cristina.martin@tecnativa.com https://github.com/cristinamartinrod +Cristina Martín cristina.martin@tecnativa.com https://github.com/cristinamartinrod (up to 2019-04-30) +Ernesto Tejeda ernesto.tejeda@tecnativa.com https://github.com/ernestotejeda +Alexandre Díaz alexandre.diaz@tecnativa.com https://github.com/Tardo -- cgit v1.2.3