tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,558 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

13558 Commits

Author SHA1 Message Date
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
m-lopez-f a242395af0 Replace label definition and add help tip in custom reports items. Gitlab: #248 2017-02-21 13:01:34 +01:00
enriquecd 26627e0613 Merge branch '62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agents-firsts-de-forma-que-se-anineen-bien' of https://192.168.50.5:8081/artica/pandorafms into 62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agents-firsts-de-forma-que-se-anineen-bien 2017-02-21 12:54:48 +01:00
enriquecd 5dbca6eeca Insert newline between module first and agent first in module massive op /2 - #62 2017-02-21 12:52:48 +01:00
Enrique Camargo 32806a5538 Merge branch '66-pequenos-arreglos-en-interfaz-de-creacion-de-graficas-combinadas' into 'develop' 
Improve custom graph interface - #66

See merge request !179
 2017-02-21 12:39:01 +01:00
enriquecd 48a04d6c47 Improve custom graph interface - #66 2017-02-21 12:18:18 +01:00
artu30 c9e89921d2 Merge branch 'feature/log_in_reports' into 'develop' 
Feature/log in reports

See merge request !178
 2017-02-21 12:15:34 +01:00
m-lopez-f 3b97095fda Fixed problems with check discard unknown events in module configuration. Integria: #4242, Gitlab: #324 2017-02-21 12:09:07 +01:00
Arturo Gonzalez 5190228010 Merge branch 'develop' into feature/log_in_reports 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting_html.php
 2017-02-21 12:06:24 +01:00
m-lopez-f 09e1b8ce1c Fixed problems with src images in visual consoles. Gitlab: #255 2017-02-21 10:28:19 +01:00
fermin 59135bb1b1 Merge branch '65-la-version-del-cliente-de-ehorus-es-vieja-hablar-con-fermin' into 'develop' 
Updated eHorus client

See merge request !176
 2017-02-21 10:23:29 +01:00
Alejandro Gallardo Escobar e7df5ebacb Merge branch 'develop' into feature/alias_friendly_name 2017-02-21 10:12:35 +01:00
m-lopez-f 8a1bdf5017 Fixed problems with login that this user not have a administration permissions. Gitlab #323 2017-02-21 09:47:42 +01:00
artica 028e5c60d2 Auto-updated build strings. 2017-02-21 00:01:17 +01:00