github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity
1,924 Commits
499 Branches
147 Tags
111 MiB
Commit Graph

1924 Commits (36020dd8bccdfd9ec9f78eb85b81b125cdc47f0c)

Author SHA1 Message Date
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
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
Kevan Ahlquist 2b2d4152a5 Updated dashboard and modal form markup for bootstrap 3. 2014-11-02 23:37:34 -06:00
Kevan Ahlquist 5d110afb86 Upgraded to jQuery 1.11.1, added missing Angular map files. 2014-11-02 22:33:03 -06:00
Kevan Ahlquist b5b4f7ef20 Upgrade to Bootstrap 3.3.0, clean out assets folder. 2014-11-02 21:21:59 -06:00
Kevan Ahlquist ea9a1e8e8a Merge pull request #1 from crosbymichael/master 
Pull latest into master
 2014-11-02 20:27:58 -06:00
Kevan Ahlquist 4dddd6227b Merge pull request #54 from kevana/master 
Features:  Pause/unpause, update container info after actions, keep same HostConfig through stop/start 👍
 2014-10-28 13:49:57 -05:00
Kevan Ahlquist d2fda295c2 Added wiki link to readme. 2014-10-28 00:58:44 -05:00
Kevan Ahlquist 86ca961d37 Added CpuShares to container start task. 2014-10-26 01:09:54 -05:00
Kevan Ahlquist c9009db87d Start containers with the same HostConfig they had at last runtime. 2014-10-23 01:24:58 -05:00
Kevan Ahlquist 8652285227 Added pause/unpause to containers, 
Auto-update /container and /containers views after performing an action,
Display spinner when container actions are being performed,
Unified style
 2014-10-18 21:41:26 -05:00
Michael Crosby 9dccf95152 Merge pull request #42 from grolfcry/master 
+ Add VirtualSize column to Images page
 2014-08-15 17:18:16 -07:00
Michael Crosby 14cfa02bf2 Merge pull request #39 from bettse/Add_envs 
Adds ENVs to container details
 2014-08-15 17:16:47 -07:00
Михаил Федоров d9b541d42c + Add VirtualSize column to Images page 2014-08-12 12:58:05 +06:00
Eric Betts 6091e4cbeb Adds ENVs to container details 2014-08-06 19:06:05 -07:00
Michael Crosby 5a38a3f3a9 Merge pull request #34 from qiutiaoming/master 
remove google CDN service,because sometimes you can not use google,espec...
 2014-08-04 14:35:43 -07:00
Michael Crosby e3eb617be4 Merge pull request #37 from nazar-pc/master 
Added possibility to specify name at container creation
 2014-08-04 14:32:46 -07:00
Qiu Tiaoming 2d28a7d4c3 merge with my own master 2014-07-30 17:05:25 +08:00
Qiu Tiaoming 2329d73fca fix asserts path,rebase 2014-07-30 16:03:49 +08:00
Qiu Tiaoming 2ba51ac962 Revert "Revert "remove google CDN service,because sometimes you can not use google,especially you are in China"" 
This reverts commit 064b489fa5a5db0119b9af26fd23b1592cf2021c.
 2014-07-30 16:03:49 +08:00
Qiu Tiaoming a73baf46aa Revert "remove google CDN service,because sometimes you can not use google,especially you are in China" 
This reverts commit 9eb9e99122.
 2014-07-30 16:03:49 +08:00