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

PSR-4 for the Theming app #408

Merged
merged 6 commits into from
Jul 28, 2016
Merged

PSR-4 for the Theming app #408

merged 6 commits into from
Jul 28, 2016

Conversation

nickvergessen
Copy link
Member

@nickvergessen nickvergessen commented Jul 15, 2016

@nickvergessen nickvergessen added this to the Nextcloud Next milestone Jul 15, 2016
@mention-bot
Copy link

@nickvergessen, thanks for your PR! By analyzing the annotation information on this pull request, we identified @LukasReschke, @schiessle, @oparoz and @DeepDiver1975 to be potential reviewers

@MorrisJobke
Copy link
Member

👍

1 similar comment
@schiessle
Copy link
Member

👍

@schiessle
Copy link
Member

@nickvergessen merge conflicts... please rebase

@nickvergessen
Copy link
Member Author

No, will wait for #415 and then also fix #433

@nickvergessen nickvergessen added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jul 18, 2016
@nickvergessen nickvergessen self-assigned this Jul 18, 2016
@nickvergessen
Copy link
Member Author

Rebased, now also fixes #433 and does not use private API anymore.

@nickvergessen nickvergessen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jul 28, 2016
@MorrisJobke
Copy link
Member

Tested and works 👍

@schiessle
Copy link
Member

please let's wait a second until #636 is merged... Rebasing this branch is way easier than the other way arround.

@MorrisJobke
Copy link
Member

@schiessle Could you resolve the conflicts now? #636 is merged

@MorrisJobke MorrisJobke added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jul 28, 2016
@schiessle
Copy link
Member

rebased, let's run the test once more and then merge it

@schiessle schiessle merged commit 2defd92 into master Jul 28, 2016
@schiessle schiessle deleted the psr4-theming branch July 28, 2016 16:47
@schiessle
Copy link
Member

@nickvergessen can you take care of the stable10 backport? Thanks!

@MorrisJobke MorrisJobke added 3. to review Waiting for reviews backport-request and removed 2. developing Work in progress labels Jul 28, 2016
GitHubUser4234 pushed a commit to GitHubUser4234/server that referenced this pull request Aug 30, 2016
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.

4 participants