-
- Downloads
Merge branch 'master' into 'feature/update-and-move-emoji-packs'
# Conflicts: # src/utils/request.js
No related branches found
No related tags found
Showing
- CHANGELOG.md 5 additions, 0 deletionsCHANGELOG.md
- src/api/__mocks__/users.js 19 additions, 8 deletionssrc/api/__mocks__/users.js
- src/api/initialDataForConfig.js 0 additions, 117 deletionssrc/api/initialDataForConfig.js
- src/api/users.js 32 additions, 18 deletionssrc/api/users.js
- src/store/modules/settings.js 1 addition, 6 deletionssrc/store/modules/settings.js
- src/store/modules/users.js 67 additions, 33 deletionssrc/store/modules/users.js
- src/utils/request.js 10 additions, 7 deletionssrc/utils/request.js
- src/views/reports/components/TimelineItem.vue 8 additions, 6 deletionssrc/views/reports/components/TimelineItem.vue
- src/views/users/components/MultipleUsersMenu.vue 33 additions, 51 deletionssrc/views/users/components/MultipleUsersMenu.vue
- src/views/users/index.vue 9 additions, 5 deletionssrc/views/users/index.vue
- test/views/users/index.test.js 18 additions, 28 deletionstest/views/users/index.test.js
- test/views/users/multipleUsersMenu.test.js 0 additions, 7 deletionstest/views/users/multipleUsersMenu.test.js
Loading
Please register or sign in to comment