Skip to content

Upgrade website_legal_page to 9.0 - #194

Merged
pedrobaeza merged 4 commits into
OCA:9.0from
LasLabs:feature/9.0/website_legal
May 26, 2016
Merged

pedrobaeza merged 4 commits into
OCA:9.0from
LasLabs:feature/9.0/website_legal

Conversation

@lasley

@lasley lasley commented Apr 20, 2016

Copy link
Copy Markdown
Contributor

I noticed a massive amount of changes on website_cookie_notice in the 8.0 branch while bringing forward to 9.0 for #193. This module is now a dependency for it, so I am upgrading it to 9.0 as well (after cherry picking the 8.0 changes)

yajo and others added 3 commits April 20, 2016 08:36
Many submodules from this one need the template I'm adding.

Having it here allows for better reusability and avoids duplicated translation efforts.
@coveralls

Copy link
Copy Markdown

Coverage Status

Coverage remained the same at 60.0% when pulling 7e762eb on laslabs:feature/9.0/website_legal into 6088e65 on OCA:9.0.

@lasley

lasley commented Apr 20, 2016

Copy link
Copy Markdown
Contributor Author

Superseded by #106

@lasley

lasley commented Apr 21, 2016

Copy link
Copy Markdown
Contributor Author

This is more up to date than #106, and included cherry-picking to preserve the commit authors. I would say that this should be the PR for website_legal

@coveralls

Copy link
Copy Markdown

Coverage Status

Coverage remained the same at 60.0% when pulling 7e762eb on laslabs:feature/9.0/website_legal into 6088e65 on OCA:9.0.

@eLBati

eLBati commented Apr 23, 2016

Copy link
Copy Markdown
Member

Thanks @lasley
looking at the diff with 8.0
http://pastie.org/10809155
it seems some translations are missing

Please add them

@lasley

lasley commented Apr 23, 2016

Copy link
Copy Markdown
Contributor Author

Good catch, thanks @eLBati - I meant to pull them in manually after my cherry-picks, but then completely forgot

@coveralls

Copy link
Copy Markdown

Coverage Status

Coverage remained the same at 60.0% when pulling d21f510 on laslabs:feature/9.0/website_legal into 6088e65 on OCA:9.0.

@eLBati

eLBati commented May 4, 2016

Copy link
Copy Markdown
Member

LGTM 👍 thanks

@yajo

yajo commented May 26, 2016

Copy link
Copy Markdown
Member

👍

@pedrobaeza

Copy link
Copy Markdown
Member

👍

I merge, including some translations updates done in 8.0 meanwhile, and giving credits for example to @yajo, that is not included in the README.

@pedrobaeza
pedrobaeza merged commit 0854e30 into OCA:9.0 May 26, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants