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

..

_testdata

Change to using yml for configuration files

2017-09-30 17:25:04 -05:00

websockets

refactor websockets implementation

2018-03-14 10:34:06 +01:00

api.go

Merge branch 'develop' into feature/docker-environment

2018-05-16 10:00:07 +02:00

auth_test.go

rename to new lowercase github namespace

2018-02-20 21:25:31 +01:00

auth.go

Merge branch 'develop' into feature/docker-environment

2018-05-16 10:00:07 +02:00

handlers_server_test.go

rename to new lowercase github namespace

2018-02-20 21:25:31 +01:00

handlers_server.go

lots of api changes

2018-02-20 23:36:17 +01:00

handlers_test.go

api: better routes

2017-08-02 23:23:41 +02:00

handlers.go

Merge branch 'develop' into feature/docker-environment

2018-05-16 10:00:07 +02:00

routes.go

lots of api changes

2018-02-20 23:36:17 +01:00

utils.go

lots of api changes

2018-02-20 23:36:17 +01:00