mirror of
https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git
synced 2026-01-11 21:43:15 -08:00
01d6f7529f
Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests. |
||
|---|---|---|
| .. | ||
| about | ||
| account | ||
| account_gallery | ||
| account_timeline | ||
| audio | ||
| blocks | ||
| bookmarked_statuses | ||
| closed_registrations_modal | ||
| community_timeline | ||
| compose | ||
| direct_timeline | ||
| directory | ||
| domain_blocks | ||
| emoji | ||
| explore | ||
| favourited_statuses | ||
| favourites | ||
| filters | ||
| follow_recommendations | ||
| follow_requests | ||
| followed_tags | ||
| followers | ||
| following | ||
| generic_not_found | ||
| getting_started | ||
| hashtag_timeline | ||
| home_timeline | ||
| interaction_modal | ||
| keyboard_shortcuts | ||
| list_adder | ||
| list_editor | ||
| list_timeline | ||
| lists | ||
| mutes | ||
| notifications | ||
| picture_in_picture | ||
| pinned_statuses | ||
| privacy_policy | ||
| public_timeline | ||
| reblogs | ||
| report | ||
| standalone/compose | ||
| status | ||
| subscribed_languages_modal | ||
| ui | ||
| video | ||