diff --git a/.travis.yml b/.travis.yml index 92079df..d607e8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,9 @@ language: python sudo: false -cache: - apt: true - directories: - - $HOME/.cache/pip +cache: pip python: - - "2.7" + - "3.5" addons: postgresql: "9.6" @@ -16,10 +13,6 @@ addons: # https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json packages: - expect-dev # provides unbuffer utility - - python-lxml # because pip installation is slow - - python-simplejson - - python-serial - - python-yaml # Search your packages here: # https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise # For wkhtmltopdf, see the env section below @@ -32,7 +25,7 @@ addons: env: global: - - VERSION="10.0" TESTS="0" LINT_CHECK="0" TRANSIFEX="0" + - VERSION="12.0" TESTS="0" LINT_CHECK="0" MAKEPOT="0" # Set this variable to some version existing as linux-generic build on # https://github.com/wkhtmltopdf/wkhtmltopdf/releases # if you need to install wkhtmltopdf @@ -47,29 +40,11 @@ env: # Use the above line to install dependencies that are required for website repos: # * SASS & Bootstrap-SASS # * Compass - - TRANSIFEX_USER='transbot@odoo-community.org' - # This line contains the encrypted transifex password - # To encrypt transifex password, install travis ruby utils with: - # $ gem install travis --user-install - # and use: - # $ travis encrypt TRANSIFEX_PASSWORD=your-password -r owner/project - # Secure list for current OCA projects is in https://github.com/OCA/maintainer-quality-tools/issues/194 - - secure: yHr0UC45NBliMtTpZCYhNc2BdRgiHtXSQKBejHHWw2MXvOogZ+JqdwuqCPbHeP3NIKJYruUpYzXNdqCGP4Vll4xueSsA8CzeFp+gdJqxK6Z+gZiUZJ4W+vqckt2Q6YfdfqIGV8csNEUITCdidarGFSI/3EmDV1xl7Kkq8IMaIhUgd29MQ/R4CzCVcXfdZiN/mXZG7Ta1mLilcZwO7wlVed5IDsOJzXXglkQIYUbp73IraZsp9euXnO7pu+OQz19FuAJWOcPFV7Mgg0cPq+6fU+7lqyAdoj6d5NFrUpjKYbuT88L8wFrto4k0AHXLtL7cl+KNYahXNtnIvfnKNIwJ2lDN61I024mx4f8TQ7PNvSfv+nEdy0KVVk7rlw/JgudWEZFNIjlLYSGn6xdQVgiTrY53GEr9ASd4e/ELdfrNmHUw2JdOM1sg7GA4uwjAoNsF2IMfuvQJyhJRqEXowt9PKEL0ww4uVpxrwZLNWfV+oVvw3iV+QtV9dO18/LMBOXRj/DnfjZ3HVLim4WqjbpsgP5biiCRxKOqeBv+8D3jRcDTK56G8KX9+HnJAhLct/r+DragLufE2yoMCnMHH9AbhyI2omOVM7RoQ9+7PJhsR9ipsifGD+5Xi14sRxOCLPy5yV27FuzwwLkiBowkqeuUaS57DqrRlBjIJK8+Ea53xr14= - # Use the following lines if you need to manually change the transifex project slug or/and the transifex organization. - # The default project slug is owner-repo_name-version (with dash in the version string). - # The default organization is the owner of the repo. - # The default fill up resources (TM) is True. - # The default team is 23907. https://www.transifex.com/organization/oca/team/23907/ - # - TRANSIFEX_PROJECT_SLUG= - # - TRANSIFEX_ORGANIZATION= - # - TRANSIFEX_FILL_UP_RESOURCES= - # - TRANSIFEX_TEAM= matrix: - LINT_CHECK="1" - - TRANSIFEX="1" - TESTS="1" ODOO_REPO="OCA/OCB" - - TESTS="1" ODOO_REPO="odoo/odoo" + - TESTS="1" ODOO_REPO="odoo/odoo" MAKEPOT="1" # either use the two lines above or the two below. Don't change the default if # it's not necessary (it is only necessary if modules in your repository can't # be installed in the same database. And you get a huge speed penalty in your @@ -77,9 +52,6 @@ env: # - TESTS="1.0" ODOO_REPO="OCA/OCB" UNIT_TEST="1" # - TESTS="1.0" ODOO_REPO="odoo/odoo" UNIT_TEST="1" -virtualenv: - system_site_packages: true - install: - git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH} diff --git a/privacy/README.rst b/privacy/README.rst index e5bc1a8..6f02df1 100644 --- a/privacy/README.rst +++ b/privacy/README.rst @@ -14,16 +14,16 @@ Data Privacy and Protection :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdata--protection-lightgray.png?logo=github - :target: https://github.com/OCA/data-protection/tree/11.0/privacy + :target: https://github.com/OCA/data-protection/tree/12.0/privacy :alt: OCA/data-protection .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png :target: https://translation.odoo-community.org/projects/data-protection-11-0/data-protection-11-0-privacy :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/263/11.0 + :target: https://runbot.odoo-community.org/runbot/263/12.0 :alt: Try me on Runbot -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This application provides data protection and privacy feature, to comply with regulations such as GDPR. @@ -81,6 +81,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/data-protection `_ project on GitHub. +This module is part of the `OCA/data-protection `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/privacy/__manifest__.py b/privacy/__manifest__.py index e2b86e5..b11d792 100644 --- a/privacy/__manifest__.py +++ b/privacy/__manifest__.py @@ -2,7 +2,7 @@ # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html { 'name': 'Data Privacy and Protection', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'Data Protection', 'summary': 'Provides data privacy and protection features ' 'to comply to regulations, such as GDPR.', diff --git a/privacy/readme/CONTRIBUTORS.rst b/privacy/readme/CONTRIBUTORS.rst index 4c0548e..a51b166 100644 --- a/privacy/readme/CONTRIBUTORS.rst +++ b/privacy/readme/CONTRIBUTORS.rst @@ -1,2 +1,3 @@ * Miquel Raïch * Daniel Reis +* Nicolas JEUDY diff --git a/privacy/static/description/index.html b/privacy/static/description/index.html index 92d0c3b..a0cfde6 100644 --- a/privacy/static/description/index.html +++ b/privacy/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/data-protection Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/data-protection Translate me on Weblate Try me on Runbot

This application provides data protection and privacy feature, to comply with regulations such as GDPR.

Table of contents

@@ -423,7 +423,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/data-protection project on GitHub.

+

This module is part of the OCA/data-protection project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/privacy/views/privacy_activity_view.xml b/privacy/views/privacy_activity_view.xml index 50da021..0c38697 100644 --- a/privacy/views/privacy_activity_view.xml +++ b/privacy/views/privacy_activity_view.xml @@ -33,22 +33,37 @@ - - - - + + + + + + + + + + + + + + + + + + +