mirror/glances
1
0
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2026-03-16 04:52:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,318 Commits 107 Branches 144 Tags
ccd83bf1ff61370ffb24edb3f31f1894dea8c160
Commit Graph

3318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
c90f335998 Merge branch 'feature/ANGULARJS' of https://github.com/sylvainmouquet/glances into feature/ANGULARJS 2015-01-18 23:30:40 +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
47769ca42b remove doublon 2015-01-18 21:14:06 +01:00
Sylvain MOUQUET
df05c92ad9 remove doublon 2015-01-18 21:12: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
Sylvain MOUQUET
1cf70cfce9 refactoring bottle html files + add refresh_time in url + add help page 2015-01-18 17:38:50 +01:00
Sylvain MOUQUET
7b77b98bf0 refactoring bottle html files + add refresh_time in url + add help page 2015-01-18 17:38:26 +01:00
Nicolargo
8a94bc65bb Add view (MVC speeking) for the plugins. FS and SENSORS OK. 2015-01-18 16:08:40 +01:00
Nicolargo
859ed24cab Add view (MVC speeking) for the plugins. Client/Server OK. 2015-01-18 15:19:10 +01:00
Sylvain MOUQUET
596800a99c plugin load, mem 2015-01-18 14:40:43 +01:00
Nicolargo
04377b8c1e Add view (MVC speeking) for the plugins. NETWORK OK. 2015-01-18 11:13:09 +01:00
Nicolargo
0c40cc2cec Add view (MVC speeking) for the plugins. MEM and MEM SWAP OK. 2015-01-17 22:22:53 +01:00
Nicolargo
5496fcac2f Add view (MVC speeking) for the plugins. LOAD OK. 2015-01-17 19:12:55 +01:00
Nicolargo
0035336389 Add view (MVC speeking) for the plugins. CPU OK. 2015-01-17 18:20:31 +01:00
Nicolargo
c813802968 Add view (MVC speeking) for the plugins. CPU OK. 2015-01-17 18:17:52 +01:00
Nicolas Hennion
616018d76d Merge pull request #486 from sylvainmouquet/feature/ANGULARJS 
Fix merge div/table
 2015-01-17 17:54:42 +01:00
Sylvain MOUQUET
80638434a4 fix of the fix 2015-01-17 17:35:38 +01:00
Sylvain MOUQUET
d0b9ff2e2d network bits default format 2015-01-17 17:28:47 +01:00
Sylvain MOUQUET
6c20fff616 fix merge div/table 2015-01-17 17:25:30 +01:00
Sylvain MOUQUET
d857e5d662 fix merge div/table 2015-01-17 17:20:39 +01:00
Sylvain MOUQUET
bcd76e5536 fix merge div/table 2015-01-17 17:18:40 +01:00
Nicolargo
d7ae569563 Merge branch 'feature/issue480' of github.com:nicolargo/glances into feature/issue480 2015-01-17 16:24:35 +01:00
Nicolargo
cf2f13860a Add Views setter and getter 2015-01-17 16:22:51 +01:00
Nicolas Hennion
c0ec0cc69e Merge pull request #485 from sylvainmouquet/feature/ANGULARJS 
Shortcuts, mode debug and display/hide
 2015-01-17 16:22:06 +01:00
Sylvain MOUQUET
fee8c06d28 remove debug.html 2015-01-17 16:19:05 +01:00
Sylvain MOUQUET
a7e17083b7 add mod debug for angularjs 2015-01-17 15:16:12 +01:00
Sylvain MOUQUET
5dee3758f1 add sensors 2015-01-17 13:54:35 +01:00
Sylvain MOUQUET
cb398d62b5 add show/hide 2015-01-17 13:38:29 +01:00
Nicolargo
18fa61eda4 Add EnableCors again... 2015-01-16 21:15:29 +01:00
Nicolas Hennion
181cddf464 Merge pull request #483 from sylvainmouquet/feature/ANGULARJS 
Feature/angularjs #480
 2015-01-16 09:35:42 +01:00
Nicolargo
af7d3146dc Some PEP8 enhancement 2015-01-15 22:40:21 +01:00
Nicolargo
2b1fd87d48 Clean client and server API 2015-01-15 22:35:33 +01:00
Nicolargo
331519af42 Clean client and server API 2015-01-15 22:31:28 +01:00
Sylvain MOUQUET
72e70a126d Merge pull request #3 from nclsHart/html-table 
Use divs instead of tables
 2015-01-14 23:33:08 +01:00
nclsHart
ef142bd980 convert indent to spaces 2015-01-14 23:25:12 +01:00
nclsHart
c9d736961f use divs instead of tables 2015-01-14 23:25:12 +01:00
Sylvain MOUQUET
455a7e91c0 Merge pull request #1 from nclsHart/fix-open 
Remove python3 encoding argument on open function
 2015-01-14 23:09:18 +01:00