github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity
3,201 Commits
497 Branches
146 Tags
109 MiB
Commit Graph

3201 Commits (e6477b0b977119436b51f3a98cf5777df131f6ad)

Author SHA1 Message Date
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
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 84b7da1164 Merge pull request #71 from kevana/master 
Build and test automation
 2015-01-18 16:51:39 -06:00
Kevan Ahlquist 77062bec84 Adding dist folder. 2015-01-18 16:40:07 -06:00
Kevan Ahlquist f65fed8d0a Fixed grunt template issues, version bump. 2015-01-18 16:39:10 -06:00
Kevan Ahlquist 2974f69932 Merge pull request #6 from kevana/feature/build 
Build and test automation
 2015-01-14 00:25:52 -06:00
Kevan Ahlquist 190087e6ca Added install and test targets to Makefile 2015-01-14 00:25:25 -06:00
Kevan Ahlquist 1784719047 Added unit tests for filters. 2015-01-04 20:35:47 -06:00
Kevan Ahlquist 275d771ea9 Merge branch 'master' into feature/build 
Conflicts:
	.gitignore
 2015-01-03 19:47:36 -06:00
Kevan Ahlquist f46b736c65 Merge pull request #7 from crosbymichael/master 
Pull latest changes
 2015-01-03 19:45:50 -06:00
Kevan Ahlquist 8eb381a899 Merge pull request #67 from crosbymichael/docs-update 
Updated readme with new build info and more usage instructions.
 2015-01-03 19:44:24 -06:00
Kevan Ahlquist 04418e2e68 Added Karma config for unit tests. 2015-01-03 18:59:22 -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 468ba72253 Merge pull request #4 from crosbymichael/master 
Pull latest changes
 2015-01-03 16:55:56 -06:00
Kevan Ahlquist 58bd6faa47 Added initial files for build and test automation. 2015-01-03 16:49:28 -06:00
Kevan Ahlquist e601ae4370 Updated readme with new build info and more usage instructions. 2014-12-30 13:42:54 -06:00
Kevan Ahlquist 8586993ee5 Merge pull request #66 from crosbymichael/feature/container-logs 
Container logs module
 2014-12-22 13:59:49 -06:00
Kevan Ahlquist b70b3f3100 Added module for container logs. 2014-12-15 16:26:10 -06:00
Kevan Ahlquist ca9355f617 Merge pull request #57 from kevana/bootstrap-update 
Major module refactoring, bootstrap, jquery updates, assets cleanup.
 2014-12-12 10:04:00 -06:00
Kevan Ahlquist 403daff934 Merge pull request #3 from kevana/bootstrap-update 
Major refactoring
 2014-12-11 15:29:16 -06:00
Kevan Ahlquist 57d8ae3e01 Misc. html/css tweaks, bumped version. 2014-12-01 00:13:53 -06:00
Kevan Ahlquist 012c8ed145 Merge branch 'master' into bootstrap-update 
Conflicts:
	assets/css/app.css
 2014-11-29 00:12:51 -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 66db5c5f6a Merge pull request #2 from crosbymichael/master 
Merge latest
 2014-11-29 00:04: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
Michael Crosby 78518d07b8 Merge pull request #60 from davivcgarcia/master 
Fixing navbar rendering issue on Firefox.
 2014-11-27 18:26:57 -05:00
Davi Garcia 7fd8eee2f8 Fixing rendering issue in Firefox. 2014-11-27 15:23:29 -02:00
Kevan Ahlquist 57fef1c958 Move startContainer to its own submodule. 2014-11-12 12:31:02 -06:00