Claire
|
c59fb65ddc
|
Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to glitch-soc's option to hide followers count.
Ported upstream changes.
Additional changes:
- `app/views/application/mailer/_account.html.haml`:
Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
Ported the `frontend_asset_url` helper change to glitch-soc.
|
2024-01-17 18:32:15 +01:00 |
|
Claire
|
c3a8f6a0a3
|
Fix glitch-soc HAML linting issues (#2166)
|
2023-04-07 20:55:28 +02:00 |
|
Thibaut Girka
|
0fbe90e2d3
|
Fix settings/flavours
Update theming system to use new paths for media files
|
2019-03-16 16:21:20 +01:00 |
|
kibigo!
|
44792de49a
|
Don't show skins selector when there's only one (#256)
|
2018-01-08 16:45:32 -08:00 |
|
kibigo!
|
ed7231947c
|
Added styling
|
2017-12-10 20:32:28 -08:00 |
|
kibigo!
|
bdca1614d5
|
Screenshot support for themes
|
2017-12-10 20:32:28 -08:00 |
|
kibigo!
|
dabf66e676
|
Moved flavour UI into own prefs tab
|
2017-12-10 20:32:27 -08:00 |
|