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

[FIX] formio : Formio.js version updates in Windows environments are not available. #99

Closed
wants to merge 5 commits into from

Conversation

niulinlnc
Copy link

No description provided.

@bobslee
Copy link
Member

bobslee commented Dec 16, 2020

@niulinlnc To get changes into other branches, we prefer to use in following order, if first wont work anymore:

(1) NOT ANYMORE git merge (still possible for 14.0 into 13.0)

(2) git cherry-pick individual commits. For example;

  • commit(s) from 13.0 into 14.0
  • commit(s) from14.0 into 13.0, 12.0 (because 12.0 won't merge anymore).

(3) Manual changes with PR.

@bobslee
Copy link
Member

bobslee commented Dec 16, 2020

@niulinlnc I just pushed the following which has your changes. Also merged into 13.0 and 12.0.

  • Language buttons on public Forms: c0692a1
  • Chinese translation: 91700d8

I propose the following:

  • Let me first try to (back)port your development changes into other branches. So I can easily merge or cherry-pick :)
  • Please PR as sensible as possible, name PR should reflect the changes :)

Thanks for everything!!

@bobslee bobslee closed this Dec 16, 2020
@bobslee
Copy link
Member

bobslee commented Dec 16, 2020

Sorry @niulinlnc .. seems I've broken the 13.0 branch, due to merge 14.0 into 13.0.
So this (back)port merging won't work, due to Odoo API incompatibility.
Git cherry-picking would be ok, and can fix/change in smaller chunks.

I'll fix the 13.0 branch.

@bobslee
Copy link
Member

bobslee commented Dec 16, 2020

@niulinlnc branch 13.0 has been fixed now. I reverted my silly merge from `14.0.
I'm very pleased to accept your PRs and issues.
Please could you join my Slack invitation? So we can discuss easily when needed :)

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.

3 participants