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

588 Commits

Author SHA1 Message Date
fbsanchez 24025ebb74 Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-18 17:48:03 +02:00
Luis Calvo d3016a2839 Fixed sum/avg graph infinite loop 2019-06-18 14:04:38 +02:00
fbsanchez 4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
fbsanchez 23e6711f09 WIP Events 2019-06-06 17:50:47 +02:00
manuel 5ba2ba1ef3 Fixed bug in time comparison graphs 2019-06-03 15:37:05 +02:00
fbsanchez 7a09a80ace style review 2019-06-03 14:30:23 +02:00
fbsanchez 5be124f315 Styles review 2019-05-27 19:00:48 +02:00
Daniel Barbero Martin ae11ea18c9 Merge remote-tracking branch 'origin/develop' into ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas 
Conflicts:
	pandora_console/include/functions_graph.php


Former-commit-id: 8436d51b142d4f3d528b3f1c4d459f5194f6a234
 2019-05-14 12:27:02 +02:00
Daniel Barbero Martin ab2bf737d5 Merge remote-tracking branch 'origin/develop' into ent-3894-Bug-Feature-labels-weigh-en-graficas 
Conflicts:
	pandora_console/include/functions.php


Former-commit-id: 6c1ef8bcb15b9969b25082851fa39c8241398b29
 2019-05-10 12:18:10 +02:00
Daniel Barbero Martin e981edfa89 fixed label reports and more fixed 
Former-commit-id: a71c341fc7f6f182f7d847911a7dc4e0cd6f36f7
 2019-05-09 16:26:38 +02:00
Daniel Rodriguez ac101af72f Merge branch '3631_Unidades_no_se_muestran_en_informes_de_graficas_combinadas' into 'develop' 
Added module units in module graphs

See merge request artica/pandorafms!2237
 2019-05-08 16:36:43 +02:00
Daniel Barbero Martin 3fcd854ae6 fixed error labels graphs and weight in chart 
Former-commit-id: 52acfda4438417b711295ce8d335ea2748b1fa53
 2019-05-06 16:43:59 +02:00
fermin831 030bcc69c4 [Netflow live] Readded circular mesh and some refactorizations 
Former-commit-id: a3b2d9cf622a6e539baff9de3c36f1b7a7072e4b
 2019-03-21 12:37:03 +01:00
fermin831 6299d23528 [Netflow live] Minor fixes 
Former-commit-id: 9778bf449513e3fad89f59f56f327e7afd154d96
 2019-03-14 17:49:44 +01:00
fermin831 da08acce4f [Netflow live] Removed units 
Former-commit-id: 37d9182a46a85b44a400a50eae48cd7778a3dc84
 2019-03-14 10:36:15 +01:00
fermin831 cf8915af36 [Netflow live] Removed unit from circular mesh 
Former-commit-id: 4f6fceadcf504ccf5006722b26a5b2259adc2970
 2019-03-14 10:05:21 +01:00
Fermin 8a336d6cfe [Netflow live] Implemented resolution on area graphs and fixed end date 
Former-commit-id: 86d55ac7645e62fcae6a07cbf1bd50f92d5d37a1
 2019-03-13 18:55:16 +01:00
fermin831 e0d41957f9 Netflow graphs display as stacked 
Former-commit-id: 58bdd14900b5d6e36041417d31b242f31af9358b
 2019-03-11 16:25:10 +01:00
samucarc 00eb2766a9 Fixed labels in automatic combined graphs 
Former-commit-id: f91777c30da55edc43d021b87cda2c0105626f64
 2019-03-05 18:06:50 +01:00
samucarc 7d88af625e Added module units in module graphs 
Former-commit-id: d17383bd9e8ea7101cf5479b01e2ab0bf45c6813
 2019-03-04 15:53:47 +01:00
fermin831 ac9452583a Added no data to show to some graphs where id not found 
Former-commit-id: 1697a482e80521666f679eb18d2f44fc3975e304
 2019-02-25 16:50:27 +01:00
daniel 43ddd9d482 fixed pdf 
Former-commit-id: e220052501d8f1b4c3d8f392cc9665876671e7ae
 2019-02-18 16:34:48 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
