rubiline
/
Glitch-Shrike
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Glitch-Shrike/app/javascript/mastodon/features
History
Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
 		2019-07-19 18:26:49 +02:00
..
account/components
…
account_gallery
…
account_timeline Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
blocks Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
community_timeline Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
compose Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
direct_timeline
…
domain_blocks Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
emoji
…
favourited_statuses Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
favourites Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
follow_requests Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
followers Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
following Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
generic_not_found
…
getting_started
…
hashtag_timeline Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
home_timeline Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
introduction
…
keyboard_shortcuts
…
list_adder
…
list_editor
…
list_timeline Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
lists Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
mutes Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
notifications Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
pinned_statuses Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
public_timeline Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
reblogs Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
report
…
search
…
standalone
…
status
…
ui Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +02:00
video
…