[MIG] website_cookie_notice: Migrated to 11.0 by njeudy · Pull Request #408 · OCA/website

njeudy · 2018-01-12T21:19:17Z

Depends on:

website_legal_page: 11.0 mig website legal page #403

njeudy · 2018-01-12T21:22:07Z

Will only migratie cookie_notice in this because legal page already migrate In #403

pedrobaeza · 2018-01-12T21:48:40Z

Please check Travis

pedrobaeza · 2018-01-12T21:49:33Z

OK, I see it's because dependencies. Adding on the main comment.

njeudy · 2018-01-13T13:49:30Z

Yes that's why I migrated both in same merge request :) but someone did it .. I will try to help review #403 :)

simahawk · 2018-01-23T08:18:40Z

+{
+    'name': 'Cookie notice',
+    'summary': 'Show cookie notice according to cookie law',
+    'version': '10.0.1.0.0',


simahawk · 2018-01-23T08:18:49Z

+              "Tecnativa, "
+              "Nicolas JEUDY, "
+              "Odoo Community Association (OCA)",
+    'website': 'http://www.agilebg.com',


https://github.com/OCA/website

simahawk · 2018-01-23T08:19:02Z

+        'templates/website.xml',
+    ],
+    'installable': True,
+    'auto_install': False,


you can drop this key

simahawk · 2018-01-23T08:19:20Z

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-


remove coding headers from *.py

simahawk · 2018-01-23T08:22:06Z

for the build: you can add oca_dependencies.txt with the branch where you've migrated ws legal page.

oca-clabot · 2018-01-23T15:12:07Z

Hey @njeudy, thank you for your Pull Request.

It looks like some users haven't signed our Contributor License Agreement, yet.
You can read and sign our full Contributor License Agreement here: http://odoo-community.org/page/website.cla
Here is a list of the users:

Nemry Jonathan (no github login found)
Lorenzo Battistini (no github login found)

Appreciation of efforts,
OCA CLAbot

njeudy · 2018-01-23T15:32:46Z

@simahawk I try to add oca_dependency.txt but:

fatal: Remote branch refs/pull/408/head not found in upstream origin
Traceback (most recent call last):
File "/home/travis/maintainer-quality-tools/travis/clone_oca_dependencies", line 125, in
run(deps_checkout_dir, build_dir)
File "/home/travis/maintainer-quality-tools/travis/clone_oca_dependencies", line 99, in run
url, branch)
File "/home/travis/maintainer-quality-tools/travis/clone_oca_dependencies", line 67, in git_checkout
subprocess.check_call(command)
File "/opt/python/3.5.4/lib/python3.5/subprocess.py", line 271, in check_call
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['git', 'clone', '-q', 'https://github.com/OCA/website', '-b', 'refs/pull/408/head', '--single-branch', '--depth=1', '/home/travis/dependencies/website']' returned non-zero exit status 128

Think I should wait for legal_page to be merged.

simahawk · 2018-01-23T18:21:43Z

@njeudy the file is wrong :) you should provide the URL to your fork an put your branch, see https://github.com/OCA/maintainer-quality-tools/blob/master/sample_files/oca_dependencies.txt
Also, it's better to put temporary oca_dependencies.txt changes in a separated commit, like "DROP_ME_BEFORE_MERGE include pending PR" so that it's easier to spot it before merge and to roll it back. 😉

njeudy · 2018-01-23T20:14:48Z

@simahawk Ok thanks

simahawk · 2018-01-24T09:26:34Z

@eLBati @yajo ping :)

yajo · 2018-01-24T10:34:39Z

I'm waiting for #403

pedrobaeza · 2018-01-26T11:31:42Z

Please rebase now that the dependency is merged.

…nd reduces all JS and load at the end of body tag

OCA Transbot updated translations from Transifex OCA Transbot updated translations from Transifex OCA Transbot updated translations from Transifex OCA Transbot updated translations from Transifex OCA Transbot updated translations from Transifex OCA Transbot updated translations from Transifex OCA Transbot updated translations from Transifex OCA Transbot updated translations from Transifex OCA Transbot updated translations from Transifex

This will allow automatic translations and easier maintenance. Many code has been removed to simplify eveything. Show cookie notice only if a request is bound. Warn about breaking update in 2.0.0. Warn about losing customizations. Make easier to reuse. - Move important parts of templates to another templates. - Add an ID to the message: `website_cookie_notice`.

Cookie message translation Cookie message translation

Conflicts: website_cookie_notice/__openerp__.py IMP using JSON and avoiding cache breaking rendered pages Conflicts: website_cookie_notice/views/website.xml FIX Duplicate key 'version' in dictionary and copyright headers FIX module version FIX author Tecnativa FIX website_cookie_notice: make installable

…entions

Before this patch, the *OK* button was overflowing the horizontal width a little bit in English, but much more in languages where *OK* is a longer word. Now the button goes below the message in phones, avoiding that problem.

- Privacy policy URL changed. - Contributors data updated. - Move templates to templates folder, as per guidelines.

