Skip to content

[10.0][MIG] website_portal_purchase - #351

Closed
Tardo wants to merge 137 commits into
OCA:10.0from
RedNeboa:10.0-mig-website_portal_purchase
Closed

Tardo wants to merge 137 commits into
OCA:10.0from
RedNeboa:10.0-mig-website_portal_purchase

Conversation

@Tardo

@Tardo Tardo commented May 30, 2017

Copy link
Copy Markdown
Member

Migrated 'website_portal_purchase' to v10.0

New features in this PR:

  • Now the menu mark as 'active' the selected item.

Depends:

oca-transbot and others added 23 commits January 9, 2017 12:03
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
OCA Transbot updated translations from Transifex
* New module to provide website categories for blog posts
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.
…dd_setup-jne

[ADD] setup and rename __openerp__ into manifest
Sass requires consistent indentation even for multiline comments, so I add it here.
I take the time too to change (C) for Copyright (which actually has a legal meaning).
This should fix OCA#304 (comment).
@yajo yajo self-assigned this May 31, 2017
@yajo yajo added this to the 10.0 milestone May 31, 2017

@yajo yajo 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.

Please fix the bots, both are ❌

OCA-git-bot and others added 12 commits October 3, 2017 04:44
* [ADD] website_form_builder: Exactly what the title says

* fixup! [ADD] website_form_builder: Exactly what the title says

* fixup! [ADD] website_form_builder: Exactly what the title says

* fixup! [ADD] website_form_builder: Exactly what the title says

* fixup! [ADD] website_form_builder: Exactly what the title says

* fixup! [ADD] website_form_builder: Exactly what the title says

* fixup! [ADD] website_form_builder: Exactly what the title says

* fixup! [ADD] website_form_builder: Exactly what the title says

* fixup! [ADD] website_form_builder: Exactly what the title says

* fixup! [ADD] website_form_builder: Exactly what the title says

* fixup! [ADD] website_form_builder: Exactly what the title says

* fixup! [ADD] website_form_builder: Exactly what the title says
…a_reset_drt

[10.0][FIX] website_form_recaptcha: reset the recaptcha when the server send a error
…lse_positives

[FIX] website_multi_theme: Proper checking of special views inheritance
@pedrobaeza

Copy link
Copy Markdown
Member

Please fix Travis

@App-247

App-247 commented Mar 10, 2018

Copy link
Copy Markdown

Why does this module use sass while other similar modules (website_portal, website_portal_sale) use less?

@pedrobaeza

Copy link
Copy Markdown
Member

It was a design decision. Odoo itself is going to switch to sass due to Bootstrap 4

@Tardo

Tardo commented Mar 10, 2018

Copy link
Copy Markdown
Member Author

Travis say's:

`   File "/home/travis/odoo-10.0/odoo/tests/common.py", line 387, in phantom_run
`     "PhantomJS test completed without reporting success; "
` AssertionError: None is not true : PhantomJS test completed without reporting success; the log may contain errors or hints.
FAILED
Module website_seo_redirection: 1 failures, 0 errors

Is a Javascript test not related with this module no?

@pedrobaeza

Copy link
Copy Markdown
Member

Please rebase, because main branch is green.

yajo and others added 5 commits March 11, 2018 23:43
Sass requires consistent indentation even for multiline comments, so I add it here.
I take the time too to change (C) for Copyright (which actually has a legal meaning).
This should fix OCA#304 (comment).

@simahawk simahawk left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🛑 there are commits coming from a lot of modules here

@pedrobaeza

Copy link
Copy Markdown
Member

Bad rebase...

@Tardo

Tardo commented Mar 12, 2018

Copy link
Copy Markdown
Member Author

Yeah, sorry... Is my first rebase and failed... I need some help to solve this mess...

Sorry again :/

@pedrobaeza

Copy link
Copy Markdown
Member

You can start from scratch in a fresh branch and apply the same changes, and then force push here with the same branch name.

@Tardo Tardo closed this Jun 11, 2018
@Tardo
Tardo deleted the 10.0-mig-website_portal_purchase branch June 11, 2018 08:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.