Skip to content

[10.0] Migrate website cookie notice - #309

Merged
pedrobaeza merged 12 commits into
OCA:10.0from
hurrinico:10.0-website_cookie_notice
Jun 30, 2017
Merged

[10.0] Migrate website cookie notice#309
pedrobaeza merged 12 commits into
OCA:10.0from
hurrinico:10.0-website_cookie_notice

Conversation

@hurrinico

@hurrinico hurrinico commented Jan 2, 2017 •
edited by yajo
Loading

Copy link
Copy Markdown

@pedrobaeza

pedrobaeza commented Jan 2, 2017

Copy link
Copy Markdown
Member

Wow, what a huge commit quantity. Can you please squash by author and all the translation one together?

@pedrobaeza pedrobaeza mentioned this pull request Jan 2, 2017
Closed
35 tasks
@hurrinico

hurrinico commented Jan 3, 2017 •
edited
Loading

Copy link
Copy Markdown
Author

depends on #310 , sorry for closing and reopen, i've made a mistake

@hurrinico hurrinico closed this Jan 3, 2017
@hurrinico hurrinico reopened this Jan 3, 2017
@hurrinico

hurrinico commented Jan 9, 2017 •
edited
Loading

Copy link
Copy Markdown
Author

Hi @pedrobaeza i've made this pr following strictly this guide and i think that all that commit comes from 9.0 version, so why squash them?.

@pedrobaeza

pedrobaeza commented Jan 9, 2017 •
edited
Loading

Copy link
Copy Markdown
Member

I know that you have followed the guide (and I have to reflect this somehow in the guide), but we don't need to keep such commit detail in this branch as the important part are the authors and the 10.0 part. For example, if during the 8.0 life cycle, you have retranslated 20 times the module terms, why keep all these diffs to increase a lot the branch size (and thus the download/pull size). We only need the last translation. The same can apply to the rest of the code, but with one exception: we must keep "final" code for each author.

@hurrinico
hurrinico force-pushed the 10.0-website_cookie_notice branch from 5f834dd to 4dcc1a0 Compare January 9, 2017 10:26
oca-transbot and others added 8 commits January 9, 2017 12:03
@oca-transbot Nicola Malcontenti
OCA Transbot updated translations from Transifex
5ffd3b9 
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
@yajo Nicola Malcontenti
Restructure website_cookie_notice.
0a9d540 
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`.
@pedrobaeza Nicola Malcontenti
Author
6ccac29
@antespi Nicola Malcontenti
Spanish translation
654e99e 
Cookie message translation

Cookie message translation
@sbidoul Nicola Malcontenti
remove en.po that was erroneously created by transbot
2a8b550
@eLBati Nicola Malcontenti
IMP README
75561a0 
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
@tafaRU Nicola Malcontenti
website_cookie_notice Update headers and README according to OCA conv…
f70ebe4 
…entions
Nicola Malcontenti
[MIG] website_cookie_notice: Migrated to 10.0
3e5a60c
@hurrinico
hurrinico force-pushed the 10.0-website_cookie_notice branch from 4dcc1a0 to 3e5a60c Compare January 9, 2017 11:13
@hurrinico

hurrinico commented Jan 9, 2017

Copy link
Copy Markdown
Author

@pedrobaeza take a look if it's ok what i've made

eLBati
eLBati approved these changes Jan 9, 2017
View reviewed changes

@eLBati eLBati left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once #310 is merged

yajo
yajo requested changes Apr 24, 2017
View reviewed changes
Comment thread website_cookie_notice/views/website.xml Outdated
<div class="container">
<div class="row">
<div class="col-xs-10">We use cookies in this website. Read about them in our <a href="/page/privacy">privacy policy</a>. To disable them, configure your browser properly. If you keep using this website, you are accepting those.</div>
<div class="col-xs-2 text-center">

@yajo yajo Apr 24, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please include #333

@eLBati eLBati May 5, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yajo added 22067cc

yajo and others added 2 commits May 5, 2017 15:39
@yajo @eLBati
[FIX][website_cookie_notice] Fix mobile layout
8949256 
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.
Nemry Jonathan
[ADD] setup and rename __openerp__ into manifest
86b6ab3
@JonathanNEMRY

JonathanNEMRY commented May 17, 2017

Copy link
Copy Markdown

hurrinico#2 before merge: add setuptools and use manifest instead of openerp

hurrinico
Merge pull request #2 from acsone/10.0-mig-website_cookie_notice-add_…
3cf2069 
…setup-jne

[ADD] setup and rename __openerp__ into manifest
@yajo yajo added this to the 10.0 milestone May 29, 2017
@yajo

yajo commented Jun 30, 2017

Copy link
Copy Markdown
Member

I added a commit to make it compatible with #353 when merged.

@yajo
[MIG][website_cookie_notice] Adapt to OCA#353 and polish
d2015d1 
- Privacy policy URL changed.
- Contributors data updated.
- Move templates to templates folder, as per guidelines.
@yajo
yajo force-pushed the 10.0-website_cookie_notice branch from 7fb1971 to d2015d1 Compare June 30, 2017 09:33
@yajo

yajo commented Jun 30, 2017

Copy link
Copy Markdown
Member

Rebased now that #353 is merged.

pedrobaeza
pedrobaeza approved these changes Jun 30, 2017
View reviewed changes

@pedrobaeza pedrobaeza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merging when Travis finishes

@pedrobaeza
pedrobaeza merged commit 506723c into OCA:10.0 Jun 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yajo yajo yajo approved these changes
@pedrobaeza pedrobaeza pedrobaeza approved these changes
+1 more reviewer
@eLBati eLBati eLBati approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

needs review

Projects

None yet

Milestone

10.0

Development

Successfully merging this pull request may close these issues.

9 participants

@hurrinico @pedrobaeza @JonathanNEMRY @yajo @eLBati @oca-transbot @antespi @sbidoul @tafaRU