Anthony Lapenna b45c4f8bea Merge branch 'develop' into demo ...

Conflicts:
	app/components/settings/settings.html

2017-11-13 12:07:24 +01:00

..

bolt

feat(stacks): add support for stack deploy (#1280)

2017-10-15 19:24:40 +02:00

cli

chore(build-system): make assets default relative, serve assets from assets/public (#1309)

2017-10-26 11:17:45 +02:00

cmd/portainer

Merge branch 'develop' into demo

2017-11-08 09:33:45 +01:00

cron

feat(api): TLS endpoint creation and init overhaul (#1173)

2017-09-14 08:08:37 +02:00

crypto

fix(tls): fix an issue with TLSConfig ignored when using LDAP StartTLS

2017-09-21 17:19:43 +02:00

exec

feat(stacks): add the ability to specify env vars when deploying stacks (#1345)

2017-11-01 10:30:02 +01:00

file

feat(stacks): add support for stack deploy (#1280)

2017-10-15 19:24:40 +02:00

git

feat(stacks): add support for stack deploy (#1280)

2017-10-15 19:24:40 +02:00

http

Merge branch 'develop' into demo

2017-11-08 09:33:45 +01:00

jwt

feat(uac): add multi user management and UAC (#647)

2017-03-12 17:24:15 +01:00

ldap

fix(ldap): prevent panic if search error arise (#1216)

2017-09-20 20:58:09 +02:00

errors.go

Merge branch 'develop' into 'demo'

2017-10-15 20:27:59 +02:00

portainer.go

chore(version): bump version number

2017-11-13 10:11:11 +01:00

swagger.yaml

chore(version): bump version number

2017-11-13 10:11:11 +01:00