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

6533 Commits

Author SHA1 Message Date
artica 163b061af0 Auto-updated build strings. 2017-02-27 00:01:16 +01:00
artica ef50808832 Auto-updated build strings. 2017-02-26 00:01:15 +01:00
artica 4d6e26a496 Auto-updated build strings. 2017-02-25 00:01:17 +01:00
daniel 45ea30e5b3 fixed nome agent for alias agent 2017-02-24 13:59:03 +01:00
Daniel Maya 0e1c62e644 Changed agent search 2017-02-24 13:41:59 +01:00
artica 62ab9f0a55 Auto-updated build strings. 2017-02-24 00:01:16 +01:00
Alejandro Gallardo Escobar 2f3053ebbd Changed the agent name by its alias and fixed the exception reporting item 2017-02-23 12:59:24 +01:00
m-lopez-f 289549a49f Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-23 12:26:56 +01:00
m-lopez-f 45316cdd0f Fixed visual in welcome view. Gitlab: #359 2017-02-23 12:26:48 +01:00
daniel a0ace09e01 fixed url img in metaconsole 2017-02-23 12:02:02 +01:00
m-lopez-f 8050f063cb Fixed problems with export data in csv on graphs when have percentil active. Gitlab: #358 2017-02-23 10:55:38 +01:00
Enrique Camargo 9bdfc386f3 Merge branch '75-etiquetas-de-vista-de-agente' into 'develop' 
Add not init status count label y agent detail section - #75

See merge request !199
 2017-02-23 10:15:29 +01:00
enriquecd fe8a43d045 Add not init status count label y agent detail section - #75 2017-02-23 10:05:03 +01:00
daniel 7609e85d3e fixed errors in tab menu 2017-02-23 09:23:27 +01:00
m-lopez-f 30baabafeb Fixed problems with output data in netflow, change max view data. Gitlab: #333 2017-02-23 09:05:11 +01:00
artica 39e380097b Auto-updated build strings. 2017-02-23 00:01:18 +01:00
enriquecd 817bce5f4c Convert to array values revieved by ajax for updatedb - #77 2017-02-22 17:41:19 +01:00
Alejandro Gallardo Escobar 3d8af42834 Changed the agent name by its alias 2017-02-22 16:43:28 +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
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
enriquecd 454a799c3d Change count column label text in agent detail section - #75 2017-02-22 11:36:29 +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 bf29d4c5f9 fixed error in view agent/module 2017-02-21 17:21:10 +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 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
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 a242395af0 Replace label definition and add help tip in custom reports items. Gitlab: #248 2017-02-21 13:01:34 +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
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
artica 028e5c60d2 Auto-updated build strings. 2017-02-21 00:01:17 +01:00
Alejandro Gallardo Escobar 51955d5bea Changed the agent name by its alias 2017-02-20 20:02:39 +01:00
Alejandro Gallardo Escobar 58617c00aa Merge branch 'develop' into feature/alias_friendly_name 2017-02-20 18:52:18 +01:00