github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity
3,327 Commits
499 Branches
147 Tags
111 MiB
Commit Graph

3327 Commits (8d4cb5e16b5f6c157c8138e4d8ad5510be10fdfa)

Author SHA1 Message Date
Kevan Ahlquist a198382c06 Bump stats endpoint timeout to 5 seconds, retry on error. 2016-01-23 16:39:31 -06:00
Kevan Ahlquist 316017c516 Merge pull request #172 from chazmuzz/master 
Use NetworkSettings.Ports rather than HostConfig.PortBindings
 2016-01-18 23:34:09 -06:00
Charlie Murray f62cb483ce Use NetworkSettings.Ports rather than HostConfig.PortBindings to diplay host port bindings 2016-01-18 11:05:08 +00:00
Kevan Ahlquist 44c88f1ed5 Merge pull request #170 from kevana/stats-fix 
Fix network stats error for 1.9.0+ clients, hide networks and volumes…
 2016-01-10 22:00:38 -06:00
Kevan Ahlquist 9d1193c0b5 Fix network stats error for 1.9.0+ clients, hide networks and volumes better on older clients. 2016-01-10 21:51:51 -06:00
Kevan Ahlquist 22d35eb32f Merge pull request #162 from kevana/networks-volumes 
Networks and Volumes
 2016-01-10 20:39:14 -06:00
Kevan Ahlquist 2683ddb1ee Add refresh button. 2016-01-10 20:36:22 -06:00
Kevan Ahlquist fe7646e939 Use localStorage to only show 'learn more' banner on first load. 2016-01-10 20:02:04 -06:00
Kevan Ahlquist 00528edd7c Merge branch 'master' into networks-volumes 2016-01-10 19:34:03 -06:00
Michael Crosby 06c2ac4d5c Merge pull request #168 from linquize/chart-max-steps 
Show maximum 10 steps of chart
 2016-01-04 09:28:58 -08:00
Michael Crosby a447d64d83 Merge pull request #169 from linquize/desc 
Change the description of DockerUI
 2016-01-04 09:27:17 -08:00
Linquize 9260f23d41 DockerUI is the UI for Docker container engine 
It is not only on Linux, but on Windows too.
 2016-01-03 13:55:27 +08:00
