Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

10.0 mig website canonical url #344

Closed
wants to merge 42 commits into from

Conversation

reinka
Copy link

@reinka reinka commented May 23, 2017

Migration to v10.

Additionally, replaced relative URLs by absolute ones, according to these comments: #299 (review)

@oca-clabot
Copy link

Hey @reinka, 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:

  • @reinka (login unknown in OCA database)

Appreciation of efforts,
OCA CLAbot

@pedrobaeza
Copy link
Member

Isn't there any 9.0 commit to bring? Have you used migration guide https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-10.0?

@reinka
Copy link
Author

reinka commented May 23, 2017

@pedrobaeza Sorry, but what do you mean by "Isn't there any 9.0 commit to bring?"?

@pedrobaeza
Copy link
Member

Well, have you run the commands specified in the migration guide? If so, this add any change since the 10.0 branch fork in your PR.

@reinka
Copy link
Author

reinka commented May 24, 2017

@pedrobaeza I'm new to all this. I'll have a look at the requirements in your link and get back to you once I've taken care of it. Please bear with me.

@yajo yajo added this to the 10.0 milestone May 29, 2017
@oca-clabot
Copy link

Hey @reinka,
We acknowledge that the following users have signed our Contributor License Agreement:

Appreciation of efforts,
OCA CLAbot

@pedrobaeza pedrobaeza mentioned this pull request May 30, 2017
35 tasks
@reinka
Copy link
Author

reinka commented Jun 7, 2017

@pedrobaeza I reverted all my commits and proceeded as required in your link. Please let me know if I've mistaken/missed something.

@pedrobaeza
Copy link
Member

Perfect, now you only need to remove the initial commits + reverts instead of keeping them. If you don't know how, tell me and I'll do it.

@reinka reinka force-pushed the 10.0-mig-website_canonical_url branch from 48c1252 to 1d28bd8 Compare June 7, 2017 10:28
@reinka
Copy link
Author

reinka commented Jun 7, 2017

@pedrobaeza Tried to figure it out myself. I rebased and dropped all the commits you mentioned. Was this the correct way?

@pedrobaeza
Copy link
Member

Yeah, it seems so!

Now go for the green Travis.

@reinka
Copy link
Author

reinka commented Jun 7, 2017

@pedrobaeza I'm confused. I've checked the details of the travis build, there it says:

Module website_seo_redirection: 1 failures, 0 errors

It seems all generated errors are due to website_seo_redirection. However, I didn't change anything regarding website_seo_redirection. Am I missing anything?

@pedrobaeza
Copy link
Member

@yajo can you check about the fail on website_seo_redirection?

@yajo
Copy link
Member

yajo commented Jun 8, 2017

Maybe you need rebasing?

@reinka
Copy link
Author

reinka commented Jun 16, 2017

@yajo Sorry to ask, but what kind of rebasing? I rebased before by dropping unnecessary commits.

@pedrobaeza
Copy link
Member

pedrobaeza commented Jun 16, 2017

The main branch is now green, so if you make (assuming origin remote is OCA one):

git fetch origin
git rebase origin/10.0
git push -f

@reinka reinka force-pushed the 10.0-mig-website_canonical_url branch from 1d28bd8 to 89e8042 Compare June 16, 2017 14:57
yajo and others added 25 commits June 16, 2017 21:02
… the runbot url to 9.0 - remove <data> in the templates - replace <openerp> with <odoo> in the templates
add a proper description

correct import according to review
bug fixes + add languages

clean the code

fix README file
[IMP] add pagination support
[IMP] website_canoncial_url: Several improvements

* Use safe method to retrieve lang.

This avoids a possible `KeyError`.

* Use relative paths.

Makes this work fine behind an HTTPS proxy.

* Prefer `/` over `/page/homepage`.

The root path canonicalized is more SEO and user friendly.
@reinka reinka force-pushed the 10.0-mig-website_canonical_url branch from 89e8042 to 92afd91 Compare June 16, 2017 19:03
@reinka
Copy link
Author

reinka commented Jun 16, 2017

origin remote isn't OCA, since I forked it. I tried to
git remote add upstream https://github.com/OCA/website
git fetch upstream
git rebase upstream/10.0 and finally
git push -f.

That didn't work. After that I ran your commands and it did work. If someone could explain why, I'd really appreciate it.

@pedrobaeza
Copy link
Member

The rebase hasn't gone correctly.

@simahawk
Copy link

this and the other duplicated PR #413 are superseeded by #449

@simahawk simahawk closed this Apr 23, 2018
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.

None yet