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

Merge fork-kde-master #19

Closed
27 tasks done
ChALkeR opened this issue Feb 14, 2016 · 13 comments
Closed
27 tasks done

Merge fork-kde-master #19

ChALkeR opened this issue Feb 14, 2016 · 13 comments
Labels
Milestone

Comments

@ChALkeR
Copy link
Member

ChALkeR commented Feb 14, 2016

Merge kde/master by @akreuzkamp.

@ChALkeR ChALkeR changed the title Merge fork-kde Merge fork-kde-master Feb 14, 2016
@ChALkeR ChALkeR mentioned this issue Feb 14, 2016
8 tasks
@Plaristote
Copy link
Member

I took care of b73fd64 in pull request #24.

@Plaristote
Copy link
Member

11164f0 is irrelevant now, since all that code was already re-aligned in qt.js.
3fab595 should probably be done another way, since QML elements aren't described the way they used to be.
8c6ec04 though it is slightly different, this task is already implemented in master.

Otherwise, I made a new pull request #29 which takes care of 02822c9, 3da78c7, 785965c, 1c12ea4, d35f213, c3f1f39, 12b725e, 4c9e432, 48db468 and a24ef6c.
Basically everything from 02822c9 to 48db468, plus the last .gitignore commit (a24ef6c). The next commits might require more work.

@ChALkeR ChALkeR mentioned this issue Feb 17, 2016
62 tasks
@ChALkeR ChALkeR modified the milestone: 0.3.0 Feb 18, 2016
@ChALkeR
Copy link
Member Author

ChALkeR commented Feb 19, 2016

@Plaristote Great work! I updated the list above.

@henrikrudstrom
Copy link
Member

merged 9d4c4cf in #55

@ChALkeR
Copy link
Member Author

ChALkeR commented Feb 20, 2016

@henrikrudstrom Could you do that in a separate PR, please, and keep the original author?

@ChALkeR
Copy link
Member Author

ChALkeR commented Mar 5, 2016

Only 4 commits left here!

@ChALkeR
Copy link
Member Author

ChALkeR commented Mar 9, 2016

I will create a PR today to review the remaining commits here.

Update: apparently, I didn't.

@ChALkeR ChALkeR modified the milestones: 0.3.0, 0.1.0 Mar 9, 2016
@Plaristote
Copy link
Member

I created PR #152 in order to merge 08a4558.

@ChALkeR
Copy link
Member Author

ChALkeR commented Apr 5, 2016

I opened #160 for 6022424 and #161 for 2865c68.

I guess those three PRs cover everything that is left here =).

@ChALkeR
Copy link
Member Author

ChALkeR commented Apr 7, 2016

One commit left! 😄

@ChALkeR
Copy link
Member Author

ChALkeR commented Apr 13, 2016

Yay, we got everything from kde master merged now.

@ChALkeR ChALkeR closed this as completed Apr 13, 2016
@Plaristote
Copy link
Member

Sorry :( ! Something went wrong when I merged #160... unfortunately, I noticed it after rebasing, and the PR was considered merged... I re-opened it as #176. We first have to fix some tests before landing it on master.

@Plaristote Plaristote reopened this Apr 14, 2016
@Plaristote
Copy link
Member

Alright, I was able to re-close thanks to that comment: #160 (comment) !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

3 participants