![]() Conflicts: - `app/javascript/entrypoints/common.js`: Upstream moved everything from `app/javascript/packs` to `app/javascript/entrypoints` while this file was a glitch-soc addition. Moved it like the rest. - `tsconfig.json`: Conflict due to glitch-soc's flavor. Updated like upstream. Also moved and updated the following files accordingly: - `app/javascript/flavours/vanilla/theme.yml` - `app/javascript/flavours/glitch/theme.yml` - everything in `app/javascript/flavours/glitch/packs` |
||
---|---|---|
.. | ||
admin | ||
accounts_helper.rb | ||
application_helper.rb | ||
authorized_fetch_helper.rb | ||
branding_helper.rb | ||
context_helper.rb | ||
database_helper.rb | ||
domain_control_helper.rb | ||
email_helper.rb | ||
filters_helper.rb | ||
flashes_helper.rb | ||
formatting_helper.rb | ||
home_helper.rb | ||
instance_helper.rb | ||
invites_helper.rb | ||
jsonld_helper.rb | ||
languages_helper.rb | ||
mascot_helper.rb | ||
media_component_helper.rb | ||
react_component_helper.rb | ||
registration_helper.rb | ||
routing_helper.rb | ||
self_destruct_helper.rb | ||
settings_helper.rb | ||
statuses_helper.rb | ||
theme_helper.rb | ||
webfinger_helper.rb |