1550 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicolargo	6583a875e8	Merge from develop branch	2015-01-31 16:52:58 +01:00
Nicolargo	67e21a606e	On the road of the version 2.4	2015-01-31 14:02:45 +01:00
Nicolargo	358bb45b4a	Merge form master	2015-01-31 13:50:06 +01:00
Nicolargo	c7fad235f3	Update docs file for the 2.3 version	2015-01-31 13:45:48 +01:00
Nicolargo	7b41105c1a	Update doc	2015-01-30 22:18:21 +01:00
Nicolargo	928026c8c1	Merge branch 'develop' of github.com:nicolargo/glances into develop	2015-01-30 19:27:18 +01:00
Nicolargo	2d49f729f2	Correct example in the help option	2015-01-30 19:27:07 +01:00
Nicolargo	965922cc87	Try/catch for containers CPU and MEM stats	2015-01-27 13:57:08 +01:00
Nicolargo	82ce5e29f2	Merge branch 'develop' of github.com:nicolargo/glances into develop	2015-01-27 13:42:33 +01:00
Nicolargo	5c529102fd	Glances 2.3RC2	2015-01-27 13:42:11 +01:00
nicolargo	63b3250ae3	Glances 2.3RC2	2015-01-27 13:41:35 +01:00
Nicolas Hennion	99c5088ded	Merge pull request #499 from nclsHart/docker-web-ui ... Better rendering for docker plugin on web UI	2015-01-27 13:33:55 +01:00
nclsHart	bdcee3a812	better rendering for docker plugin	2015-01-27 00:12:20 +01:00
Nicolargo	499e9062df	Correct an issue in Python3 if Docker client and Server are not in the same version	2015-01-25 18:14:23 +01:00
Nicolargo	3817b84c3c	Correct issue on FS action (issue #497)	2015-01-25 17:49:49 +01:00
Nicolargo	88d7e40597	Add docker plugin to the classical Web UI	2015-01-24 17:00:48 +01:00
Nicolargo	b6b5230dcd	Resolve merge issue	2015-01-24 16:48:09 +01:00
nclsHart	7feffee8e3	fix typo	2015-01-24 16:45:06 +01:00
Nicolargo	628cfcbbc5	Resolve merge issue	2015-01-24 16:43:48 +01:00
Nicolargo	6d32061754	Add per container CPU and MEM monitoring in the Docker plugin (issue #490)	2015-01-24 16:39:46 +01:00
Nicolas Hennion	9b6e038a18	Merge pull request #496 from nclsHart/loading-page ... Improve rendering of the Web UI loading page on small devices	2015-01-24 16:37:18 +01:00
Nicolargo	c6a47c1ecc	Correct issue on load plugin on Windows OS	2015-01-24 16:30:20 +01:00
nclsHart	fb23e56389	better rendering of Web UI loading page on small devices	2015-01-24 16:13:57 +01:00
Nicolargo	722406e83a	Alert < 3 seconds are no longer displayed 2/2	2015-01-24 14:38:17 +01:00
Nicolargo	8a7bebc8a8	Alert < 3 seconds are no longer displayed	2015-01-24 14:37:23 +01:00
Nicolas Hennion	f96145bf3e	Merge pull request #495 from nclsHart/news-typo ... Fix typo	2015-01-24 13:34:09 +01:00
nclsHart	575d556d70	fix typo	2015-01-24 13:13:22 +01:00
Nicolargo	dc61f97ffc	Glances 2.3RC1	2015-01-22 21:52:15 +01:00
Nicolas Hennion	5c531cd82d	Merge pull request #493 from nclsHart/loading-page ... Web UI loading page	2015-01-21 09:31:28 +01:00
nclsHart	7e1e00a0c3	add glances logo and animation on loading page	2015-01-21 01:55:07 +01:00
Nicolargo	bd5c3e5ad5	Add per container CPU and MEM monitoring in the Docker plugin (issue #490)	2015-01-19 22:47:22 +01:00
Nicolas Hennion	d0679148c0	Merge pull request #491 from nclsHart/remove-base-tpl ... Remove base.tpl file	2015-01-19 22:18:01 +01:00
nclsHart	74ced7a915	remove old base.tpl file (probably fix a previous merge conflict)	2015-01-19 22:02:32 +01:00
Nicolas Hennion	229d7ff62a	Correct issue if sensors are not available	2015-01-19 20:50:46 +01:00
Nicolas Hennion	c125b51291	Correct issue if sensors are not available	2015-01-19 16:26:47 +01:00
Nicolas Hennion	f1112271e8	Correct issue if sensors are not available	2015-01-19 16:25:42 +01:00
Nicolas Hennion	9d533b3eaf	Correct README file	2015-01-19 16:18:46 +01:00
Nicolas Hennion	4b93ab9fa8	Correct README file	2015-01-19 16:13:06 +01:00
Nicolas Hennion	22f8647a01	Merge branch 'sylvainmouquet-feature/ANGULARJS' into feature/issue480	2015-01-19 16:08:21 +01:00
Nicolas Hennion	7ee72794d8	Resolve merge conflict	2015-01-19 16:07:59 +01:00
Nicolas Hennion	dd23fa839d	Merge pull request #487 from nclsHart/processlist-header-align ... Fix processlist header align	2015-01-19 09:17:49 +01:00
nclsHart	bc5561d42a	fix processlist header align	2015-01-19 00:30:54 +01:00
Sylvain MOUQUET	b025cddfae	per cpu	2015-01-18 23:17:56 +01:00
Sylvain MOUQUET	45d6673787	sort + help	2015-01-18 23:02:27 +01:00
Sylvain MOUQUET	e7bf355658	fix merge	2015-01-18 21:08:46 +01:00
Sylvain MOUQUET	97f244a6ec	Merge branch 'nicolargo-develop' into feature/ANGULARJS	2015-01-18 21:01:27 +01:00
Sylvain MOUQUET	a21e16dbb8	merge	2015-01-18 20:58:18 +01:00
Sylvain MOUQUET	bdc6c43ba9	message	2015-01-18 20:41:41 +01:00
Nicolargo	2d6675fa3b	Add view (MVC speeking) for the plugins. Add API methods and Unitary test.	2015-01-18 18:21:26 +01:00
Sylvain MOUQUET	b4b534270f	fix renaming	2015-01-18 17:59:33 +01:00