Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

S

stillasTracker
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

4268ff1f

Commit 4268ff1f authored 3 years ago by Aleksander Aaboen

Downloads
- Plain Diff

Merge branch 'main' of https://git.gvk.idi.ntnu.no/aleksaab/stillastracker into Alex

 Conflicts:
	api/endpoints/APIHandler.go
	api/endpoints/projects.go

parents 54e13412 c3aab066

No related branches found

No related tags found

1 merge request!52Merge Branch Alex

Changes 11

Expand all Show whitespace changes

Inline Side-by-side

Showing

api/Dockerfile 11 additions, 0 deletions

api/Dockerfile
api/apiTools/basicTools.go 58 additions, 15 deletions

api/apiTools/basicTools.go
api/database/databaseSetup.go 0 additions, 1 deletion

api/database/databaseSetup.go
api/docker-compose.yml 9 additions, 0 deletions

api/docker-compose.yml
api/endpoints/APIHandler.go 42 additions, 27 deletions

api/endpoints/APIHandler.go
api/endpoints/diagnostics.go 0 additions, 19 deletions

api/endpoints/diagnostics.go
api/endpoints/homePage.go 34 additions, 0 deletions

api/endpoints/homePage.go
api/endpoints/profiles.go 209 additions, 137 deletions

api/endpoints/profiles.go
api/endpoints/projectTools.go 29 additions, 55 deletions

api/endpoints/projectTools.go
api/endpoints/projects.go 173 additions, 179 deletions

api/endpoints/projects.go
api/endpoints/scaffolding.go 87 additions, 34 deletions

api/endpoints/scaffolding.go

with 652 additions and 467 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment