Merge branch 'master' into master
No related branches found
No related tags found
Showing
- app/assets/javascripts/components/actions/accounts.jsx 8 additions, 3 deletionsapp/assets/javascripts/components/actions/accounts.jsx
- app/assets/javascripts/components/actions/cards.jsx 1 addition, 1 deletionapp/assets/javascripts/components/actions/cards.jsx
- app/assets/javascripts/components/actions/timelines.jsx 12 additions, 2 deletionsapp/assets/javascripts/components/actions/timelines.jsx
- app/assets/javascripts/components/components/status_content.jsx 27 additions, 6 deletions...sets/javascripts/components/components/status_content.jsx
- app/assets/javascripts/components/components/status_list.jsx 27 additions, 10 deletionsapp/assets/javascripts/components/components/status_list.jsx
- app/assets/javascripts/components/features/account_timeline/index.jsx 5 additions, 3 deletions...avascripts/components/features/account_timeline/index.jsx
- app/assets/javascripts/components/features/notifications/index.jsx 1 addition, 0 deletions...s/javascripts/components/features/notifications/index.jsx
- app/assets/javascripts/components/features/ui/containers/status_list_container.jsx 2 additions, 1 deletion...mponents/features/ui/containers/status_list_container.jsx
- app/assets/javascripts/components/reducers/timelines.jsx 57 additions, 27 deletionsapp/assets/javascripts/components/reducers/timelines.jsx
- app/assets/stylesheets/boost.scss 9 additions, 0 deletionsapp/assets/stylesheets/boost.scss
- app/assets/stylesheets/components.scss 18 additions, 3 deletionsapp/assets/stylesheets/components.scss
- app/controllers/api/v1/accounts_controller.rb 8 additions, 9 deletionsapp/controllers/api/v1/accounts_controller.rb
- app/controllers/api/v1/blocks_controller.rb 2 additions, 2 deletionsapp/controllers/api/v1/blocks_controller.rb
- app/controllers/api/v1/favourites_controller.rb 2 additions, 2 deletionsapp/controllers/api/v1/favourites_controller.rb
- app/controllers/api/v1/notifications_controller.rb 2 additions, 2 deletionsapp/controllers/api/v1/notifications_controller.rb
- app/controllers/api/v1/statuses_controller.rb 4 additions, 4 deletionsapp/controllers/api/v1/statuses_controller.rb
- app/controllers/api/v1/timelines_controller.rb 8 additions, 8 deletionsapp/controllers/api/v1/timelines_controller.rb
- app/controllers/api_controller.rb 5 additions, 0 deletionsapp/controllers/api_controller.rb
- app/lib/formatter.rb 5 additions, 2 deletionsapp/lib/formatter.rb
- app/services/after_block_service.rb 31 additions, 0 deletionsapp/services/after_block_service.rb
Loading
Please register or sign in to comment