tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-27 04:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity
32,402 Commits 34 Branches 30 Tags
Commit Graph

17573 Commits

Author SHA1 Message Date
Daniel Rodriguez
d0e738e8fb Merge branch 'ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola' into 'develop' 
Ent 7937 mensaje this node is configured with centralized mode de nodo sale en metaconsola

See merge request artica/pandorafms!4409
 2021-10-05 09:18:41 +00:00
fbsanchez
31f329a833 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 
Conflicts:
	pandora_console/vendor/composer/autoload_classmap.php
	pandora_console/vendor/composer/autoload_static.php
 2021-10-05 10:57:00 +02:00
alejandro.campos@artica.es
ccac91e83c fixed projection report in metaconsole 2021-10-05 10:47:50 +02:00
artica
d1b9dc4ef8 Auto-updated build strings. 2021-10-05 01:00:20 +02:00
fbsanchez
e11d8f3766 minor schema update 2021-10-04 19:43:57 +02:00
alejandro.campos@artica.es
c08806374e removed deprecated get_magic_quotes_gpc function and dependent code 2021-10-04 17:37:06 +02:00
marcos
aa43caee23 resolved mrege conflicts 2021-10-04 14:22:11 +02:00
marcos
4f2be6f280 add title on odometer 2021-10-04 13:32:48 +02:00
marcos
7418719861 resolved merge conflict 2021-10-04 12:27:57 +02:00
marcos
30bf0ee163 Merge remote-tracking branch 'origin/master' into ent-7938-bug-visual-en-item-odometro-cv 2021-10-04 11:56:08 +02:00
Jose Gonzalez
6deaee84ac Merge 2021-10-04 10:00:15 +02:00
artica
0e02cb314c Auto-updated build strings. 2021-10-04 01:00:16 +02:00
artica
7b369d4fed Auto-updated build strings. 2021-10-03 01:00:15 +02:00
artica
fd51190b07 Auto-updated build strings. 2021-10-02 01:00:19 +02:00
Daniel Rodriguez
7904c61df5 Merge branch 'ent-7273-Consola-Visual-nuevo-elemento-Gráfica-básica' into 'develop' 
Ent 7273 consola visual nuevo elemento gráfica básica

See merge request artica/pandorafms!4304
 2021-10-01 12:48:09 +00:00
Daniel Rodriguez
e5e91e2868 Merge branch 'ent-7168-Integrar-vista-de-warnings-en-Availability-reports' into 'develop' 
modified availability report

See merge request artica/pandorafms!4361
 2021-10-01 12:45:53 +00:00
Daniel Rodriguez
31bc3c2747 Merge branch 'ent-8062-Graficas-combinadas-en-CV-de-Meta-no-muestra-datos' into 'develop' 
Ent 8062 graficas combinadas en cv de meta no muestra datos

See merge request artica/pandorafms!4435
 2021-10-01 12:32:20 +00:00
Jose Gonzalez
5eb66e5c6e Fixed issue with node actions 2021-10-01 14:05:41 +02:00
Daniel Maya
eb4277f4bd #7273 Fixed background and value 2021-10-01 13:13:33 +02:00
alejandro.campos@artica.es
675e64d8ca fix in threshold calculation 2021-10-01 09:06:41 +02:00
artica
1d74155723 Auto-updated build strings. 2021-10-01 01:00:22 +02:00
alejandro.campos@artica.es
af4a29d093 minor fix 2021-09-30 17:43:55 +02:00
Daniel Maya
12d47cd1aa #8024 fixed router ip 2021-09-30 16:09:08 +02:00
alejandro.campos@artica.es
277fcd51ca minor changes 2021-09-30 16:02:14 +02:00
Daniel Rodriguez
d791f050b2 Merge branch 'ent-7963-NetFlow-Live-View-fallos-al-mostrar-datos' into 'develop' 
Ent 7963 net flow live view fallos al mostrar datos

See merge request artica/pandorafms!4429
 2021-09-30 12:14:43 +00:00
