Merge branch 'develop' into fix/icons-and-frontends-settings
No related branches found
No related tags found
Showing
- CHANGELOG.md 8 additions, 1 deletionCHANGELOG.md
- package.json 1 addition, 1 deletionpackage.json
- src/api/__mocks__/settings.js 4 additions, 0 deletionssrc/api/__mocks__/settings.js
- src/api/emojiPacks.js 12 additions, 10 deletionssrc/api/emojiPacks.js
- src/lang/en.js 4 additions, 1 deletionsrc/lang/en.js
- src/store/modules/emojiPacks.js 51 additions, 21 deletionssrc/store/modules/emojiPacks.js
- src/store/modules/reports.js 77 additions, 0 deletionssrc/store/modules/reports.js
- src/views/emojiPacks/components/LocalEmojiPack.vue 19 additions, 9 deletionssrc/views/emojiPacks/components/LocalEmojiPack.vue
- src/views/emojiPacks/components/RemoteEmojiPack.vue 34 additions, 3 deletionssrc/views/emojiPacks/components/RemoteEmojiPack.vue
- src/views/emojiPacks/components/SingleEmojiEditor.vue 2 additions, 2 deletionssrc/views/emojiPacks/components/SingleEmojiEditor.vue
- src/views/emojiPacks/index.vue 38 additions, 9 deletionssrc/views/emojiPacks/index.vue
- src/views/reports/components/ModerateUserDropdown.vue 62 additions, 9 deletionssrc/views/reports/components/ModerateUserDropdown.vue
- src/views/reports/components/Report.vue 1 addition, 1 deletionsrc/views/reports/components/Report.vue
- src/views/reports/index.vue 1 addition, 0 deletionssrc/views/reports/index.vue
- src/views/users/components/NewAccountDialog.vue 1 addition, 1 deletionsrc/views/users/components/NewAccountDialog.vue
- test/views/layout/index.test.js 0 additions, 51 deletionstest/views/layout/index.test.js
- test/views/reports/index.test.js 1 addition, 0 deletionstest/views/reports/index.test.js
- test/views/users/show.test.js 1 addition, 0 deletionstest/views/users/show.test.js
- yarn.lock 1 addition, 1 deletionyarn.lock
Loading
Please register or sign in to comment