Commit Graph

17 Commits

Author SHA1 Message Date
Jakob Schrettenbrunner
53a3fbc464 remove trailing slashes from api
use correct handler to provide server logs
remove Baerer from Authorization header to compare it with known tokens
fix wings-api.paw routes
2018-05-17 21:18:02 +02:00
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
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
4359d152b7
Butcher the app in an attempt to make it boot past step 1 2018-02-20 14:00:09 -06:00
Dane Everitt
bacdfae768
Probably breaks everything, lowercase pterodactyl 2018-02-20 13:33:32 -06:00
Jakob Schrettenbrunner
72ac95267b fix some merge fails 2017-10-09 21:01:24 +02:00
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
90fd485edf
Lets not, please. 2017-09-30 19:25:45 -05:00
Dane Everitt
1bfc016e1b
Clean up route handling 2017-09-30 18:35:44 -05: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
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
9c364970f0 basic api server initialization 2017-07-06 20:55:26 +02:00
Jakob Schrettenbrunner
7055f0c9b2 update import paths
update Readme with shields
2017-06-26 20:44:37 +02:00
Jakob Schrettenbrunner
06055d6265 unmarshal config into struct with viper for consistent access 2017-06-26 11:07:53 +02:00
Jakob Schrettenbrunner
326fdcae6e very basic thoughts on module and file structure
basic configuration
basic logger
2017-06-19 00:01:44 +02:00