Merge branch 'develop' into 'master'
Update master with bugfixes (and other changes) See merge request pleroma/pleroma-fe!673
Showing
- src/App.js 3 additions, 1 deletionsrc/App.js
- src/App.scss 25 additions, 0 deletionssrc/App.scss
- src/App.vue 1 addition, 0 deletionssrc/App.vue
- src/boot/after_store.js 3 additions, 3 deletionssrc/boot/after_store.js
- src/boot/routes.js 0 additions, 2 deletionssrc/boot/routes.js
- src/components/attachment/attachment.vue 1 addition, 0 deletionssrc/components/attachment/attachment.vue
- src/components/basic_user_card/basic_user_card.js 2 additions, 2 deletionssrc/components/basic_user_card/basic_user_card.js
- src/components/basic_user_card/basic_user_card.vue 8 additions, 25 deletionssrc/components/basic_user_card/basic_user_card.vue
- src/components/media_modal/media_modal.vue 2 additions, 13 deletionssrc/components/media_modal/media_modal.vue
- src/components/mobile_post_status_modal/mobile_post_status_modal.js 91 additions, 0 deletions...ents/mobile_post_status_modal/mobile_post_status_modal.js
- src/components/mobile_post_status_modal/mobile_post_status_modal.vue 76 additions, 0 deletions...nts/mobile_post_status_modal/mobile_post_status_modal.vue
- src/components/notification/notification.js 2 additions, 2 deletionssrc/components/notification/notification.js
- src/components/notification/notification.vue 1 addition, 3 deletionssrc/components/notification/notification.vue
- src/components/notifications/notifications.js 2 additions, 1 deletionsrc/components/notifications/notifications.js
- src/components/notifications/notifications.scss 0 additions, 4 deletionssrc/components/notifications/notifications.scss
- src/components/post_status_form/post_status_form.js 6 additions, 0 deletionssrc/components/post_status_form/post_status_form.js
- src/components/post_status_form/post_status_form.vue 4 additions, 3 deletionssrc/components/post_status_form/post_status_form.vue
- src/components/settings/settings.js 3 additions, 0 deletionssrc/components/settings/settings.js
- src/components/settings/settings.vue 3 additions, 11 deletionssrc/components/settings/settings.vue
- src/components/side_drawer/side_drawer.js 2 additions, 2 deletionssrc/components/side_drawer/side_drawer.js
Loading
Please register or sign in to comment