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

1260 Commits (e065bd4a476c83bd93b6065a6130c4b46f551140)

Author SHA1 Message Date
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
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
Kevan Ahlquist 2bc6b2995d Merge pull request #110 from rabelenda/master 
Add controls for easy visualization when too many containers
 2015-05-06 15:48:04 -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
Kevan Ahlquist 1f8f08e998 Merge pull request #109 from rabelenda/master 
Fix code for lint checks and karma tests
 2015-04-28 22:35:16 -05: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
Kevan Ahlquist 230bfd15ac Merge pull request #108 from rabelenda/master 
Add a containers network tab, visualize links and volumesFrom relations between containers.
 2015-04-26 02:19:52 -05: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
Kevan Ahlquist 964eac6d53 Merge pull request #102 from houssemba/master 
Add Docker top feature
 2015-04-02 09:40:01 -05: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 14bfc57870 Angular version bump to 1.3.15. 2015-03-27 15:16:44 -05:00
Kevan Ahlquist 32a4703a53 Added events endpoint. 2015-03-26 14:12:44 -05:00
Kevan Ahlquist d6c524f960 Merge pull request #99 from houssemba/master 
Rename feature
 2015-03-18 19:28:55 -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 9afe57e0ec Merge pull request #86 from kevana/master 
Small fixes
 2015-02-24 23:33:15 -06:00
Kevan Ahlquist fb0a0827b6 Merge commit '974ed1fe0598533747c2cf4c2f21d7830d484431' 
Conflicts:
	app/components/containerLogs/containerLogsController.js
 2015-02-24 23:32:38 -06:00
Kevan Ahlquist 22cdb94e5d Removed dist files. 2015-02-22 02:40:50 -06:00
Kevan Ahlquist 974ed1fe05 Merge pull request #77 from jonny64/logs_tail 
logs page: slow on huge logs - 'show last lines' option
 2015-02-21 16:03:17 -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
Kevan Ahlquist dd21a4025b Merge commit '1843836f229cadcdace5ca0c1b95fdb21dcfea2b' 
Conflicts:
	dist/dockerui.js
	dist/templates/app.js
 2015-02-18 22:46:37 -06:00
Kevan Ahlquist 1843836f22 Fixed release target in Makefile. 2015-02-18 01:05:51 -06:00
Kevan Ahlquist 44ba4e8bb8 Merge commit '22287e6a56c5a8824da94f2f6b9a464fa3da4192' 2015-02-18 00:55:40 -06:00
Kevan Ahlquist 2adaa33fdb Remove dist folder from master. 2015-02-17 22:48:23 -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 1fb7338838 Merge pull request #90 from dasJ/dropdown 
Add nice cursor for dropdown menus
 2015-02-14 14:10:33 -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
Kevan Ahlquist 8848d2d53c Merge pull request #89 from dasJ/master 
Improve settings page
 2015-02-14 14:02:43 -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