Daniel Rodriguez
8d07ccb9cc Merge branch 'ent-7309-Expand-tree-snmp-browser' into 'develop' 
fixed expand all tree tool in snmp browser

See merge request artica/pandorafms!4262
 2021-09-30 12:12:57 +00:00
fbsanchez
e237d7dd07 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/mr/50.sql
 2021-09-30 12:24:19 +02:00
fbsanchez
9dff230b65 Allow enable or disable cache in Entity and some minor fixes 2021-09-30 12:23:37 +02:00
artica
036da5ea3a Auto-updated build strings. 2021-09-30 01:00:18 +02:00
fbsanchez
696c59b258 WIP NCM 2021-09-29 20:56:39 +02:00
Jose Gonzalez
8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Daniel Maya
1f32c62de9 #7963 Fixed netflow view 3 2021-09-29 16:47:24 +02:00
Daniel Maya
574098e4ee #8062 Fixed custom graph in metaconsole 2021-09-29 16:20:18 +02:00
Jose Gonzalez
0a0d055252 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-09-29 14:21:23 +02:00
fbsanchez
8c1838abb7 Merge remote-tracking branch 'origin/develop' into ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola 
Conflicts:
	pandora_console/install.php
 2021-09-29 13:47:10 +02:00
alejandro.campos@artica.es
fc6fb36293 Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports 2021-09-29 13:29:20 +02:00
Daniel Rodriguez
04d683286f Merge branch 'ent-5193-IPAM-Supernet-Map-Tree-View' into 'develop' 
implemented supernet treeview

See merge request artica/pandorafms!4431
 2021-09-29 10:10:26 +00:00
Daniel Maya
fb449910c9 #7963 Fixed netflow view 2 2021-09-29 10:57:57 +02:00
Daniel Rodriguez
56c197e4a5 Merge branch 'ent-7867-Error-al-listar-las-interfaces-en-Interface-View' into 'develop' 
Ent 7867 error al listar las interfaces en interface view

See merge request artica/pandorafms!4379
 2021-09-29 08:33:10 +00:00
artica
06c42a051d Auto-updated build strings. 2021-09-29 01:00:20 +02:00
Jose Gonzalez
d68328c777 Fix issue with encrypted password 2021-09-28 16:39:22 +02:00
Daniel Rodriguez
08fe77ddaa Merge branch 'ent-7766-query-extra-fields-componentes-remotos-wmi' into 'develop' 
WMI remote componente add text _field_wmi_n_

See merge request artica/pandorafms!4286
 2021-09-28 12:57:50 +00:00
Daniel Rodriguez
ddd550ce42 Merge branch 'ent-8022-12445-duplicacion-de-politicas-con-mergeador-de-metaconsola' into 'develop' 
Entity dynamic method calling improved

See merge request artica/pandorafms!4415
 2021-09-28 12:56:00 +00:00
alejandro.campos@artica.es
87ec5970a1 implemented supernet treeview 2021-09-28 13:44:12 +02:00
Daniel Maya
d237fab6a6 #8024 fixed router ip 2021-09-28 13:42:30 +02:00
Daniel Rodriguez
9beda8eada Merge branch 'ent-7651-anadir-nodos-filtrando-por-grupo-en-un-mapa-de-red-no-es-recursivo' into 'develop' 
Added checkbox for group recursion in network maps

See merge request artica/pandorafms!4297
 2021-09-28 10:18:19 +00:00
Jose Gonzalez
1a884a9df6 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-09-28 11:33:48 +02:00
Daniel Maya
af4e49e156 #7963 Fixed netflow view 2021-09-28 09:42:05 +02:00
artica
201fea9378 Auto-updated build strings. 2021-09-28 01:00:21 +02:00
Daniel Rodriguez
894cd0974f Merge branch 'ent-3407-Informes-en-IPAM' into 'develop' 
Ent 3407 informes en ipam

See merge request artica/pandorafms!4424
 2021-09-27 12:06:00 +00:00