tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,786 Commits 34 Branches 30 Tags
Commit Graph

28786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Rodriguez
fb7e443138 Merge branch 'ent-7938-bug-visual-en-item-odometro-cv' into 'develop' 
Ent 7938 bug visual en item odometro cv

See merge request artica/pandorafms!4386
 2021-10-05 09:20:47 +00:00
Daniel Rodriguez
ce53453e32 Merge branch 'ent-8002-bug-visual-vista-informes-open' into 'develop' 
Fiex open report list view

See merge request artica/pandorafms!4408
 2021-10-05 09:20:01 +00:00
Daniel Rodriguez
a794f30141 Merge branch 'ent-8060-bug-modal-networkmaps' into 'develop' 
Fixed issue with node actions

Closes pandora_enterprise#8060

See merge request artica/pandorafms!4438
 2021-10-05 09:19:26 +00:00
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
b963e4b9df Fixed some things 2021-10-04 10:09:01 +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
1cdef62ceb Merge branch 'ent-5693-9848-actualizar-campos-personalizados-agente-mediante-cli' into 'develop' 
add agent_update_custom_fields on cli

See merge request artica/pandorafms!4281
 2021-10-01 12:36:17 +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
Daniel Rodriguez
2c7799d022 Merge branch 'ent-8016-resources-resource-registration-public-resource-library-y-url-error' into 'develop' 
fixed minnor error with resource library url

See merge request artica/pandorafms!4428
 2021-10-01 12:29:49 +00:00
Jose Gonzalez
5eb66e5c6e Fixed issue with node actions 2021-10-01 14:05:41 +02:00
fbsanchez
be95b5ffd0 updates 2021-10-01 13:56:21 +02:00
Daniel Maya
eb4277f4bd #7273 Fixed background and value 2021-10-01 13:13:33 +02:00
fbsanchez
626a9d17c6 timeout for server API conn test at start 2021-10-01 12:35:26 +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
fbsanchez
d322d23203 WIP NCM 2021-09-30 19:10:45 +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
marcos
d0f08be953 update agent custom fields 2021-09-30 14:34:58 +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
marcos
d54af52baf update agent custom fields 2021-09-30 12:50:59 +02: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
fbsanchez
18b1a1e14e Schema update to avoid using JSON columns until internal CICD is updated 2021-09-30 11:18:13 +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
Daniel Rodriguez
aa18f8d1ec Merge branch 'ent-7942-12356-r-works-bug-en-module_ping-agente-windows' into 'develop' 
Do not rely on the exit status of ping.exe for module_ping.

See merge request artica/pandorafms!4432
 2021-09-29 14:02:32 +00:00
Daniel Rodriguez
ee8ae5cf76 Merge branch 'ent-8004-command-center-las-politicas-una-vez-aplicadas-no-se-marcan-en-verde-en-la-metaconsola' into 'develop' 
Avoid MC process data in dataserver

See merge request artica/pandorafms!4427
 2021-09-29 13:27:28 +00: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
fbsanchez
d683e192b5 Moved changes for CorrelationServer schema to MR50 2021-09-29 13:43:08 +02:00