njeudy · 2018-02-09T14:37:10Z

@simahawk @yajo can it be merged ?

pedrobaeza · 2018-02-09T14:38:06Z

Yes, merging

njeudy force-pushed the 11-mig-website_cookie_notice branch from 90c0d0e to 294b7e3 Compare January 12, 2018 21:25

njeudy changed the title ~~[MIG] website_cookie_notice, website_legal_page: Migrated to 11.0~~ [MIG] website_cookie_notice: Migrated to 11.0 Jan 12, 2018

njeudy mentioned this pull request Jan 12, 2018

Migration to version 11.0 #388

Closed

38 tasks

pedrobaeza added this to the 11.0 milestone Jan 12, 2018

pedrobaeza added the needs review label Jan 12, 2018

pedrobaeza added work in progress and removed needs review labels Jan 12, 2018

simahawk requested changes Jan 23, 2018

View reviewed changes

njeudy force-pushed the 11-mig-website_cookie_notice branch from 294b7e3 to 45cc840 Compare January 23, 2018 15:12

njeudy force-pushed the 11-mig-website_cookie_notice branch from 45cc840 to 75737b8 Compare January 23, 2018 15:16

njeudy force-pushed the 11-mig-website_cookie_notice branch 3 times, most recently from 43b209f to fefcb7c Compare January 23, 2018 20:45

simahawk approved these changes Jan 24, 2018

View reviewed changes

eLBati added 4 commits January 26, 2018 12:38

[ADD] website_cookie_notice draft module

74d7a51

[ADD] handling notice configuration by company settings

85e6ba3

[IMP] icon and description

87443f8

[ADD] configurable button strings

cdaf6d4

eLBati and others added 24 commits January 26, 2018 12:38

[FIX] Bug Tracker

cf58b21

[FIX] avoid cookie banner to overlap with menu

87c85ca

Spanish translation

5d1fa36

[FIX] inherit from website.assets_frontend, because then Odoo joins a…

ee36c6a

…nd reduces all JS and load at the end of body tag

[IMP] default translations and policy URL

4375565

Complete spanish translation

961edaf

OCA Transbot updated translations from Transifex

e0c52cd

[UPD] prefix versions with 8.0

c807013

[MIG] Make modules uninstallable

7bc731c

[FIX] remove en.po that was erroneously created by transbot

34d69ab

[MIG] Rename manifest files

a6f2783

Author

a1f1788

Spanish translation

f9d403a

Cookie message translation Cookie message translation

remove en.po that was erroneously created by transbot

35c6629

website_cookie_notice Update headers and README according to OCA conv…

0983940

…entions

[MIG] website_cookie_notice: Migrated to 10.0

161f794

[FIX][website_cookie_notice] Fix mobile layout

2147b0f

Before this patch, the *OK* button was overflowing the horizontal width a little bit in English, but much more in languages where *OK* is a longer word. Now the button goes below the message in phones, avoiding that problem.

[ADD] setup and rename __openerp__ into manifest

561bd64

[MIG][website_cookie_notice] Adapt to OCA#353 and polish

0985e9c

- Privacy policy URL changed. - Contributors data updated. - Move templates to templates folder, as per guidelines.

OCA Transbot updated translations from Transifex

f646fed

[MIG] website_cookie_notice: Migrated to 11.0

d080844

njeudy force-pushed the 11-mig-website_cookie_notice branch from fefcb7c to d080844 Compare January 26, 2018 11:40

yajo approved these changes Jan 26, 2018

View reviewed changes

pedrobaeza merged commit 21f8748 into OCA:11.0 Feb 9, 2018

Uh oh!

Conversation

njeudy commented Jan 12, 2018 • edited by pedrobaeza Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

njeudy commented Jan 12, 2018

Uh oh!

pedrobaeza commented Jan 12, 2018

Uh oh!

pedrobaeza commented Jan 12, 2018

Uh oh!

njeudy commented Jan 13, 2018

Uh oh!

simahawk Jan 23, 2018

Choose a reason for hiding this comment

Uh oh!

simahawk Jan 23, 2018

Choose a reason for hiding this comment

Uh oh!

simahawk Jan 23, 2018

Choose a reason for hiding this comment

Uh oh!

simahawk Jan 23, 2018

Choose a reason for hiding this comment

Uh oh!

simahawk commented Jan 23, 2018

Uh oh!

oca-clabot commented Jan 23, 2018

Uh oh!

njeudy commented Jan 23, 2018

Uh oh!

simahawk commented Jan 23, 2018

Uh oh!

njeudy commented Jan 23, 2018

Uh oh!

simahawk commented Jan 24, 2018

Uh oh!

yajo commented Jan 24, 2018

Uh oh!

pedrobaeza commented Jan 26, 2018

Uh oh!

njeudy commented Feb 9, 2018

Uh oh!

pedrobaeza commented Feb 9, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

njeudy commented Jan 12, 2018 •

edited by pedrobaeza

Loading