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 #4913 #4914

Merged
merged 3 commits into from Aug 15, 2018

Conversation

Projects
None yet
2 participants
@Yoshi2889
Contributor

Yoshi2889 commented Aug 14, 2018

Cleans up the profile template settings page, and also sets a default value for calendar_start_day on said page. I'm not happy with having those keys settings hardcoded; might look at a better way.

Yoshi2889 added some commits Aug 14, 2018

Add 'enabled' key to theme settings
This allows third-party themes to conditionally show settings in the look & layout page of the profile settings.
Moreover this cleans up the Profile settings template quite a bit.

Signed-off-by: NanoSector <rick.2889@gmail.com>
Fix #4913: Set 'calendar_start_day' to a default value when not set
Signed-off-by: NanoSector <rick.2889@gmail.com>
Fix indentation
Signed-off-by: NanoSector <rick.2889@gmail.com>
@jdarwood007

Looks good, need CI job restarted and if its good this can merge

@jdarwood007 jdarwood007 merged commit eb3630c into SimpleMachines:release-2.1 Aug 15, 2018

2 checks passed

Scrutinizer 1 new issues
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment