github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity
3,751 Commits
501 Branches
149 Tags
113 MiB
Commit Graph

3751 Commits (a45ef3d72e5aab56c00a57a3a4c722d2181762c1)

Author SHA1 Message Date
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
Kevan Ahlquist ce90515c95 Added network graph 2015-08-29 00:40:24 -05:00
Kevan Ahlquist 5a51495432 Added remaining memory stats, change humansize filter to give more accurate sizes. 2015-08-28 23:26:39 -05:00
Kevan Ahlquist b99fe5bf55 Added memory usage graph. 2015-08-27 01:41:45 -05:00
Kevan Ahlquist d243a83c5c Implemented CPU usage graph, upgraded to Chart.js 1.0.2, broke dashboard charts, tests. 2015-08-26 01:28:08 -05:00
Kevan Ahlquist 6cb658a1ef Fixed grunt style warnings. 2015-08-25 01:07:08 -05:00
Kevan Ahlquist 8a7f8f7c37 Whitespace diff, ran everything through the formatter. 2015-08-25 00:59:54 -05:00
Kevan Ahlquist b7daf91723 Current progress on stats page, nonfunctional. 2015-08-25 00:55:54 -05:00
Kevan Ahlquist 66894e7596 Merge pull request #133 from kgutwin/f-volume-network 
Fix VolumesFrom display issue with Swarm, add option to view stopped containers in network tab.
 2015-08-24 20:40:11 -05:00
Karl Gutwin 7748adf0e6 Color and edge cleanup 2015-08-12 16:38:50 -04:00
Karl Gutwin 758ac41648 Color and edge cleanup 2015-08-12 16:37:19 -04:00
Karl Gutwin 3db2008c39 Have to provide a color 2015-08-12 16:22:31 -04:00
Karl Gutwin 34a3f8186a Missed passing run state 2015-08-12 16:20:28 -04:00
Karl Gutwin 8e0baf0e37 Optionally include stopped containers 2015-08-12 16:01:33 -04:00
Karl Gutwin 017863bfc0 VolumesFrom support container names 2015-08-12 14:47:47 -04:00
Kevan Ahlquist f4ef63b8f8 Merge pull request #125 from hmichopoulos/dockerui-118 
dockerui-118 Pull images / create container from repo image
 2015-07-31 19:48:09 -05:00
Haris Michopoulos 394f2f2387 dockerui-118 How to pull images / create container from repo image ? 
-Fixed ViewSpinner variable.
-Hide the modal on submit, show Spinner and show again modal if needed (in case of error)
-Clear modal values after successful pull
 2015-06-22 23:30:16 +02:00
Haris Michopoulos 5dd094e0b1 dockerui-118 How to pull images / create container from repo image ? 
Added a modal dialog that gets user's input (registry, repo, image name and tag) and performs the pull. Some hack was needed to parse the response, since it is not valid json (actually, it seems to be concatenated json objects).
 2015-06-05 17:21:52 +02:00
Kevan Ahlquist 7d073fdf0d Merge pull request #100 from crosbymichael/events 
Events
 2015-05-28 16:33:36 -05:00
Kevan Ahlquist e806214d0b Merge branch 'master' into events 2015-05-20 23:44:32 -05:00
Kevan Ahlquist 419bf0aa77 Merge pull request #121 from cristiangauma/master 
Adding protocol select menu in portBinding during container creation
 2015-05-20 23:32:23 -05:00
Cristiangauma cad8a6dc91 Adding protocol select menu in portBinding during container creation 2015-05-19 22:42:24 +02:00
Kevan Ahlquist ef3596ff32 Merge branch 'master' into events 
Conflicts:
	app/app.js
	index.html
 2015-05-14 01:33:08 -05:00
Kevan Ahlquist 74dcec8b6b Merge pull request #12 from crosbymichael/master 
Sync fork with latest master.
 2015-05-14 01:19:42 -05:00
Kevan Ahlquist c0ae0d8d3f Merge branch 'crosbymichael-master' into bharat-add-commit 
Conflicts:
	app/components/container/container.html
 2015-05-14 01:01:26 -05:00
Kevan Ahlquist 4637c5fbbd Merge pull request #115 from BrockFredin/master 
Restart Feature - Implementing restart feature for single containers
 2015-05-14 00:50:26 -05:00
Fredin, Brock 74c92de1d3 Revert "DockerUI - Comment in Services was broken link. Updated the comment to include the most accurate link representing the Docker API reference material" 
This reverts commit f167f5b49e.
 2015-05-14 00:27:55 -05:00