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

624 Commits

Author SHA1 Message Date
daniel 1fecd7d289 ITSM pandora_enterprise#11471 2023-08-17 14:56:55 +02:00
daniel 8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
daniel b1c662da67 ITSM pandora_enterprise#11471 2023-08-14 14:19:09 +02:00
daniel 64c7f56235 ITSM pandora_enterprise#11471 2023-08-14 10:59:56 +02:00
daniel f0d78a44d1 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2023-08-11 14:32:54 +02:00
daniel dbf98689c2 ITSM pandora_enterprise#11471 2023-08-11 14:30:18 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/65.sql
 2023-08-09 08:59:01 +02:00
Daniel Cebrian 131f78e21e #11682 fixed special days calendar 2023-08-08 18:04:30 +02:00
Daniel Maya 0d321f5311 #11739 Fixed deprecated functions 3 2023-08-01 11:19:04 +02:00
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02:00
Rafael Ameijeiras 39edfa48df Merge branch 'ent-11419-pequenos-cambios-en-widget-de-graficas-simples' into 'develop' 
Ent 11419 Pequeños cambios en widget de graficas simples

See merge request artica/pandorafms!6155
 2023-07-25 08:04:23 +00:00
Rafael Ameijeiras 6b3b98ac04 Merge branch 'ent-11480-widget-de-estado-de-grupos-no-deberia-mostar-grupos-vacios' into 'develop' 
Ent 11480 Widget de estado de grupos no deberia mostar grupos vacios

See merge request artica/pandorafms!6152
 2023-07-24 10:54:24 +00:00
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
daniel 3e2c2990df Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-20 08:28:36 +02:00
Rafael Ameijeiras 9ff13234be Merge branch 'ent-10696-nuevo-widget-netflow' into 'develop' 
Ent 10696 nuevo widget netflow

See merge request artica/pandorafms!5890
 2023-07-19 11:54:01 +00:00
daniel 1f1b85561c Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-19 11:39:06 +02:00
Daniel Cebrian 018bfe1288 #10696 fixed resize circular mesh 2023-07-19 10:36:30 +02:00
daniel 5707ec9e4b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-18 15:13:29 +02:00
daniel 9a72d0740c ITSM fixed pandora_enterprise#11471 2023-07-18 15:13:08 +02:00
Rafael Ameijeiras dffb9d5bbf Merge branch 'ent-11493-nuevo-widget-colmena-de-agentes-agent-hive' into 'develop' 
Ent 11493 nuevo widget colmena de agentes agent hive

See merge request artica/pandorafms!6085
 2023-07-18 05:30:04 +00:00
