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

Conflicts:
	app/portainer/views/settings/settings.html

2018-07-27 18:03:52 +02:00

..

archive

feat(image-build): add the ability to build images (#1672)

2018-02-28 07:19:06 +01:00

bolt

chore(version): bump version number

2018-07-27 16:05:57 +02:00

cli

feat(api): Add npipe support (#2018)

2018-07-20 11:02:06 +02:00

cmd/portainer

Merge branch 'develop' into demo

2018-07-27 18:03:52 +02:00

cron

feat(home): update endpoint list (#2060)

2018-07-23 09:51:33 +02:00

crypto

fix(api): refactor TLS support (#1909)

2018-05-19 16:25:11 +02:00

docker

feat(api): Add npipe support (#2018)

2018-07-20 11:02:06 +02:00

exec

feat(templates): introduce templates management (#2017)

2018-07-03 20:31:02 +02:00

filesystem

feat(templates): introduce templates management (#2017)

2018-07-03 20:31:02 +02:00

git

feat(stack-creation): add the ability to specify git reference (#1948) (#2063)

2018-07-24 16:11:35 +02:00

http

Merge branch 'develop' into demo

2018-07-27 18:03:52 +02:00

jwt

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

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

ldap

feat(authentication/ldap): Auto create and assign LDAP users (#2042)

2018-07-23 06:57:38 +02:00

libcompose

fix(libcompose): fix an issue with TLS enabled endpoints (#2071)

2018-07-24 11:11:47 +02:00

errors.go

Merge branch 'develop' into demo

2018-07-27 18:03:52 +02:00

portainer.go

chore(version): bump version number

2018-07-27 16:05:57 +02:00

swagger.yaml

chore(version): bump version number

2018-07-27 16:05:57 +02:00