Skip to content

12.0 mig base_search_mail_content #351

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.

Sign up for GitHub

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

Jump to bottom
Merged
pedrobaeza merged 15 commits into from
Mar 8, 2019
Merged

12.0 mig base_search_mail_content #351

pedrobaeza merged 15 commits into from
Mar 8, 2019

Conversation

@ernestotejeda
Copy link
Member

@ernestotejeda ernestotejeda commented Jan 10, 2019

@pedrobaeza pedrobaeza added this to the 12.0 milestone Jan 10, 2019
@OCA-git-bot OCA-git-bot mentioned this pull request Jan 10, 2019
Closed
24 tasks
pedrobaeza
pedrobaeza requested changes Jan 10, 2019
View reviewed changes
Copy link
Member

@pedrobaeza pedrobaeza left a comment

Choose a reason for hiding this comment

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

Please add a temporary commit with oca_dependencies.txt file including:

server-tools https://github.com/Tecnativa/server-tools server-tools 12.0-mig-base_search_fuzzy

With this, the PR will be testeable and no Travis error. We can remove it later when the PR is merged.

About this PR, please squash some README update commits the same as in the other PR.

@ernestotejeda ernestotejeda force-pushed the 12.0-mig-base_search_mail_content branch 2 times, most recently from 758907a to c8007bf Compare January 10, 2019 21:14
@pedrobaeza
Copy link
Member

pedrobaeza commented Jan 14, 2019

You can remove the oca_dependencies.txt part

cubells
cubells approved these changes Jan 14, 2019
View reviewed changes
Copy link
Member

@cubells cubells left a comment

Choose a reason for hiding this comment

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

If you remove oca_dependencies line...

👍

LGTM

Code review and test

@ernestotejeda ernestotejeda force-pushed the 12.0-mig-base_search_mail_content branch 2 times, most recently from 3a556f6 to b76baca Compare January 14, 2019 17:20
@rafaelbn
Copy link
Member

rafaelbn commented Mar 7, 2019

@ernestotejeda please resolve conflicts

This branch has conflicts that must be resolved

@pedrobaeza your comments have been attended could you unblock please?

@pedrobaeza
Copy link
Member

pedrobaeza commented Mar 7, 2019

Please include #359

@pedrobaeza pedrobaeza mentioned this pull request Mar 7, 2019
Merged
yajo
yajo approved these changes Mar 7, 2019
View reviewed changes
Copy link
Member

@yajo yajo left a comment

Choose a reason for hiding this comment

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

OK when done last comment of @pedrobaeza.

@rafaelbn rafaelbn requested review from pedrobaeza and yajo March 7, 2019 15:44
@ernestotejeda ernestotejeda force-pushed the 12.0-mig-base_search_mail_content branch from b76baca to beb42bf Compare March 7, 2019 15:52
@ernestotejeda ernestotejeda force-pushed the 12.0-mig-base_search_mail_content branch from beb42bf to 7806483 Compare March 7, 2019 20:44
@ernestotejeda
Copy link
Member Author

ernestotejeda commented Mar 7, 2019 •
edited
Loading

@pedrobaeza Now I have realized that this is one of the cases in which a module changes its name in the middle of its history. So I'm going to bring all the history and amend.

@ernestotejeda ernestotejeda force-pushed the 12.0-mig-base_search_mail_content branch from 7806483 to 089cf29 Compare March 7, 2019 22:34
@OCA-git-bot
Copy link
Contributor

OCA-git-bot commented Mar 7, 2019

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@ernestotejeda ernestotejeda force-pushed the 12.0-mig-base_search_mail_content branch from 089cf29 to 8dfb420 Compare March 7, 2019 23:07
MiquelRForgeFlow and others added 11 commits March 7, 2019 18:11
@MiquelRForgeFlow @ernestotejeda
[MIG] base_search_mail_content: Migration to 10.0
57a6f24
@oca-transbot @ernestotejeda
OCA Transbot updated translations from Transifex
6755a61
@cubells @ernestotejeda
[MIG] base_search_mail_content: Migration to 11.0
6f618c7
@oca-travis @ernestotejeda
[UPD] Update base_search_mail_content.pot
284c336
@OCA-git-bot @ernestotejeda
[UPD] README.rst
8406618
@didierdonze @ernestotejeda
Translated using Weblate (French) [ci skip]
8b0a40c 
Currently translated at 100.0% (4 of 4 strings)

Translation: social-11.0/social-11.0-base_search_mail_content
Translate-URL: https://translation.odoo-community.org/projects/social-11-0/social-11-0-base_search_mail_content/fr/
@OCA-git-bot @ernestotejeda
[UPD] README.rst
f0df39d
@oca-travis @ernestotejeda
[UPD] Update base_search_mail_content.pot
093c4b2
@oca-transbot @ernestotejeda
Update translation files
483cb84 
Updated by Update PO files to match POT (msgmerge) hook in Weblate.
@HviorForgeFlow @ernestotejeda
[11.0][FIX] base_search_mail_content: Move message content search to …
9da49fb 
…last position
@ernestotejeda
[MIG] base_search_mail_content: Migration to 12.0
435d686
@ernestotejeda ernestotejeda force-pushed the 12.0-mig-base_search_mail_content branch from 8dfb420 to 435d686 Compare March 7, 2019 23:15
@pedrobaeza pedrobaeza merged commit 3d485a4 into OCA:12.0 Mar 8, 2019
@pedrobaeza pedrobaeza deleted the 12.0-mig-base_search_mail_content branch March 8, 2019 00:04
SiesslPhillip pushed a commit to grueneerde/OCA-social that referenced this pull request Nov 20, 2024
@bt-admin
Merge pull request OCA#351 from OCA/12.0
8539cd0 
Syncing from upstream OCA/social (12.0)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pedrobaeza pedrobaeza pedrobaeza approved these changes

@yajo yajo Awaiting requested review from yajo

+2 more reviewers

@cubells cubells cubells approved these changes

@chienandalu chienandalu chienandalu approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

approved needs review ready to merge

Projects

None yet

Milestone

12.0

Development

Successfully merging this pull request may close these issues.