-
- Downloads
Merge branch 'main' of https://git.gvk.idi.ntnu.no/aleksaab/stillastracker into Martin
Conflicts: api/endpoints/APIHandler.go api/endpoints/trackingTools.go
Showing
- api/.gitignore 1 addition, 0 deletionsapi/.gitignore
- api/cmd/main.go 3 additions, 5 deletionsapi/cmd/main.go
- api/constants/constants.go 2 additions, 2 deletionsapi/constants/constants.go
- api/database/databaseSetup.go 0 additions, 3 deletionsapi/database/databaseSetup.go
- api/endpoints/APIHandler.go 20 additions, 4 deletionsapi/endpoints/APIHandler.go
- api/endpoints/profiles.go 15 additions, 18 deletionsapi/endpoints/profiles.go
- api/endpoints/projects.go 2 additions, 6 deletionsapi/endpoints/projects.go
- api/endpoints/scaffolding.go 0 additions, 3 deletionsapi/endpoints/scaffolding.go
- api/endpoints/trackingTools.go 97 additions, 67 deletionsapi/endpoints/trackingTools.go
- api/go.mod 2 additions, 0 deletionsapi/go.mod
- api/go.sum 4 additions, 0 deletionsapi/go.sum
- api/struct/ProfileStruct.go 2 additions, 2 deletionsapi/struct/ProfileStruct.go
- api/struct/ScaffoldingStruct.go 4 additions, 4 deletionsapi/struct/ScaffoldingStruct.go
- dockerUpdates.txt 285 additions, 0 deletionsdockerUpdates.txt
- stillasMobileApplication/stillasMobileApplication/Assets.xcassets/UserProfile.imageset/Contents.json 21 additions, 0 deletions...cation/Assets.xcassets/UserProfile.imageset/Contents.json
- stillasMobileApplication/stillasMobileApplication/Assets.xcassets/UserProfile.imageset/clipart2557794.png 0 additions, 0 deletions...n/Assets.xcassets/UserProfile.imageset/clipart2557794.png
- stillasMobileApplication/stillasMobileApplication/ContentView.swift 1 addition, 1 deletion...ileApplication/stillasMobileApplication/ContentView.swift
- stillasMobileApplication/stillasMobileApplication/Resources/projectData.json 60 additions, 0 deletions...ation/stillasMobileApplication/Resources/projectData.json
- stillasMobileApplication/stillasMobileApplication/Resources/userData.json 10 additions, 0 deletions...lication/stillasMobileApplication/Resources/userData.json
- stillasMobileApplication/stillasMobileApplication/Views/Cache/CacheEntry.swift 25 additions, 0 deletions...ion/stillasMobileApplication/Views/Cache/CacheEntry.swift
Loading
Please register or sign in to comment