porting website_cookie_notice to 9.0 by eLBati · Pull Request #195 · OCA/website

eLBati · 2016-04-23T10:43:39Z

depends on Upgrade website_legal_page to 9.0 #194

pedrobaeza · 2016-04-23T10:46:59Z

Can we close #106?

eLBati · 2016-04-23T10:50:40Z

@pedrobaeza closed while you were writing 😄

pedrobaeza · 2016-04-23T10:52:56Z

Please don't lose commit history. Use this method: https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-9.0#if-the-module-already-exists-in-the-90-branch-but-it-doesnt-contain-all-the-commit-history-or-youre-not-sure-if-it-have-it

coveralls · 2016-04-23T10:55:14Z

Coverage remained the same at 60.0% when pulling 6c982f0 on eLBati:port_cookie_notice_9_2 into 6088e65 on OCA:9.0.

eLBati · 2016-04-23T10:57:11Z

Thanks @pedrobaeza

Do you know why travis is green even if

module website_cookie_notice: Unmet dependencies: website_legal_page

?

elicoidal · 2016-04-23T11:30:38Z

@@ -18,4 +18,3 @@
 #


Please simplify the headers

@elicoidal done

coveralls · 2016-05-04T06:38:53Z

Coverage remained the same at 60.0% when pulling 9da7ead on eLBati:port_cookie_notice_9_2 into 6088e65 on OCA:9.0.

pedrobaeza · 2016-09-12T23:56:20Z

Can you please rebase and attend last comments for merging it?

Thanks.

eLBati · 2016-10-03T09:41:51Z

@pedrobaeza I rebased and improved some metadata (including author changed to Tecnativa, is it ok?)

@lasley I left the CSS as it was. Let me know if you see problems or if you have changes to suggest.

Thanks

sebalix

Tested

lasley

LGTM thanks @eLBati

lasley

Just noticed the commit history is still lost. This is 👎 for me until the commit history is properly maintained via rebase

This will allow automatic translations and easier maintenance. Many code has been removed to simplify eveything.

- Move important parts of templates to another templates. - Add an ID to the message: `website_cookie_notice`.

Conflicts: website_cookie_notice/__openerp__.py

Conflicts: website_cookie_notice/views/website.xml

eLBati · 2016-10-10T17:14:46Z

@lasley thanks, I rebuilt the branch including 8.0 commits

lasley · 2016-10-10T17:20:42Z

Hooray thanks @eLBati !

If you could go ahead and squash your commits for me, I'll merge 😄 (probably should have mentioned that in my original comment, sorry about that)

and copyright headers FIX module version FIX author Tecnativa

Update headers and README according to OCA conventions

eLBati · 2016-10-11T07:34:51Z

@lasley squashed 3 commits

lasley · 2016-10-11T07:51:21Z

Thanks @eLBati

sebalix · 2016-10-11T13:13:56Z

I think the history rewriting went wrong, the module is installable: False.

pedrobaeza · 2016-10-11T13:14:52Z

Uhm, @eLBati, can you please check

eLBati · 2016-10-11T14:23:47Z

thanks @sebalix

Yes, it was within the unique commit eLBati@9a0935b and lost when I replaced that commit with 8.0 commit history

PR at #265

eLBati mentioned this pull request Apr 23, 2016

Porting website_cookie_notice and website_legal_page to 9.0 #106

Closed

eLBati mentioned this pull request Apr 23, 2016

Change link to protocol relative wikipedia in website_cookie_notice #193

Closed

pedrobaeza mentioned this pull request Apr 23, 2016

Migration to version 9.0 #85

Closed

34 tasks

elicoidal reviewed Apr 23, 2016
View reviewed changes

eLBati force-pushed the port_cookie_notice_9_2 branch from 6c982f0 to 9da7ead Compare May 4, 2016 06:33

rafaelbn added the needs fixing label Jun 3, 2016

rafaelbn added this to the 9.0 milestone Jun 3, 2016

pedrobaeza force-pushed the 9.0 branch from c67f6aa to 10a1daa Compare August 18, 2016 15:20