Linquize d7082c3959 Show maximum 10 steps of chart 2016-01-03 12:59:43 +08:00
Kevan Ahlquist 437e171639 Merge pull request #163 from israelroldan/issue-158 
Redirect to container list when removing a container (Fix for #158)
 2015-12-26 17:54:23 -06:00
Israel Roldan 6de45cd422 Redirect to container list when removing a container (Fixes #158) 2015-12-24 00:04:47 -06:00
Kevan Ahlquist a065e0e259 Merge pull request #160 from crosbymichael/icons 
Add custom logo, nginx basic auth docker-compose example
 2015-12-20 21:25:34 -06:00
Kevan Ahlquist eede27e263 Implement volumes, hide networks and volumes tabs for APIs older than v1.21. 2015-12-20 21:17:01 -06:00
Kevan Ahlquist 8a900254ae Remove unused Dockerfile service, rename services to match API endpoint names: Docker => Version, System => Info. 2015-12-20 20:23:17 -06:00
Kevan Ahlquist 5f4641af67 Catch plaintext errors for creation and connection, implement network creation, 2015-12-20 20:07:57 -06:00
Kevan Ahlquist 8a4be8b93a Implemented single network view, connect, disconnect, remove. 2015-12-20 19:13:53 -06:00
Kevan Ahlquist a712d5b77e Progress on Networks. 2015-12-17 23:35:04 -06:00
Kevan Ahlquist 5947e262fc Added docker-compose config for nginx-basic-auth. 2015-12-17 01:31:07 -06:00
Kevan Ahlquist c3f22fe989 Add custom logo. 2015-12-17 00:08:29 -06:00
Kevan Ahlquist 2f003a5bb5 Merge pull request #159 from crosbymichael/tags-support 
Support RepoTags for versions of the Docker API older than 1.21.
 2015-12-14 22:24:41 -06:00
Kevan Ahlquist 75085b213a Support RepoTags for versions of the Docker API older than 1.21. 2015-12-13 23:28:28 -06:00
Kevan Ahlquist 91968b9f4b Switch to local jquery.gritter, fix undefined variable error in minified build due to "use strict"'; 2015-12-07 00:01:08 -06:00
Kevan Ahlquist d881d97c06 Merge pull request #155 from crosbymichael/labels 
Labels and Image tags
 2015-12-06 15:01:02 -06:00
Kevan Ahlquist 1dd1ce2f47 Allow tagging of repo and version and deletion of multiple tags. 2015-11-27 00:31:03 -06:00
Kevan Ahlquist 640c0b39c1 Add labels to container start and display. 2015-11-26 22:33:41 -06:00
Kevan Ahlquist 25a4607ad6 Merge pull request #154 from crosbymichael/restart-policy 
Don't use self-closing select element
 2015-11-26 21:15:02 -06:00
Kevan Ahlquist 064ffe2a7c Don't use self-closing select element, causes silent render error on Chrome. 2015-11-26 21:12:53 -06:00
Kevan Ahlquist 4d759fbfb9 Merge pull request #144 from linquize/padding 
Remove body.padding-top, it wasted too much space
 2015-10-11 14:38:33 -05:00
Linquize 9c854cb39d Remove body.padding-top, it wasted too much space 2015-10-11 21:13:04 +08:00
Kevan Ahlquist 27799e7033 Merge pull request #143 from linquize/scale 
Fix containers, images chart scale too small
 2015-10-10 16:33:43 -05:00
User 3ac1ac6086 Fix containers, images chart scale too small 2015-10-10 17:04:19 +08:00
Kevan Ahlquist 01db85ebc7 Merge pull request #140 from kevana/bower 
Fix builds
 2015-09-15 22:28:26 -05:00
Kevan Ahlquist cdf4767d7d Use grunt for building 
Add shell commands to gruntfile for local dev.

Build binary if needed for `grunt build`, always build for `grunt release`. Exclude unused assets from jquery.gritter and vis.

Remove Makefile
 2015-09-15 00:24:11 -05:00
Kevan Ahlquist 9bdd96527c Convert services.js for safe minification, preserve license comments in javascript files, add missing recess target, remove oboe-browser.min.js from assets. 2015-09-15 00:24:11 -05:00
Kevan Ahlquist 13e3fed351 Use bower for Angular dependencies. 2015-09-15 00:22:11 -05:00
Kevan Ahlquist 115a293e58 Merge pull request #13 from crosbymichael/master 
Pull latest from origin
 2015-09-13 16:18:12 -05:00
Kevan Ahlquist 9c985e63ee Merge pull request #135 from kevana/stats 
Add view for container stats endpoint.
 2015-09-09 22:58:37 -05:00
Kevan Ahlquist c57a75f78f Merge branch 'master' into stats 
Conflicts:
	app/components/containers/containers.html
	app/components/images/images.html
 2015-09-09 22:55:07 -05:00
Kevan Ahlquist a96298db59 Merge pull request #137 from dasJ/filter 
Allow filtering containers and images
 2015-09-09 22:48:19 -05:00
Kevan Ahlquist 061921af8e Merge pull request #136 from dasJ/editlabel 
Rename save button when renaming container
 2015-09-03 10:53:53 -05:00
Janne Heß 6719c84a7a Allow filtering images 2015-09-03 13:38:23 +02:00
Janne Heß 13f3335098 Allow filtering containers 
Closes #84
 2015-09-03 13:38:09 +02:00
Janne Heß a79c26a7a4 Rename save button when renaming container 
Closes #120
 2015-09-03 13:00:43 +02:00
Kevan Ahlquist abccb316f8 Updated docs links in services. 2015-08-29 02:38:03 -05:00
Kevan Ahlquist f14e954a9b Lower animation steps, keep 20 datapoints, update every 2 seconds. 2015-08-29 02:11:13 -05:00
Kevan Ahlquist 5d4a2a7c25 Fixed dashboard graphs, Chart.js doesn't like charts being hidden on creation, fixed routing issue to dashboard, version bump. 2015-08-29 01:57:08 -05:00