Closed polyamAdmin closed 5 months ago
Changes already ported in #519
Conflicts:
app/controllers/concerns/theming_concern.rb
app/helpers/theme_helper.rb
app/lib/themes.rb
app/views/layouts/application.html.haml
app/views/layouts/embedded.html.haml
app/views/layouts/error.html.haml
config/settings.yml
spec/requests/api/v2/instance_spec.rb
Changes already ported in #519
Conflicts:
app/controllers/concerns/theming_concern.rbapp/helpers/theme_helper.rbapp/lib/themes.rbapp/views/layouts/application.html.hamlapp/views/layouts/embedded.html.hamlapp/views/layouts/error.html.hamlAll above conflicts due to glitch-soc porting system theme differently than polyam-glitch. Matched upstream.config/settings.ymlUpstream uses glitch flavour as default, polyam-glitch uses polyam flavour. Kept current changes.spec/requests/api/v2/instance_spec.rbUpstream tests for title, polyam-glitch tests for setting. Kept current changes.