daniel 358532c4a8 fixed autocombined report metaconsole 
Former-commit-id: f277a1302c0b84ca0417693673ca3da0a4956f6c
 2018-12-12 16:13:31 +01:00
danielmaya f6858e2681 Fixed custom graph 
Former-commit-id: a04d267f990d4628e8b0fc263066c44c3dc4febb
 2018-12-11 19:21:43 +01:00
vgilc f53dbea234 Merge branch '1804-Imagen-para-no-data' into 'develop' 
Added text for nodata in graph and resized image - #1804

See merge request artica/pandorafms!1838
 2018-11-30 13:38:07 +01:00
vgilc 196a37ce05 Merge branch 'ent-2995-graficas' into 'develop' 
Fixed no data to show in not init modules with TIP graphs

See merge request artica/pandorafms!1963
 2018-11-30 13:06:17 +01:00
vgilc 4bdc7d5303 Merge branch '3077-Fallos_en_las_consolas_visuales' into 'develop' 
fixed errors in visual console

See merge request artica/pandorafms!2026
 2018-11-30 13:04:31 +01:00
daniel 3bf215782e fixed minor error slicebar 2018-11-29 17:00:55 +01:00
daniel 9bdd1af488 fixed errors in visual console 2018-11-29 13:24:12 +01:00
daniel 557002d7fd fixed error events graphs 2018-11-23 10:32:58 +01:00
fermin831 66448673c1 Fixed no data to show in not init modules with TIP graphs 2018-11-13 09:00:42 +01:00
fermin831 a201262737 Fixed php errors on radial networkmap 2018-11-12 16:29:31 +01:00
samucarc 8a2e82371d Fixed stacked area graph error when opened in PDF format 2018-11-08 17:07:47 +01:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00
vgilc fb32ea240f Merge branch '2704_SQL_Horizontal_bar_graph_en_informe_corta_los_labels_si_son_muy_largos' into 'develop' 
Fixed SQL graphs in reports

See merge request artica/pandorafms!1791
 2018-10-25 12:11:41 +02:00
vgilc aff94d0761 Merge branch 'ent-2543-6208-version-movil-metaconsola-no-muestra-graficas-ni-algunas-imagenes-metaconsola-no-redirige-a-vista-de-movil' into 'develop' 
Ent 2543 6208 version movil metaconsola no muestra graficas ni algunas imagenes metaconsola no redirige a vista de movil

See merge request artica/pandorafms!1886
 2018-10-25 10:40:56 +02:00
danielmaya 87abf1dc02 added event time filter in tactical view 2018-10-24 16:36:44 +02:00
fermin831 8cb2ff1d1b Fixed tactical view graph on mobile metaconsole 2018-10-23 17:41:14 +02:00
daniel ffc7734ebc delete flash_charts and library pchart 2018-10-19 11:31:06 +02:00
daniel b736746e1c php version upgrade 2018-10-19 10:04:26 +02:00
daniel 3c62388f0e fixed errors php and slicebars change version php7 2018-10-16 15:32:31 +02:00
fermin831 41d104ae2c Improve performance on tactical view with a lot of events 2018-10-15 12:23:51 +02:00
daniel d28bc79b79 upgrade php 2018-10-15 09:05:04 +02:00
daniel 16be9488c8 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/include/functions_graph.php
 2018-10-11 13:06:17 +02:00
daniel 1f56054f6c fixed changes php7 2018-10-11 12:57:48 +02:00
fermin831 2693bbe209 Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev 
Conflicts:
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/operation/agentes/ver_agente.php
 2018-10-10 19:39:27 +02:00
danielmaya f952d5c70e tags_get_acl_tags revision 2018-10-08 17:45:26 +02:00
tatiana.llorente@artica.es 918ba8ed77 Added text for nodata in graph and resized image - #1804 2018-10-08 11:53:30 +02:00
Fermin 1e4c570541 [Tags performance] check agents_get_modules in networkmap and removed unused code 2018-10-05 10:44:24 +02:00