-
- Downloads
Merge branch 'develop' into 'feature/route-for-status'
# Conflicts: # src/store/modules/status.js
Showing
- CHANGELOG.md 13 additions, 0 deletionsCHANGELOG.md
- src/api/__mocks__/peers.js 4 additions, 0 deletionssrc/api/__mocks__/peers.js
- src/api/__mocks__/status.js 63 additions, 0 deletionssrc/api/__mocks__/status.js
- src/api/emojiPacks.js 72 additions, 92 deletionssrc/api/emojiPacks.js
- src/api/status.js 2 additions, 2 deletionssrc/api/status.js
- src/lang/en.js 2 additions, 1 deletionsrc/lang/en.js
- src/store/modules/emojiPacks.js 54 additions, 18 deletionssrc/store/modules/emojiPacks.js
- src/store/modules/normalizers.js 9 additions, 0 deletionssrc/store/modules/normalizers.js
- src/store/modules/status.js 11 additions, 2 deletionssrc/store/modules/status.js
- src/views/emojiPacks/components/LocalEmojiPack.vue 5 additions, 5 deletionssrc/views/emojiPacks/components/LocalEmojiPack.vue
- src/views/emojiPacks/components/NewEmojiUploader.vue 18 additions, 19 deletionssrc/views/emojiPacks/components/NewEmojiUploader.vue
- src/views/emojiPacks/components/RemoteEmojiPack.vue 9 additions, 7 deletionssrc/views/emojiPacks/components/RemoteEmojiPack.vue
- src/views/emojiPacks/components/SingleEmojiEditor.vue 45 additions, 36 deletionssrc/views/emojiPacks/components/SingleEmojiEditor.vue
- src/views/emojiPacks/index.vue 8 additions, 1 deletionsrc/views/emojiPacks/index.vue
- src/views/settings/components/ActivityPub.vue 1 addition, 1 deletionsrc/views/settings/components/ActivityPub.vue
- src/views/settings/components/Authentication.vue 3 additions, 3 deletionssrc/views/settings/components/Authentication.vue
- src/views/settings/components/Captcha.vue 1 addition, 1 deletionsrc/views/settings/components/Captcha.vue
- src/views/settings/components/Frontend.vue 7 additions, 7 deletionssrc/views/settings/components/Frontend.vue
- src/views/settings/components/Http.vue 4 additions, 10 deletionssrc/views/settings/components/Http.vue
- src/views/settings/components/Inputs.vue 40 additions, 23 deletionssrc/views/settings/components/Inputs.vue
Loading
Please register or sign in to comment