-
- Downloads
Merge branch 'develop' into 'feature/update-styles'
# Conflicts: # src/router/index.js # src/views/emojiPacks/index.vue # src/views/invites/index.vue # src/views/layout/components/Sidebar/Item.vue
Showing
- CHANGELOG.md 21 additions, 3 deletionsCHANGELOG.md
- src/api/__mocks__/status.js 1 addition, 1 deletionsrc/api/__mocks__/status.js
- src/api/__mocks__/users.js 12 additions, 3 deletionssrc/api/__mocks__/users.js
- src/api/emojiPacks.js 12 additions, 14 deletionssrc/api/emojiPacks.js
- src/api/mediaProxyCache.js 43 additions, 0 deletionssrc/api/mediaProxyCache.js
- src/api/mediaUpload.js 19 additions, 0 deletionssrc/api/mediaUpload.js
- src/api/users.js 20 additions, 0 deletionssrc/api/users.js
- src/lang/en.js 40 additions, 9 deletionssrc/lang/en.js
- src/router/index.js 15 additions, 0 deletionssrc/router/index.js
- src/store/index.js 8 additions, 6 deletionssrc/store/index.js
- src/store/modules/emojiPacks.js 72 additions, 21 deletionssrc/store/modules/emojiPacks.js
- src/store/modules/mediaProxyCache.js 69 additions, 0 deletionssrc/store/modules/mediaProxyCache.js
- src/store/modules/normalizers.js 60 additions, 77 deletionssrc/store/modules/normalizers.js
- src/store/modules/reports.js 17 additions, 5 deletionssrc/store/modules/reports.js
- src/store/modules/settings.js 3 additions, 4 deletionssrc/store/modules/settings.js
- src/store/modules/users.js 41 additions, 17 deletionssrc/store/modules/users.js
- src/views/emojiPacks/components/LocalEmojiPack.vue 58 additions, 11 deletionssrc/views/emojiPacks/components/LocalEmojiPack.vue
- src/views/emojiPacks/components/RemoteEmojiPack.vue 18 additions, 12 deletionssrc/views/emojiPacks/components/RemoteEmojiPack.vue
- src/views/emojiPacks/components/SingleEmojiEditor.vue 1 addition, 1 deletionsrc/views/emojiPacks/components/SingleEmojiEditor.vue
- src/views/emojiPacks/index.vue 92 additions, 54 deletionssrc/views/emojiPacks/index.vue
Loading
Please register or sign in to comment