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

1033 Commits (252e05e963e00b8ac1eee11c450df6971c5299d9)

Author SHA1 Message Date
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
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
Kevan Ahlquist b00b61ce25 Merge pull request #91 from dasJ/checkbox 
Make text next to "Display All" clickable
 2015-02-13 09:10:07 -06:00
Janne Heß 9284e4b451 Make text next to "Display All" clickable 2015-02-13 14:32:03 +01:00
Janne Heß 716e25703e Add nice cursor for dropdown menus 2015-02-13 14:18:36 +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 9baa85f2e4 Merge pull request #82 from kevana/master 
Added restart to container list actions.
 2015-02-13 01:00:32 -06:00
William McGann 22287e6a56 Using centurylink's golang-builder to create tiny docker image, going from ~400MB to 5.4MB. 2015-02-13 01:11:50 -05:00
Kevan Ahlquist 0d4274fdeb Added restart to container list actions. 2015-02-09 23:10:05 -06:00
Kevan Ahlquist 4d9d66e9f9 Merge pull request #81 from kevana/master 
Add timestamp option to stderr
 2015-02-09 23:02:01 -06:00
Kevan Ahlquist c7ebe9d881 Added timestamp option to stderr. 2015-02-09 23:00:34 -06:00
Kevan Ahlquist c798a95fb3 Merge pull request #9 from crosbymichael/master 
Pull latest changes
 2015-02-09 22:48:32 -06:00
Kevan Ahlquist d11c849a0f Merge pull request #79 from Slamper/master 
Fix of HostConfig being lost when starting containers from the list
 2015-02-09 22:45:00 -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 ccd27f203d Merge pull request #76 from kevana/master 
Fixes #75, HostConfig issues
 2015-02-01 17:16:43 -06:00
Kevan Ahlquist 3d251fdba4 Fixes #75 2015-02-01 17:15:58 -06:00
Kevan Ahlquist 4b4edc6c22 Merge pull request #72 from kevana/master 
Container start parameters
 2015-02-01 01:35:37 -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 314fc51f6d Updated /dist for release. 2015-01-25 18:12:34 -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