Merge branch 'main' into documentation/Javadoc
# Conflicts: # src/components/BaseComponents/NavBar.vue # src/components/Shop/ItemShop.vue # src/views/BankID/RedirectView.vue
No related branches found
No related tags found
Checking pipeline status
Showing
- .env.production 1 addition, 1 deletion.env.production
- README.md 1 addition, 0 deletionsREADME.md
- src/App.vue 0 additions, 2 deletionssrc/App.vue
- src/components/BaseComponents/NavBar.vue 1 addition, 3 deletionssrc/components/BaseComponents/NavBar.vue
- src/components/Friends/UserFriends.vue 5 additions, 3 deletionssrc/components/Friends/UserFriends.vue
- src/components/Settings/SettingsAccount.vue 18 additions, 1 deletionsrc/components/Settings/SettingsAccount.vue
- src/components/Settings/SettingsBank.vue 20 additions, 3 deletionssrc/components/Settings/SettingsBank.vue
- src/components/Settings/SettingsProfile.vue 21 additions, 13 deletionssrc/components/Settings/SettingsProfile.vue
- src/components/Settings/SettingsSecurity.vue 19 additions, 2 deletionssrc/components/Settings/SettingsSecurity.vue
- src/components/Shop/ItemShop.vue 78 additions, 72 deletionssrc/components/Shop/ItemShop.vue
- src/components/UserProfile/ExternalProfile.vue 5 additions, 3 deletionssrc/components/UserProfile/ExternalProfile.vue
- src/components/UserProfile/MyProfile.vue 45 additions, 73 deletionssrc/components/UserProfile/MyProfile.vue
- src/views/BankID/RedirectView.vue 3 additions, 1 deletionsrc/views/BankID/RedirectView.vue
- src/views/User/UserSettingsView.vue 5 additions, 0 deletionssrc/views/User/UserSettingsView.vue
Loading
Please register or sign in to comment