eLBati force-pushed the port_cookie_notice_9_2 branch 2 times, most recently from 3a5dd95 to f7e8ab5 Compare October 3, 2016 09:21

tafaRU approved these changes Oct 4, 2016

View reviewed changes

lasley added needs review and removed needs fixing labels Oct 4, 2016

sebalix approved these changes Oct 10, 2016

View reviewed changes

lasley approved these changes Oct 10, 2016

View reviewed changes

lasley suggested changes Oct 10, 2016

View reviewed changes

oca-transbot and others added 2 commits October 10, 2016 18:59

OCA Transbot updated translations from Transifex

044c560

Restructure website_cookie_notice.

1bf24f5

This will allow automatic translations and easier maintenance. Many code has been removed to simplify eveything.

yajo and others added 17 commits October 10, 2016 18:59

Warn about breaking update in 2.0.0.

dd5912c

Warn about losing customizations.

5105366

OCA Transbot updated translations from Transifex

51395f2

OCA Transbot updated translations from Transifex

771b431

Author

aa18292

Make easier to reuse.

dc4339f

- Move important parts of templates to another templates. - Add an ID to the message: `website_cookie_notice`.

Spanish translation

4c6df9f

OCA Transbot updated translations from Transifex

64b0b3b

Cookie message translation

2bc872a

Cookie message translation

aff711e

OCA Transbot updated translations from Transifex

a5e5dbe

OCA Transbot updated translations from Transifex

520616b

OCA Transbot updated translations from Transifex

2b1307f

OCA Transbot updated translations from Transifex

1d60647

remove en.po that was erroneously created by transbot

c679902

IMP README

be136fa

Conflicts: website_cookie_notice/__openerp__.py

IMP using JSON and avoiding cache breaking rendered pages

5bfff3b

Conflicts: website_cookie_notice/views/website.xml

eLBati force-pushed the port_cookie_notice_9_2 branch from f18e11c to 9cfccf0 Compare October 10, 2016 17:11

lasley approved these changes Oct 10, 2016

View reviewed changes

eLBati and others added 2 commits October 11, 2016 09:31

FIX Duplicate key 'version' in dictionary

4cd1d1f

and copyright headers FIX module version FIX author Tecnativa

[IMP] website_cookie_notice

1f2000b

Update headers and README according to OCA conventions

eLBati force-pushed the port_cookie_notice_9_2 branch from 9cfccf0 to 1f2000b Compare October 11, 2016 07:31

lasley merged commit 0e3b37d into OCA:9.0 Oct 11, 2016

Uh oh!

Conversation

eLBati commented Apr 23, 2016 • edited by pedrobaeza Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pedrobaeza commented Apr 23, 2016

Uh oh!

eLBati commented Apr 23, 2016

Uh oh!

pedrobaeza commented Apr 23, 2016

Uh oh!

coveralls commented Apr 23, 2016

Uh oh!

eLBati commented Apr 23, 2016

Uh oh!

elicoidal Apr 23, 2016

Choose a reason for hiding this comment

Uh oh!

eLBati May 4, 2016

Choose a reason for hiding this comment

Uh oh!

coveralls commented May 4, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pedrobaeza commented Sep 12, 2016

Uh oh!

eLBati commented Oct 3, 2016

Uh oh!

sebalix left a comment

Choose a reason for hiding this comment

Uh oh!

lasley left a comment

Choose a reason for hiding this comment

Uh oh!

lasley left a comment

Choose a reason for hiding this comment

Uh oh!

eLBati commented Oct 10, 2016

Uh oh!

lasley commented Oct 10, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

eLBati commented Oct 11, 2016

Uh oh!

lasley commented Oct 11, 2016

Uh oh!

sebalix commented Oct 11, 2016

Uh oh!

pedrobaeza commented Oct 11, 2016

Uh oh!

eLBati commented Oct 11, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

eLBati commented Apr 23, 2016 •

edited by pedrobaeza

Loading

coveralls commented May 4, 2016 •

edited

Loading

lasley commented Oct 10, 2016 •

edited

Loading