Merge branch 'master' into french-translation
No related branches found
No related tags found
Showing
- Gemfile 0 additions, 5 deletionsGemfile
- Gemfile.lock 0 additions, 9 deletionsGemfile.lock
- app/assets/javascripts/components/actions/accounts.jsx 5 additions, 3 deletionsapp/assets/javascripts/components/actions/accounts.jsx
- app/assets/javascripts/components/actions/compose.jsx 11 additions, 1 deletionapp/assets/javascripts/components/actions/compose.jsx
- app/assets/javascripts/components/components/button.jsx 13 additions, 6 deletionsapp/assets/javascripts/components/components/button.jsx
- app/assets/javascripts/components/components/media_gallery.jsx 108 additions, 54 deletions...ssets/javascripts/components/components/media_gallery.jsx
- app/assets/javascripts/components/components/status.jsx 3 additions, 2 deletionsapp/assets/javascripts/components/components/status.jsx
- app/assets/javascripts/components/components/status_action_bar.jsx 8 additions, 1 deletion...s/javascripts/components/components/status_action_bar.jsx
- app/assets/javascripts/components/components/video_player.jsx 40 additions, 2 deletions...assets/javascripts/components/components/video_player.jsx
- app/assets/javascripts/components/containers/mastodon.jsx 0 additions, 5 deletionsapp/assets/javascripts/components/containers/mastodon.jsx
- app/assets/javascripts/components/containers/status_container.jsx 11 additions, 6 deletions...ts/javascripts/components/containers/status_container.jsx
- app/assets/javascripts/components/features/account/components/action_bar.jsx 0 additions, 2 deletions...pts/components/features/account/components/action_bar.jsx
- app/assets/javascripts/components/features/account/components/header.jsx 21 additions, 4 deletions...scripts/components/features/account/components/header.jsx
- app/assets/javascripts/components/features/account/index.jsx 2 additions, 3 deletionsapp/assets/javascripts/components/features/account/index.jsx
- app/assets/javascripts/components/features/compose/components/compose_form.jsx 14 additions, 2 deletions...s/components/features/compose/components/compose_form.jsx
- app/assets/javascripts/components/features/compose/containers/compose_form_container.jsx 7 additions, 1 deletion...ts/features/compose/containers/compose_form_container.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/locales/en.jsx 3 additions, 0 deletionsapp/assets/javascripts/components/locales/en.jsx
- app/assets/javascripts/components/reducers/compose.jsx 5 additions, 1 deletionapp/assets/javascripts/components/reducers/compose.jsx
- app/assets/javascripts/components/reducers/notifications.jsx 7 additions, 0 deletionsapp/assets/javascripts/components/reducers/notifications.jsx
Loading
Please register or sign in to comment