Merge branch 'patf-pause-gif'
No related branches found
No related tags found
Showing
- app/assets/javascripts/components/components/media_gallery.jsx 19 additions, 11 deletions...ssets/javascripts/components/components/media_gallery.jsx
- app/assets/javascripts/components/components/status.jsx 2 additions, 1 deletionapp/assets/javascripts/components/components/status.jsx
- app/assets/javascripts/components/containers/status_container.jsx 2 additions, 1 deletion...ts/javascripts/components/containers/status_container.jsx
- app/assets/javascripts/components/features/account/components/header.jsx 19 additions, 9 deletions...scripts/components/features/account/components/header.jsx
- app/assets/javascripts/components/features/status/components/detailed_status.jsx 2 additions, 1 deletion...components/features/status/components/detailed_status.jsx
- app/assets/javascripts/components/features/status/index.jsx 6 additions, 4 deletionsapp/assets/javascripts/components/features/status/index.jsx
- app/assets/stylesheets/components.scss 31 additions, 0 deletionsapp/assets/stylesheets/components.scss
- app/controllers/settings/preferences_controller.rb 4 additions, 3 deletionsapp/controllers/settings/preferences_controller.rb
- app/models/user.rb 4 additions, 0 deletionsapp/models/user.rb
- app/views/home/initial_state.json.rabl 1 addition, 0 deletionsapp/views/home/initial_state.json.rabl
- app/views/settings/preferences/show.html.haml 3 additions, 0 deletionsapp/views/settings/preferences/show.html.haml
- config/locales/simple_form.en.yml 1 addition, 0 deletionsconfig/locales/simple_form.en.yml
- config/settings.yml 1 addition, 0 deletionsconfig/settings.yml
Loading
Please register or sign in to comment