Merge branch 'master' into...
Merge branch 'master' into '856-language-select-uses-english-as-default-language-and-not-browser-language' # Conflicts: # CHANGELOG.rst
No related branches found
No related tags found
Pipeline #129209 failed
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Showing
- CHANGELOG.rst 10 additions, 0 deletionsCHANGELOG.rst
- aleksis/core/frontend/components/app/App.vue 1 addition, 1 deletionaleksis/core/frontend/components/app/App.vue
- 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/components/authorized_oauth_applications/AuthorizedApplications.vue 0 additions, 1 deletion.../authorized_oauth_applications/AuthorizedApplications.vue
- aleksis/core/frontend/components/two_factor/TwoFactor.vue 0 additions, 1 deletionaleksis/core/frontend/components/two_factor/TwoFactor.vue
- aleksis/core/frontend/index.js 4 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 38 additions, 0 deletionsaleksis/core/frontend/plugins/aleksis.js
- aleksis/core/frontend/routes.js 3 additions, 8 deletionsaleksis/core/frontend/routes.js
- aleksis/core/settings.py 2 additions, 2 deletionsaleksis/core/settings.py
- aleksis/core/urls.py 1 addition, 1 deletionaleksis/core/urls.py
Loading
Please register or sign in to comment