github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity
1,562 Commits
498 Branches
146 Tags
110 MiB
Commit Graph

852 Commits (55b50c2a49ee05627b8bdd9e6c66c6c16b4769e9)

Author SHA1 Message Date
Kevan Ahlquist a712d5b77e Progress on Networks. 2015-12-17 23:35:04 -06:00
Kevan Ahlquist c3f22fe989 Add custom logo. 2015-12-17 00:08:29 -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 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 064ffe2a7c Don't use self-closing select element, causes silent render error on Chrome. 2015-11-26 21:12:53 -06:00
User 3ac1ac6086 Fix containers, images chart scale too small 2015-10-10 17:04:19 +08: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 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
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
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
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 e806214d0b Merge branch 'master' into events 2015-05-20 23:44:32 -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 c0ae0d8d3f Merge branch 'crosbymichael-master' into bharat-add-commit 
Conflicts:
	app/components/container/container.html
 2015-05-14 01:01: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
Fredin, Brock 1688dbd8a0 Merge branch 'master' of https://github.com/BrockFredin/dockerui 
* 'master' of https://github.com/BrockFredin/dockerui:
  Restart Feature - Implementing restart feature for single containers
 2015-05-14 00:22:19 -05:00
Fredin, Brock f167f5b49e DockerUI - Comment in Services was broken link. Updated the comment to include the most accurate link representing the Docker API reference material 2015-05-14 00:21:53 -05:00
Bharath Thiruveedula 968efed6c3 Adding commit button 2015-05-12 22:23:19 +05:30
Fredin, Brock c10dc38a89 Restart Feature - Implementing restart feature for single containers 2015-05-12 00:52:12 -05:00
Roger Abelenda edd6a41d6e Add actions to show upstream and downstream dependencies of a container for easy visualization. 
Additionally updated angular-vis to use version 0.0.4 which already includes the changes of https://github.com/visjs/angular-visjs/pull/22.
 2015-05-02 12:04:31 -03:00
Roger Abelenda 9e713b7b81 Add several 
- Add search box to easily find containers in network. This required an addition to angular-vis which is in a pending pull request: https://github.com/visjs/angular-visjs/pull/22
- Add tooltip to easily visualize container id and image name.
- Add options to hide containers (and showAll to reset view) to ease visualization when there are too many containers.
 2015-05-01 21:41:10 -03:00
Roger Abelenda 008884ec59 Change code to pass lint checks and add angular-vis to karma config for tests to pass. 2015-04-28 23:09:03 -03:00
Roger Abelenda 7cda9a0c7b Add a containers network tab to be able to easily visualize links and volumesFrom relations between containers. 2015-04-25 14:02:24 -03:00
Kevan Ahlquist 6012453d2d Switch to ngOboe, for DI and promise interface. 2015-04-18 23:06:58 -07:00
Kevan Ahlquist 2514672c35 Merge commit '964eac6d530a7600459f92c312d79ee9365b0f9b' into events 
Conflicts:
	app/app.js
	test/unit/app/components/containerController.spec.js
 2015-04-18 21:26:15 -07:00
Houssem BELHADJ AHMED ede37e2e79 Add Docker top feature 2015-03-31 23:37:03 +02:00
Kevan Ahlquist 6080e097da Added date ranges to events. 2015-03-27 16:25:30 -05:00
Kevan Ahlquist 32a4703a53 Added events endpoint. 2015-03-26 14:12:44 -05:00
Houssem BELHADJ AHMED c971189286 Add rename feature 2015-03-12 22:28:01 +01:00
Houssem BELHADJ AHMED f29eaa28ba Jshint & test fix 2015-03-08 18:19:51 +01:00
Kevan Ahlquist fb0a0827b6 Merge commit '974ed1fe0598533747c2cf4c2f21d7830d484431' 
Conflicts:
	app/components/containerLogs/containerLogsController.js
 2015-02-24 23:32:38 -06:00
jonny64 66ba60c475 logs: added spinner during refresh 2015-02-21 18:09:12 +00:00
Kevan Ahlquist 65f7e32f94 Strip headers from logs before display, fixes #94 2015-02-18 22:56:55 -06:00
jonny64 b257216194 logs: reload button 2015-02-16 18:42:46 +00:00
jonny64 df5e7bc867 logs: removed debugging 2015-02-16 18:18:34 +00:00
jonny64 53041efaf1 logs: tail also STDERR 2015-02-16 17:42:02 +00:00
jonny64 87131f4ae3 Merge remote-tracking branch 'origin/master' into logs_tail 2015-02-16 17:37:04 +00:00
Kevan Ahlquist f66bcfd4ea Merge latest changes from crosbymichael/dockerui. 2015-02-14 14:23:48 -06:00
Kevan Ahlquist da60a70f43 Merge pull request #92 from dasJ/image 
Fix values on images page
 2015-02-14 14:08:55 -06:00
Janne Heß ad6e0acab1 Correctly humanize RAM size on info page 2015-02-13 21:35:57 +01:00
Janne Heß 14d4397868 Rename settings page to info 
You can't change any settings in the settings page, so the title is
missleading.
 2015-02-13 21:35:57 +01:00
Janne Heß f32aadedfb Add more information to the settings page 
Now shows all information we can get from the info object.
Exceptions: Name and NEventsListener, those don't seem to work.
 2015-02-13 21:35:57 +01:00
