Merge branch 'develop' into fix/reports-shows-up-blank
No related branches found
No related tags found
Showing
- CHANGELOG.md 6 additions, 0 deletionsCHANGELOG.md
- package.json 2 additions, 2 deletionspackage.json
- src/api/__mocks__/app.js 7 additions, 0 deletionssrc/api/__mocks__/app.js
- src/api/__mocks__/users.js 4 additions, 0 deletionssrc/api/__mocks__/users.js
- src/api/app.js 23 additions, 0 deletionssrc/api/app.js
- src/api/settings.js 0 additions, 9 deletionssrc/api/settings.js
- src/components/RebootButton/index.vue 36 additions, 0 deletionssrc/components/RebootButton/index.vue
- src/lang/en.js 1 addition, 1 deletionsrc/lang/en.js
- src/store/modules/app.js 18 additions, 5 deletionssrc/store/modules/app.js
- src/store/modules/settings.js 1 addition, 10 deletionssrc/store/modules/settings.js
- src/styles/sidebar.scss 1 addition, 1 deletionsrc/styles/sidebar.scss
- src/views/emojiPacks/index.vue 44 additions, 16 deletionssrc/views/emojiPacks/index.vue
- src/views/invites/index.vue 26 additions, 4 deletionssrc/views/invites/index.vue
- src/views/layout/components/Navbar.vue 1 addition, 1 deletionsrc/views/layout/components/Navbar.vue
- src/views/moderation_log/index.vue 23 additions, 2 deletionssrc/views/moderation_log/index.vue
- src/views/reports/components/Report.vue 3 additions, 3 deletionssrc/views/reports/components/Report.vue
- src/views/reports/index.vue 33 additions, 9 deletionssrc/views/reports/index.vue
- src/views/settings/components/ActivityPub.vue 4 additions, 1 deletionsrc/views/settings/components/ActivityPub.vue
- src/views/settings/components/Authentication.vue 4 additions, 1 deletionsrc/views/settings/components/Authentication.vue
- src/views/settings/components/AutoLinker.vue 4 additions, 1 deletionsrc/views/settings/components/AutoLinker.vue
Loading
Please register or sign in to comment