13571 Commits

Author SHA1 Message Date
fermin831
57291788e8 Added a Extension Manager View like a submenu 2017-02-22 18:13:24 +01:00
Enrique Camargo
e34b3ea1e4 Merge branch '77-bug-en-fondo-de-consolas-visuales-pandora-7' into 'develop'
Convert to array values revieved by ajax for updatedb - #77

See merge request !197
2017-02-22 17:55:34 +01:00
daniel
58ca741649 Merge branch '342-fallo-al-registrar-nodo-en-metaconsola-open' into 'develop'
add new field tagent in oracle

See merge request !196
2017-02-22 17:49:31 +01:00
enriquecd
817bce5f4c Convert to array values revieved by ajax for updatedb - #77 2017-02-22 17:41:19 +01:00
daniel
0169aaa129 add new field tagent in oracle 2017-02-22 17:30:31 +01:00
Daniel Maya
a1978e93b1 Inserted alias in pandora audit 2017-02-22 16:52:42 +01:00
Alejandro Gallardo Escobar
3d8af42834 Changed the agent name by its alias 2017-02-22 16:43:28 +01:00
m-lopez-f
b184a75065 Fixed styles in visual setup administration. Gitlab: #360 2017-02-22 14:12:33 +01:00
Alejandro Gallardo Escobar
beb38c70ce Changed the agent name by its alias in the mobile console 2017-02-22 13:50:06 +01:00
m-lopez-f
dc6c024611 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-22 13:48:19 +01:00
m-lopez-f
1e4d784e72 Remove text from header and only indicated name of networkmap or agents. Gitlab: #353 2017-02-22 13:48:11 +01:00
daniel
8fbb95dbf6 Merge branch '76-umbrales-de-modulos-visual' into 'develop'
fixed visual errors edit modules

See merge request !195
2017-02-22 13:27:50 +01:00
daniel
83af8bd639 fixed visual errors edit modules 2017-02-22 13:18:56 +01:00
m-lopez-f
724b2e469d Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-22 13:08:47 +01:00
m-lopez-f
015890a18a Fixed problems with duplicade color in netflow graphs. Gitlab: #346 2017-02-22 13:08:39 +01:00
Alejandro Gallardo Escobar
3d521ec290 Changed the agent name by its alias in some sections 2017-02-22 12:51:55 +01:00
Alejandro Gallardo Escobar
c26eb06adb Now the function to print the agent name prints the alias by default. This behaviour can be modified by changing a parameter 2017-02-22 12:51:55 +01:00
Arturo Gonzalez
fb8f05808e Fixed bad text in pandora performance. Ticket #233 2017-02-22 12:48:35 +01:00
Arturo Gonzalez
83776e46d1 Changed some texts in pandora. Ticket #347 2017-02-22 12:36:30 +01:00
Daniel Maya
51f78e5a8a Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-22 11:47:07 +01:00
Daniel Maya
b9b26c4543 Change in name hash 2017-02-22 11:46:54 +01:00
Enrique Camargo
583fefabff Merge branch '75-etiquetas-de-vista-de-agente' into 'develop'
Change count column label text in agent detail section - #75

See merge request !193
2017-02-22 11:46:28 +01:00
enriquecd
454a799c3d Change count column label text in agent detail section - #75 2017-02-22 11:36:29 +01:00
m-lopez-f
bfe40653df REmove debug trace. Gitlab: #346 2017-02-22 11:15:05 +01:00
daniel
1b1f1165e8 Merge branch '58-tab-de-la-seccion-reporting-en-todas-las-secciones' into 'develop'
fixed errors in tabs reports

See merge request !192
2017-02-22 09:30:46 +01:00
daniel
f351a95993 fixed errors in tabs reports 2017-02-22 09:21:35 +01:00
artica
54d228c00e Auto-updated build strings. 2017-02-22 00:01:20 +01:00
Alejandro Gallardo Escobar
6fc884d327 Changed the agent name by its alias in the events sections 2017-02-21 19:07:17 +01:00
Enrique Camargo
1e88c6d457 Merge branch '74-muestra-last-contact-en-rojo-no-deberia' into 'develop'
Functions_module now not use async modules to calc if last contact is major than…

See merge request !190
2017-02-21 18:59:14 +01:00
fermin831
d16138c68e Modified GIS Maps to print OpenMaps on empty google license 2017-02-21 18:48:50 +01:00
enriquecd
63c112a628 Functions_module now not use async modules to calc if last contact is major than minimum module interval - #74 2017-02-21 18:45:44 +01:00
daniel
838c935739 Merge branch '73-vista-agentes-modulos-no-funciona-correctamente' into 'develop'
fixed error in view agent/module

See merge request !189
2017-02-21 17:34:24 +01:00
daniel
bf29d4c5f9 fixed error in view agent/module 2017-02-21 17:21:10 +01:00
Arturo Gonzalez
5db7f93b53 Removed header bar in wellcome menu. Ticket #335 2017-02-21 16:54:53 +01:00
m-lopez-f
5bb39c4618 Fixed problems with percentil in customs graphs. Gitlab: #326 2017-02-21 16:52:56 +01:00
Daniel Maya
a36e74990d Merge branch 'feature/alias_friendly_name' into 'develop'
Feature/alias friendly name

See merge request !188
2017-02-21 16:46:05 +01:00
Arturo Gonzalez
cb7ab827d2 Fixed module type chart selected in conf. Ticket #345 2017-02-21 16:36:46 +01:00
daniel
63d582586b Merge branch '68-creacion-de-usuarios-en-ldap-falla' into 'develop'
fixed error in ldap create new users

See merge request !186
2017-02-21 15:55:51 +01:00
daniel
e4fbef9e47 Merge branch '67-elementos-mal-colocados-en-informe-de-disponibilidad-integria-4155' into 'develop'
fixed minor error in report availavility

See merge request !185
2017-02-21 15:39:08 +01:00
Daniel Maya
c21bbfd88c Merge branch 'feature/alias_friendly_name' of https://192.168.50.5:8081/artica/pandorafms into feature/alias_friendly_name 2017-02-21 15:31:45 +01:00
Daniel Maya
76cb61f288 Changes for the merge 2017-02-21 15:31:20 +01:00
Alejandro Gallardo Escobar
430ae3e201 Merge branch 'develop' into feature/alias_friendly_name
Conflicts:
	pandora_console/include/functions_ui.php
2017-02-21 15:23:44 +01:00
Alejandro Gallardo Escobar
edddad2b5f Now the server uses the alias for the new agent event 2017-02-21 15:16:38 +01:00
m-lopez-f
e5fba88137 fixed visual on movile version. gitlab: #340 2017-02-21 14:27:06 +01:00
Ramon Novoa
e3205226e1 Make sure the alias is always set. 2017-02-21 14:24:50 +01:00
daniel
a5055ec27a fixed error in ldap create new users 2017-02-21 14:04:53 +01:00
Alejandro Gallardo Escobar
0daaa9651e Changed the agent name by its alias 2017-02-21 14:04:43 +01:00
daniel
df0a6086c4 fixed minor error in report availavility 2017-02-21 13:56:00 +01:00
m-lopez-f
2abff60380 Fixed code 2017-02-21 13:30:53 +01:00
Enrique Camargo
31d7091ce7 Merge branch '62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agents-firsts-de-forma-que-se-anineen-bien' into 'develop'
Resolve "Meter un salto de linea entre las opciones "modules first" y "agents firsts" de forma que se anineen bien"

See merge request !180
2017-02-21 13:06:56 +01:00