Skip to content

Theming: Add logo and background to ThemingDefaults - #1026

Merged
rullzer merged 2 commits into
masterfrom
theming-extend-defaults
Aug 26, 2016
Merged

Theming: Add logo and background to ThemingDefaults#1026
rullzer merged 2 commits into
masterfrom
theming-extend-defaults

Conversation

@juliusknorr

@juliusknorrjuliusknorr commented Aug 23, 2016

Copy link
Copy Markdown
Member

This PR adds logo and background to the ThemingDefaults class. This allows further code in the theming app to query the current logo/background image url.

@juliusknorr
juliusknorrforce-pushed the theming-extend-defaults branch 12 times, most recently from 7e03063 to 867efccCompareAugust 23, 2016 22:19
@juliusknorr
juliusknorrforce-pushed the theming-extend-defaults branch from 867efcc to 80fe499CompareAugust 23, 2016 22:40
@juliusknorr

juliusknorr commented Aug 23, 2016

Copy link
Copy Markdown
MemberAuthor

Ok, I've tried to figure out why the tests of #770 are failing. This PR contains the set of backend changes for the theming app that I think introduce the failing tests.

@icewind1991 it would be really great if you could have a look.

@juliusknorr

juliusknorr commented Aug 23, 2016

Copy link
Copy Markdown
MemberAuthor

cc @nickvergessen as you mentioned something about the loading order in #770.
what loading order were you refering to?

@nickvergessen

nickvergessen commented Aug 24, 2016

Copy link
Copy Markdown
Member

Had a quick look, and we can fix this by using the lazy root, but well that is not as clean as it should be. But will push this never the less now.

@juliusknorrjuliusknorr added 3. to review Waiting for reviews and removed 2. developing Work in progress help wanted labels Aug 24, 2016
@juliusknorr

juliusknorr commented Aug 24, 2016

Copy link
Copy Markdown
MemberAuthor

@nickvergessen Awesome! Thanks for the cleanup as well.

Ready for review now. I'll create a new PR for the rest of #770 and after merge we also continue with #771 and #840.

@juliusknorr

juliusknorr commented Aug 24, 2016

Copy link
Copy Markdown
MemberAuthor

cc @schiessle@LukasReschke for review

@nickvergessennickvergessen added this to the Nextcloud 11.0 milestone Aug 24, 2016
@juliusknorrjuliusknorr mentioned this pull request Aug 25, 2016
Merged
5 tasks
@nickvergessen

nickvergessen commented Aug 25, 2016

Copy link
Copy Markdown
Member

👍

@juliusknorrjuliusknorr mentioned this pull request Aug 25, 2016
Merged
@rullzer

rullzer commented Aug 26, 2016

Copy link
Copy Markdown
Member

LGTM

@rullzer
rullzer merged commit 044d7c3 into masterAug 26, 2016
@rullzer
rullzer deleted the theming-extend-defaults branch August 26, 2016 09:53
@escoandescoand mentioned this pull request Oct 6, 2017
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsfeature: theming

Projects

None yet

Milestone

Nextcloud 11.0

Development

Successfully merging this pull request may close these issues.

3 participants

@juliusknorr@nickvergessen@rullzer