Merge branch 'blackle-master'
No related branches found
No related tags found
Showing
- app/assets/javascripts/components/components/icon_button.jsx 1 addition, 1 deletionapp/assets/javascripts/components/components/icon_button.jsx
- app/assets/javascripts/components/components/status.jsx 1 addition, 0 deletionsapp/assets/javascripts/components/components/status.jsx
- app/assets/javascripts/components/components/status_action_bar.jsx 2 additions, 2 deletions...s/javascripts/components/components/status_action_bar.jsx
- app/assets/javascripts/components/containers/status_container.jsx 12 additions, 3 deletions...ts/javascripts/components/containers/status_container.jsx
- app/assets/javascripts/components/features/status/components/action_bar.jsx 2 additions, 2 deletions...ipts/components/features/status/components/action_bar.jsx
- app/assets/javascripts/components/features/status/index.jsx 14 additions, 4 deletionsapp/assets/javascripts/components/features/status/index.jsx
- app/assets/javascripts/components/features/ui/components/boost_modal.jsx 77 additions, 0 deletions...scripts/components/features/ui/components/boost_modal.jsx
- app/assets/javascripts/components/features/ui/components/modal_root.jsx 3 additions, 1 deletion...ascripts/components/features/ui/components/modal_root.jsx
- app/assets/stylesheets/boost.scss 1 addition, 1 deletionapp/assets/stylesheets/boost.scss
- app/assets/stylesheets/components.scss 77 additions, 2 deletionsapp/assets/stylesheets/components.scss
- app/controllers/settings/preferences_controller.rb 3 additions, 2 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