Merge branch 'master' into '859-include-dynamic-titles-in-app-bar-of-new-spa'
# Conflicts: # CHANGELOG.rst # aleksis/core/frontend/index.js
No related branches found
No related tags found
Pipeline #129196 failed
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Showing
- CHANGELOG.rst 8 additions, 0 deletionsCHANGELOG.rst
- aleksis/core/frontend/components/app/SideNav.vue 8 additions, 2 deletionsaleksis/core/frontend/components/app/SideNav.vue
- aleksis/core/frontend/components/app/permissions.graphql 8 additions, 0 deletionsaleksis/core/frontend/components/app/permissions.graphql
- aleksis/core/frontend/components/app/whoAmI.graphql 1 addition, 5 deletionsaleksis/core/frontend/components/app/whoAmI.graphql
- aleksis/core/frontend/index.js 3 additions, 0 deletionsaleksis/core/frontend/index.js
- aleksis/core/frontend/mixins/menus.js 6 additions, 18 deletionsaleksis/core/frontend/mixins/menus.js
- aleksis/core/frontend/mixins/permissions.js 55 additions, 0 deletionsaleksis/core/frontend/mixins/permissions.js
- aleksis/core/frontend/plugins/aleksis.js 10 additions, 0 deletionsaleksis/core/frontend/plugins/aleksis.js
- aleksis/core/frontend/routes.js 1 addition, 8 deletionsaleksis/core/frontend/routes.js
Loading
Please register or sign in to comment