Commit Graph

12 Commits

Author SHA1 Message Date
Jakob Schrettenbrunner
09da18f42e Merge branch 'develop' into feature/docker-environment
# Conflicts:
#	.dev/vagrant/provision.sh
#	Gopkg.lock
#	Gopkg.toml
#	Vagrantfile
#	api/api.go
#	api/auth.go
#	api/handlers.go
#	api/handlers_server.go
#	api/routes.go
#	api/utils.go
#	command/root.go
#	control/docker_environment.go
#	control/server.go
#	glide.lock
#	glide.yaml
#	utils/logger.go
#	wings.go
2018-05-16 10:00:07 +02:00
Jakob Schrettenbrunner
184d7e0afe lots of api changes
use jsonapi to format responses
add somewhat working websockets
2018-02-20 23:36:17 +01:00
Dane Everitt
bbc6d26b35
Break more of everything 2018-02-20 15:20:57 -06:00
Jakob Schrettenbrunner
e4e060a82f rename to new lowercase github namespace 2018-02-20 21:25:31 +01:00
Dane Everitt
bacdfae768
Probably breaks everything, lowercase pterodactyl 2018-02-20 13:33:32 -06:00
Jakob Schrettenbrunner
c979285eb9 current state of api & docker env implementation 2017-10-01 20:42:17 +02:00
Jakob Schrettenbrunner
ef28b61136 config: use constants with config keys instead of struct as its easier to handle 2017-08-31 20:13:01 +02: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
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
Jakob Schrettenbrunner
3a65f409d1 rewrite auth
don't disclose auth denial reasons in response
2017-08-02 21:35:15 +02:00
Jakob Schrettenbrunner
0bceb409e5 implement auth middleware 2017-07-06 20:49:36 +02:00
Jakob Schrettenbrunner
06055d6265 unmarshal config into struct with viper for consistent access 2017-06-26 11:07:53 +02:00