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
Dane Everitt
339d2d286d
Forgotten routes into v1 namespace 2017-09-30 18:37:08 -05:00
Dane Everitt
1bfc016e1b
Clean up route handling 2017-09-30 18:35:44 -05:00
Jakob Schrettenbrunner
7b9c67d508 api: improve routes 2017-08-31 23:57:33 +02:00
Jakob Schrettenbrunner
3d789c0541 api: better routes 2017-08-02 23:23:41 +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