diff options
author | nicolargo <nicolashennion@gmail.com> | 2015-05-20 10:14:12 +0200 |
---|---|---|
committer | nicolargo <nicolashennion@gmail.com> | 2015-05-20 10:14:12 +0200 |
commit | fd6c7a8934065108cc8f7b0ab3a2fa4ccf49e2f9 (patch) | |
tree | ed5f136b8fc5de69ef6ee8bacb55884274cae754 | |
parent | b8ae357dc0cf2442806bf8145012e319582dc70e (diff) | |
parent | 0e4e18a3eb14a7744680812087d52be1a142e48c (diff) |
Merge branch 'develop'v2.4
122 files changed, 5802 insertions, 4218 deletions
@@ -5,25 +5,34 @@ Developers Nicolas Hennion (aka) Nicolargo http://blog.nicolargo.com https://twitter.com/nicolargo +https://github.com/nicolargo nicolashennion@gmail.com PGP Fingerprint: 835F C447 3BCD 60E9 9200 2778 ABA4 D1AB 9731 6A3C PGP Public key: gpg --keyserver pgp.mit.edu --recv-keys 0xaba4d1ab97316a3c -Alessio Sergi (aka) al3hex +Alessio Sergi (aka) Al3hex https://twitter.com/al3hex +https://github.com/asergi Brandon Philips (aka) Philips http://ifup.org/ +https://github.com/philips Jon Renner (aka) Jrenner https://github.com/jrenner -Maxime Desbrus (aka) desbma +Maxime Desbrus (aka) Desbma https://github.com/desbma -Nicolas Hart (aka) NclsHart for the UI design +Nicolas Hart (aka) NclsHart (for the Web user interface) https://github.com/nclsHart +Sylvain Mouquet (aka) SylvainMouquet (for the Web user interface) +http://github.com/sylvainmouquet + +Floran Brutel (aka) notFloran (for the Web user interface) +https://github.com/notFloran + ========= Packagers ========= diff --git a/MANIFEST.in b/MANIFEST.in index 98cb6021..37000d2a 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,11 +3,16 @@ include COPYING include NEWS include README.rst include conf/glances.conf -include glances/outputs/bottle/*.tpl +include glances/outputs/static/html/*.html +include glances/outputs/static/html/components/*.html +include glances/outputs/static/html/plugins/*.html include glances/outputs/static/*.ico include glances/outputs/static/css/*.css include glances/outputs/static/js/*.js +include glances/outputs/static/js/*.js.map +include glances/outputs/static/js/vendors/*.js +include glances/outputs/static/js/vendors/*.js.map +include glances/outputs/static/images/*.png include man/glances.1 recursive-include docs images/*.png glances-doc.html recursive-include glances *.py -recursive-include i18n *.mo |