Merge branch 'feature-privacy-federation' into development
Showing
- app/assets/javascripts/components/components/column_collapsable.jsx 3 additions, 2 deletions.../javascripts/components/components/column_collapsable.jsx
- app/assets/javascripts/components/components/loading_indicator.jsx 1 addition, 2 deletions...s/javascripts/components/components/loading_indicator.jsx
- app/assets/javascripts/components/components/media_gallery.jsx 2 additions, 4 deletions...ssets/javascripts/components/components/media_gallery.jsx
- app/assets/javascripts/components/components/video_player.jsx 2 additions, 4 deletions...assets/javascripts/components/components/video_player.jsx
- app/assets/javascripts/components/features/account/components/header.jsx 1 addition, 1 deletion...scripts/components/features/account/components/header.jsx
- app/assets/javascripts/components/features/follow_requests/components/account_authorize.jsx 2 additions, 5 deletions...features/follow_requests/components/account_authorize.jsx
- app/assets/javascripts/components/features/home_timeline/components/column_settings.jsx 3 additions, 5 deletions...nts/features/home_timeline/components/column_settings.jsx
- app/assets/javascripts/components/features/notifications/components/clear_column_button.jsx 1 addition, 2 deletions...features/notifications/components/clear_column_button.jsx
- app/assets/javascripts/components/features/notifications/components/column_settings.jsx 5 additions, 7 deletions...nts/features/notifications/components/column_settings.jsx
- app/assets/javascripts/components/features/notifications/components/notification.jsx 5 additions, 15 deletions...onents/features/notifications/components/notification.jsx
- app/assets/javascripts/components/features/notifications/components/setting_toggle.jsx 2 additions, 3 deletions...ents/features/notifications/components/setting_toggle.jsx
- app/assets/javascripts/components/features/status/components/card.jsx 6 additions, 37 deletions...avascripts/components/features/status/components/card.jsx
- app/assets/javascripts/components/features/status/components/detailed_status.jsx 2 additions, 2 deletions...components/features/status/components/detailed_status.jsx
- app/assets/javascripts/components/features/ui/components/column_link.jsx 0 additions, 1 deletion...scripts/components/features/ui/components/column_link.jsx
- app/assets/javascripts/components/features/ui/containers/modal_container.jsx 3 additions, 6 deletions...pts/components/features/ui/containers/modal_container.jsx
- app/assets/stylesheets/application.scss 29 additions, 0 deletionsapp/assets/stylesheets/application.scss
- app/assets/stylesheets/components.scss 121 additions, 14 deletionsapp/assets/stylesheets/components.scss
- app/assets/stylesheets/stream_entries.scss 4 additions, 4 deletionsapp/assets/stylesheets/stream_entries.scss
- app/controllers/api/v1/follow_requests_controller.rb 2 additions, 2 deletionsapp/controllers/api/v1/follow_requests_controller.rb
- app/controllers/concerns/obfuscate_filename.rb 1 addition, 0 deletionsapp/controllers/concerns/obfuscate_filename.rb
Loading
Please register or sign in to comment