Merge branch 'main' into 'Badges'
# Conflicts: # spec.json # src/components/BaseComponents/NavBar.vue
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 16 additions, 13 deletions.gitlab-ci.yml
- spec.json 73 additions, 75 deletionsspec.json
- src/api/index.ts 4 additions, 0 deletionssrc/api/index.ts
- src/api/models/BankIDRequest.ts 9 additions, 0 deletionssrc/api/models/BankIDRequest.ts
- src/api/models/NotificationDTO.ts 19 additions, 0 deletionssrc/api/models/NotificationDTO.ts
- src/api/services/AuthenticationService.ts 19 additions, 0 deletionssrc/api/services/AuthenticationService.ts
- src/api/services/FriendService.ts 1 addition, 1 deletionsrc/api/services/FriendService.ts
- src/api/services/GoalService.ts 1 addition, 3 deletionssrc/api/services/GoalService.ts
- src/api/services/NotificationService.ts 77 additions, 0 deletionssrc/api/services/NotificationService.ts
- src/api/services/RedirectService.ts 26 additions, 0 deletionssrc/api/services/RedirectService.ts
- src/api/services/UserService.ts 0 additions, 4 deletionssrc/api/services/UserService.ts
- src/components/BaseComponents/NavBar.vue 56 additions, 24 deletionssrc/components/BaseComponents/NavBar.vue
Loading
Please register or sign in to comment