Daniel Maya 37b1c94b45 #11493 Fixed icon 2023-07-17 11:53:14 +02:00
daniel a29497f659 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-17 10:52:15 +02:00
Daniel Maya 89f55fd24e resolved conflict 2023-07-17 08:28:38 +02:00
Rafael Ameijeiras df70aa6ee6 Merge branch 'ent-11680-15857-bug-dashboard-metaconsola-widgets-servicio-con-mapa-sunburts' into 'develop' 
Ent 11680 [#15857]Bug Dashboard metaconsola widgets servicio con mapa sunburts

See merge request artica/pandorafms!6190
 2023-07-17 06:04:55 +00:00
daniel 0722cfca1a ITSM fixed pandora_enterprise#11471 2023-07-14 15:42:35 +02:00
daniel c2297052c1 ITSM dashboard pandora_enterprise#11471 2023-07-11 15:55:10 +02:00
daniel 524bb7fdbb Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-11 08:26:20 +02:00
daniel 200750f90b change events user_comment new table tevent_comment pandora_enterprise#11387 2023-07-07 12:53:14 +02:00
Matias Didier add65eca5d Merge branch 'ent-9162-10821-modificar-columnas-widget-eventos' into 'develop' 
Ent 9162 10821 modificar columnas widget eventos

See merge request artica/pandorafms!5843
 2023-07-06 08:35:35 +00:00
Daniel Cebrian bdcb16e6f8 #9162 fixed configure colums in meta 2023-07-06 09:20:21 +02:00
Gorka Sanchez 029cb77068 Merge branch 'ent-11460-top-n-events-by-agent-y-by-module-en-metaconsola-no-toman-en-cuenta-los-top-n-de-los-nodos' into 'develop' 
Ent 11460 top n events by agent y by module en metaconsola no toman en cuenta los top n de los nodos

See merge request artica/pandorafms!6036
 2023-07-03 07:37:28 +00:00
Gorka Sanchez 498a6d1ee6 Merge branch 'ent-11465-widget-agent-module-view-se-rompe-si-aloja-modulo-no-inicializado-que-posteriormente-reporta' into 'develop' 
Ent 11465 widget agent module view se rompe si aloja modulo no inicializado que posteriormente reporta

See merge request artica/pandorafms!6030
 2023-07-03 07:33:54 +00:00
Rafael Ameijeiras b44bd8efca Merge branch 'ent-10691-mejoras-en-widget-top-n-agent-modules' into 'develop' 
Ent 10691 mejoras en widget top n agent modules

See merge request artica/pandorafms!5853
 2023-06-30 07:06:46 +00:00
daniel 564f714112 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-06-29 09:46:08 +02:00
daniel 64c8086854 wip integration integriaIMS pandora_enterprise#11471 2023-06-29 09:45:44 +02:00
Daniel Cebrian 40f0deed67 #11680 fixed multi service widget 2023-06-28 15:12:50 +02:00
Matias Didier 8e42ee6c82 Merge branch 'ent-11262-15597-modulos-deshabiitados-aparecen-en-el-widget-del-dashboard-de-reportes' into 'develop' 
Ent 11262 15597 modulos deshabiitados aparecen en el widget del dashboard de reportes

See merge request artica/pandorafms!5966
 2023-06-28 12:05:03 +00:00
Daniel Cebrian 7c99e788c7 #10691 added image no data in pue graph 2023-06-27 15:53:42 +02:00
daniel 6e3eddff08 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-06-27 08:23:46 +02:00
Rafael Ameijeiras 4edaf4bc78 Merge branch 'ent-11451-network-map-de-dashboard-siempre-aparece-con-zoom-x1-al-editar' into 'develop' 
Ent 11451 Network map de Dashboard siempre aparece con zoom x1 al editar

See merge request artica/pandorafms!6107
 2023-06-26 07:43:41 +00:00
Rafael Ameijeiras f1fc7bbbe5 Merge branch 'ent-11496-opcion-de-click-to-view-report-en-widget-de-custom-report-lleva-a' into 'develop' 
Ent 11496 opcion de click to view report en widget de custom report lleva a

See merge request artica/pandorafms!6106
 2023-06-26 07:41:29 +00:00
Rafael Ameijeiras 7065d8bb4d Merge branch 'ent-11550-widget-tactical-view-muestra-todos-los-datos-en-algunas-partes-aun-filtrando-por-grupo' into 'develop' 
Ent 11550 widget tactical view muestra todos los datos en algunas partes aun filtrando por grupo

See merge request artica/pandorafms!6096
 2023-06-26 07:35:24 +00:00
Matias Didier fde3857674 Merge branch 'ent-11476-cambiar-headers-de-copyright' into 'develop' 
Ent 11476 cambiar headers de copyright

See merge request artica/pandorafms!6069
 2023-06-22 13:24:47 +00:00
miguel angel rasteu 5d4f90ca10 #11550 Fix tactical view widget 2023-06-21 16:10:13 +02:00
Matias Didier 91615f5bd6 Merge branch 'ent-11548-widget-module-in-a-table-es-ilegible' into 'develop' 
Ent 11548 widget module in a table es ilegible

See merge request artica/pandorafms!6089
 2023-06-21 08:17:06 +00:00
Daniel Cebrian bd652e5778 #11419 added new options in basic chart 2023-06-20 17:19:23 +02:00
Daniel Cebrian 5ee902902a #11480 added recursion in condition 2023-06-20 15:20:43 +02:00
Daniel Cebrian 50dca5f8e6 #11480 fixed widget status group 2023-06-20 15:09:50 +02:00
daniel d84299d3ab wip api integration pandora #1355 2023-06-20 08:43:10 +02:00