Merge pull request #12 from japastor/master

Version 0.6.5-9
Merge pull request #13 from japastor/master

Arreglo de bug en seguimiento de tareas puppet de portatiles
Merge pull request #14 from japastor/master

Adaptación a Wheezy y arreglo de bugs
Portatiles en LDAP
Asignacion de portatiles
Paquetes
Cosas por subir
Thinclients
Columna numero de serie en thinclients
	modified:   applications/controlies/controllers/thinclients.py
	modified:   applications/controlies/modules/Hosts.py
	modified:   applications/controlies/modules/Thinclients.py
	modified:   applications/controlies/views/thinclients/form.html
	modified:   applications/controlies/views/thinclients/index.html
	modified:   debian/changelog
	modified:   packages/controlies-client_0.6.5-13_all.deb
	modified:   packages/controlies-thinclient_0.6.5-13_all.deb
	modified:   packages/controlies_0.6.5-13_all.deb
	modified:   puppet/instala_controlies.zip
	modified:   puppet/instala_controlies/files/controlies-client_0.6.5-13_all.deb
	modified:   puppet/instala_controlies/files/controlies-thinclient_0.6.5-13_all.deb
	modified:   puppet/instala_controlies/files/controlies_0.6.5-13_all.deb
	modified:   puppet/instala_controlies/manifests/init.pp
	modified:   NOTAS
	modified:   applications/controlies/modules/Hosts.py
	modified:   applications/controlies/modules/Thinclients.py
	modified:   debian/changelog
	modified:   packages/controlies-client_0.6.5-13_all.deb
	modified:   packages/controlies-thinclient_0.6.5-13_all.deb
	modified:   packages/controlies_0.6.5-13_all.deb
	modified:   puppet/instala_controlies.zip
	modified:   puppet/instala_controlies/files/controlies-client_0.6.5-13_all.deb
	modified:   puppet/instala_controlies/files/controlies-thinclient_0.6.5-13_all.deb
	modified:   puppet/instala_controlies/files/controlies_0.6.5-13_all.deb
	modified:   applications/controlies/controllers/thinclients.py
	modified:   applications/controlies/controllers/usuarios.py
	modified:   applications/controlies/languages/es-es.py
	modified:   applications/controlies/modules/Thinclients.py
	deleted:    applications/controlies/static/js/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
	deleted:    applications/controlies/static/js/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
	deleted:    applications/controlies/static/js/jquery/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
	deleted:    applications/controlies/static/js/jquery/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
	deleted:    applications/controlies/static/js/jquery/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
	deleted:    applications/controlies/static/js/jquery/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
	deleted:    applications/controlies/static/js/jquery/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
	deleted:    applications/controlies/static/js/jquery/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
	deleted:    applications/controlies/static/js/jquery/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
	deleted:    applications/controlies/static/js/jquery/css/ui-lightness/images/ui-icons_222222_256x240.png
	deleted:    applications/controlies/static/js/jquery/css/ui-lightness/images/ui-icons_228ef1_256x240.png
	deleted:    applications/controlies/static/js/jquery/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
	deleted:    applications/controlies/static/js/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
	deleted:    applications/controlies/static/js/jquery/css/ui-lightness/images/ui-icons_ffffff_256x240.png
	deleted:    applications/controlies/static/js/jquery/css/ui-lightness/jquery-ui-1.8.16.custom.css
	deleted:    applications/controlies/static/js/jquery/css/ui-lightness/jquery-ui-1.8.9.custom.css
	deleted:    applications/controlies/static/js/jquery/jdgrid/css/ellipsis-xbl.xml
	deleted:    applications/controlies/static/js/jquery/jdgrid/css/ui.jqgrid.css
	deleted:    applications/controlies/static/js/jquery/jdgrid/grid.locale-sp.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/jquery.jqGrid.min.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/JsonXml.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/css/ellipsis-xbl.xml
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/css/jquery.searchFilter.css
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/css/ui.jqgrid.css
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/css/ui.multiselect.css
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/grid.base.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/grid.celledit.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/grid.common.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/grid.custom.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/grid.formedit.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/grid.import.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/grid.inlinedit.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/grid.jqueryui.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/grid.loader.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/grid.postext.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/grid.setcolumns.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/grid.subgrid.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/grid.tbltogrid.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/grid.treegrid.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-bg.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-bg1251.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-cat.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-cn.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-cs.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-de.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-dk.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-el.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-en.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-fa.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-fi.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-fr.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-he.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-is.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-it.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-ja.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-nl.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-no.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-pl.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-pt-br.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-pt.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-ro.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-ru.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-sk.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-sp.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-sv.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-tr.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/i18n/grid.locale-ua.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/jqDnR.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/jqModal.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/jquery.fmatter.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/jquery.searchFilter.js
	deleted:    applications/controlies/static/js/jquery/jdgrid/src/ui.multiselect.js
	deleted:    applications/controlies/static/js/jquery/jquery-1.5.min.js
	deleted:    applications/controlies/static/js/jquery/jquery-ui-1.8.9.custom.min.js
	modified:   applications/controlies/static/js/utils.js
	modified:   applications/controlies/views/layout.html
	modified:   applications/controlies/views/thinclients/assignComputers.html
	modified:   applications/controlies/views/thinclients/index.html
	modified:   applications/controlies/views/usuarios/index.html
	modified:   debian/changelog
	deleted:    packages/controlies-client_0.6.5-13_all.deb
	new file:   packages/controlies-client_0.6.5-14_all.deb
	deleted:    packages/controlies-thinclient_0.6.5-13_all.deb
	new file:   packages/controlies-thinclient_0.6.5-14_all.deb
	deleted:    packages/controlies_0.6.5-13_all.deb
	new file:   packages/controlies_0.6.5-14_all.deb
	modified:   puppet/instala_controlies.zip
	deleted:    puppet/instala_controlies/files/controlies-client_0.6.5-13_all.deb
	new file:   puppet/instala_controlies/files/controlies-client_0.6.5-14_all.deb
	deleted:    puppet/instala_controlies/files/controlies-thinclient_0.6.5-13_all.deb
	new file:   puppet/instala_controlies/files/controlies-thinclient_0.6.5-14_all.deb
	deleted:    puppet/instala_controlies/files/controlies_0.6.5-13_all.deb
	new file:   puppet/instala_controlies/files/controlies_0.6.5-14_all.deb
	modified:   puppet/instala_controlies/manifests/init.pp
	modified:   applications/controlies/static/js/utils.js
	modified:   packages/controlies-client_0.6.5-14_all.deb
	modified:   packages/controlies-thinclient_0.6.5-14_all.deb
	modified:   packages/controlies_0.6.5-14_all.deb
	modified:   puppet/instala_controlies.zip
	modified:   puppet/instala_controlies/files/controlies-client_0.6.5-14_all.deb
	modified:   puppet/instala_controlies/files/controlies-thinclient_0.6.5-14_all.deb
	modified:   puppet/instala_controlies/files/controlies_0.6.5-14_all.deb
	modified:   applications/controlies/controllers/usuarios.py
	modified:   applications/controlies/modules/Rayuela2Ldap.py
	modified:   applications/controlies/modules/Users.py
	modified:   applications/controlies/views/grupos/index.html
	modified:   applications/controlies/views/usuarios/form.html
	modified:   debian/changelog
	deleted:    packages/controlies-client_0.6.5-14_all.deb
	new file:   packages/controlies-client_0.6.6-1_all.deb
	deleted:    packages/controlies-thinclient_0.6.5-14_all.deb
	new file:   packages/controlies-thinclient_0.6.6-1_all.deb
	deleted:    packages/controlies_0.6.5-14_all.deb
	new file:   packages/controlies_0.6.6-1_all.deb
	modified:   puppet/instala_controlies.zip
	deleted:    puppet/instala_controlies/files/controlies-client_0.6.5-14_all.deb
	new file:   puppet/instala_controlies/files/controlies-client_0.6.6-1_all.deb
	deleted:    puppet/instala_controlies/files/controlies-thinclient_0.6.5-14_all.deb
	new file:   puppet/instala_controlies/files/controlies-thinclient_0.6.6-1_all.deb
	deleted:    puppet/instala_controlies/files/controlies_0.6.5-14_all.deb
	new file:   puppet/instala_controlies/files/controlies_0.6.6-1_all.deb
	modified:   puppet/instala_controlies/manifests/init.pp
Cambios para union
Merge