Commit Graph

6 Commits

Author SHA1 Message Date
Jakob Schrettenbrunner
44f42eec8c Merge branch 'develop' of github.com:Pterodactyl/wings into develop
# Conflicts:
#	api/api.go
#	api/core_routes.go
#	api/handlers_server.go
#	api/routes_server.go
#	config.example.json
#	utils/logging.go
2017-10-01 20:59:32 +02:00
Jakob Schrettenbrunner
c979285eb9 current state of api & docker env implementation 2017-10-01 20:42:17 +02:00
Dane Everitt
1bfc016e1b
Clean up route handling 2017-09-30 18:35:44 -05:00
Jakob Schrettenbrunner
40836a5ec4 api: rewrite auth to handle new routes
api: add functions to retrieve auth handler and server from a gin.Context
2017-08-02 23:47:09 +02:00
Jakob Schrettenbrunner
91ff924933 api: add first status implementation on / 2017-08-02 22:49:59 +02:00
Jakob Schrettenbrunner
059ea8a047 add all old routes and handlers
add html index page when not authenticated
fixed auth's handling of empty permissions
2017-08-02 22:02:34 +02:00