Janne Heß b888081f54 Fix values on images page 
Update to current Docker API and add virtual size of the image.
Also replace the deprecated Comment with some informations about the
build machine.
 2015-02-13 21:22:08 +01:00
Janne Heß 9284e4b451 Make text next to "Display All" clickable 2015-02-13 14:32:03 +01:00
Kevan Ahlquist 65d0b0110d Consume image IDs that contain slashes, fix container port labels, be nicer about old browsers. 2015-02-13 01:13:04 -06:00
Kevan Ahlquist 0d4274fdeb Added restart to container list actions. 2015-02-09 23:10:05 -06:00
Kevan Ahlquist c7ebe9d881 Added timestamp option to stderr. 2015-02-09 23:00:34 -06:00
Hendrik Hofstadt 8abb445bd4 nicer solution for checking the action 2015-02-09 20:06:28 +01:00
Hendrik Hofstadt dabb1926a5 fixed all HostConfigs being lost when starting from the list 2015-02-08 19:59:26 +01:00
Hendrik Hofstadt 829ff5da73 fixed loss of hostconfig when starting with batch 2015-02-07 23:02:35 +01:00
jonny64 aead1fcc29 logs page: slow on huge logs - 'show last lines' option 2015-02-05 19:23:57 +00:00
Kevan Ahlquist 3d251fdba4 Fixes #75 2015-02-01 17:15:58 -06:00
Kevan Ahlquist 990456dbdd Style tweaks for container start modal. 2015-01-31 14:42:10 -06:00
Kevan Ahlquist fd68039cb9 Added ExtraHosts option. 2015-01-28 19:26:48 -06:00
Kevan Ahlquist a80971dd27 Implemented RestartPolicy, Devices, and LxcConf. Unified label convention. 2015-01-28 02:28:41 -06:00
Kevan Ahlquist 687ed7bac2 Fixed Cmd parsing for strings, added error handling to start step. 2015-01-25 19:18:46 -06:00
Kevan Ahlquist f75d298fe1 Cleaned up controller methods, Added placeholders, fixed PortBindings and error messages. 2015-01-25 17:59:08 -06:00
Kevan Ahlquist 4682ae4ca7 Implemented remaining container creation options. 2015-01-25 15:52:40 -06:00
Kevan Ahlquist c8213bbf33 Added VolumesFrom to container start. 2015-01-20 23:31:57 -06:00
Kevan Ahlquist 4d22a04484 Added ENV variables to container start. 2015-01-20 01:44:30 -06:00
Kevan Ahlquist 76d7e280f9 Added PortBindings to container start. 2015-01-18 23:27:56 -06:00
Kevan Ahlquist f65fed8d0a Fixed grunt template issues, version bump. 2015-01-18 16:39:10 -06:00
Kevan Ahlquist 1784719047 Added unit tests for filters. 2015-01-04 20:35:47 -06:00
Kevan Ahlquist ab2819addd Cleaned up linter errors. 2015-01-03 18:39:40 -06:00
Kevan Ahlquist e507af62aa Merge branch 'master' into feature/build 
Conflicts:
	app/app.js
	index.html
 2015-01-03 17:01:02 -06:00
Kevan Ahlquist 58bd6faa47 Added initial files for build and test automation. 2015-01-03 16:49:28 -06:00
Kevan Ahlquist b70b3f3100 Added module for container logs. 2014-12-15 16:26:10 -06:00
Kevan Ahlquist 57d8ae3e01 Misc. html/css tweaks, bumped version. 2014-12-01 00:13:53 -06:00
Kevan Ahlquist ada1c6a4e4 Moved LineChart to services, cleaned up remaining functions in controller, cleanup. 2014-11-29 00:06:06 -06:00
Kevan Ahlquist e3eb37ba56 Moved builder to its own submodule 2014-11-28 22:24:55 -06:00
Kevan Ahlquist 306d2db03e Moved settings to its own submodule 2014-11-28 22:19:24 -06:00
Kevan Ahlquist 604fd1de3b Moved sidebar to its own submodule 2014-11-28 22:11:56 -06:00
Kevan Ahlquist 57fef1c958 Move startContainer to its own submodule. 2014-11-12 12:31:02 -06:00
Kevan Ahlquist 3a28cb9889 Move image to its own submodule. 2014-11-12 12:11:36 -06:00
Kevan Ahlquist 3072a05c5a Move images to its own submodule. 2014-11-12 11:59:55 -06:00
Kevan Ahlquist ce8d349daf Move containers to its own submodule. 2014-11-12 11:54:49 -06:00
Kevan Ahlquist c09dfc1276 Move container to its own submodule. 2014-11-12 11:48:13 -06:00
Kevan Ahlquist 3b0ea539b8 Move dashboard to its own submodule. 2014-11-12 11:31:27 -06:00
Kevan Ahlquist 20b7e16ed4 Move footer to its own submodule. 2014-11-12 11:04:04 -06:00
Kevan Ahlquist 07183e20f1 Move masthead to its own submodule. 2014-11-12 10:45:13 -06:00
Kevan Ahlquist a9a36323eb Refactoring, moved all assets into /assets, all angular files moved to /app. 2014-11-02 23:58:57 -06:00