Merge branch 'develop' into 'master'
Update master See merge request pleroma/pleroma-fe!646
Showing
- .eslintrc.js 1 addition, 1 deletion.eslintrc.js
- package.json 2 additions, 0 deletionspackage.json
- src/App.scss 16 additions, 17 deletionssrc/App.scss
- src/components/attachment/attachment.vue 1 addition, 1 deletionsrc/components/attachment/attachment.vue
- src/components/basic_user_card/basic_user_card.js 28 additions, 0 deletionssrc/components/basic_user_card/basic_user_card.js
- src/components/basic_user_card/basic_user_card.vue 79 additions, 0 deletionssrc/components/basic_user_card/basic_user_card.vue
- src/components/block_card/block_card.js 37 additions, 0 deletionssrc/components/block_card/block_card.js
- src/components/block_card/block_card.vue 34 additions, 0 deletionssrc/components/block_card/block_card.vue
- src/components/chat_panel/chat_panel.vue 9 additions, 2 deletionssrc/components/chat_panel/chat_panel.vue
- src/components/follow_card/follow_card.js 45 additions, 0 deletionssrc/components/follow_card/follow_card.js
- src/components/follow_card/follow_card.vue 53 additions, 0 deletionssrc/components/follow_card/follow_card.vue
- src/components/follow_list/follow_list.js 0 additions, 65 deletionssrc/components/follow_list/follow_list.js
- src/components/follow_list/follow_list.vue 0 additions, 33 deletionssrc/components/follow_list/follow_list.vue
- src/components/follow_request_card/follow_request_card.js 20 additions, 0 deletionssrc/components/follow_request_card/follow_request_card.js
- src/components/follow_request_card/follow_request_card.vue 29 additions, 0 deletionssrc/components/follow_request_card/follow_request_card.vue
- src/components/follow_requests/follow_requests.js 2 additions, 11 deletionssrc/components/follow_requests/follow_requests.js
- src/components/follow_requests/follow_requests.vue 1 addition, 1 deletionsrc/components/follow_requests/follow_requests.vue
- src/components/gallery/gallery.vue 3 additions, 1 deletionsrc/components/gallery/gallery.vue
- src/components/image_cropper/image_cropper.js 128 additions, 0 deletionssrc/components/image_cropper/image_cropper.js
- src/components/image_cropper/image_cropper.vue 42 additions, 0 deletionssrc/components/image_cropper/image_cropper.vue
Loading
Please register or sign in to comment