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

4620 Commits

Author SHA1 Message Date
José González f8efbc5fce Fixed issue with module name 2022-09-28 16:29:18 +02:00
Daniel Barbero 755432b381 Merge remote-tracking branch 'origin/develop' into ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo 2022-09-28 08:52:43 +02:00
Jimmy Olano 09e934395f Merge branch 'ent-9456-giss-errores-en-la-paginacion-vista-alertas-metaconsola' into 'develop' 
Fix alerts list pagination on meta

Ref: pandora_enterprise#9456

See merge request artica/pandorafms!5095
 2022-09-27 14:10:47 +00:00
Daniel Barbero 9e2c6edfeb new group by events for extraid pandora_enterprise#9425 2022-09-27 15:08:09 +02:00
Daniel Rodriguez 5047f8afb9 Merge branch 'ent-8659-mostrar-nombre-completo-del-usuario-para-el-owner-de-un-evento' into 'develop' 
Ent 8659 mostrar nombre completo del usuario para el owner de un evento

See merge request artica/pandorafms!5114
 2022-09-27 10:50:17 +00:00
José González 1ae6267acc Fix issue with agent_alias 2022-09-27 11:14:18 +02:00
Daniel Barbero 7bedb8ecf7 Merge remote-tracking branch 'origin/develop' into ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo 2022-09-27 09:52:24 +02:00
Daniel Barbero fbce8b7533 fixed response events pandora_enterprise#9423 2022-09-27 09:51:37 +02:00
Calvo 8174925a91 Delete favourite vc from menu when vc is deleted 2022-09-26 11:32:07 +02:00
Calvo 2a4176085f Fix alerts meta datatables 2022-09-26 09:22:19 +02:00
José González 09c6c5a0f9 Fix 2022-09-23 12:54:51 +02:00
alejandro.campos@artica.es 76f7761373 fixes in double auth 2022-09-22 08:59:39 +02:00
Daniel Barbero 229436b972 fixed agent/module widget pandora_enterprise#9519 2022-09-19 14:40:31 +02:00
Calvo bc5f1d0dce Fix meta alert datatable order 2022-09-19 14:02:50 +02:00
edu.corral af7ad37b50 ent 8659 fullname event owner 2022-09-16 11:04:01 +02:00
Calvo 56c5f324b0 Fix alerts metaconsole datatable order 2022-09-15 18:01:16 +02:00
José González 68654804b4 Fixed minor issue 2022-09-14 17:18:39 +02:00
José González 9164f1e681 IP Allow control 2022-09-12 12:41:09 +02:00
José González 0daeb906f1 WIP 2022-09-06 14:58:38 +02:00
Daniel Maya d3612439fb #8898 conflict resolved 2022-08-29 14:06:15 +02:00
Daniel Maya 53cbb4d3da #9107 conflict resolved 2022-08-29 10:13:39 +02:00
Daniel Maya 16554cfc7a #8898 networkmap 2022-08-29 09:39:47 +02:00
Daniel Maya b4a061a190 #9442 Fixed enterprise acl 2022-08-23 13:22:10 +02:00
Daniel Maya 182bb2d2c4 8898 Refresh time 2022-08-23 11:17:48 +02:00
Daniel Maya b58b0d6c51 #9348 fixed update relations 2022-08-17 12:52:02 +02:00
Daniel Barbero 9b3d7ba763 fixed 500 php7.2 pandora_enterprise#9387 2022-08-11 14:05:01 +02:00
Daniel Barbero de922dd0b2 fixed 500 php7.2 pandora_enterprise#9387 2022-08-11 13:52:34 +02:00
Daniel Maya 08da6de1da #8898 Added options icon 2022-08-11 09:36:08 +02:00
Daniel Barbero 2a51a448ac Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 
Conflicts:
	pandora_console/godmode/menu.php
 2022-08-02 10:34:21 +02:00
Daniel Barbero Martin bbf9174903 fix error custom data events list pandora_enterprise#9304 2022-07-22 10:11:14 +02:00
Jimmy Olano 33f6ae1875 Merge branch 'ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola' into 'develop' 
Alerts list datatable

Ref: pandora_enterprise#8797

See merge request artica/pandorafms!5018
 2022-07-22 02:39:35 +00:00
Daniel Rodriguez 5d674b76b6 Merge branch 'ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos' into 'develop' 
new filter search eventspandora_enterprise#8942

See merge request artica/pandorafms!5007
 2022-07-21 10:15:49 +00:00
Daniel Barbero Martin 027f61daff Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos 
Conflicts:
	pandora_console/extras/mr/56.sql
 2022-07-19 10:18:04 +02:00
Calvo 642c60428c Merge remote-tracking branch 'origin/develop' into ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola 2022-07-19 09:40:56 +02:00
Daniel Barbero Martin 84fbf0e3dd double refresh page events pandora_enterprise#9279 2022-07-18 16:44:31 +02:00
Calvo 34333f9f88 Alerts list datatable 2022-07-15 12:15:37 +02:00
Daniel Maya 987678b339 #9107 Fixed filter event 2022-07-15 11:38:46 +02:00
Diego Muñoz-Reja 74d19b3dbd Merge branch 'ent-9029-Mejora-estética-en-header-vista-agente' into 'develop' 
Ent 9029 mejora estética en header vista agente

See merge request artica/pandorafms!5003
 2022-07-13 12:54:54 +00:00
Daniel Maya 9d259a4097 #9029 Added starmap 3 2022-07-12 16:18:17 +02:00
Daniel Barbero Martin 01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
Diego Muñoz-Reja c756f804a7 Merge branch 'ent-9095-cambios-visuales-en-la-interfaz-consola-sonora-de-eventos' into 'develop' 
modal sound events pandora_enterprise#9095

See merge request artica/pandorafms!4998
 2022-07-06 14:57:44 +00:00
Daniel Maya a71c26b4a7 #9029 Added starmap 2022-07-05 17:44:52 +02:00
Diego Muñoz-Reja a257f43d49 Merge branch 'ent-8939-Cambiar-comportamiento-de-los-comentarios-en-eventos-rendimiento' into 'develop' 
Ent 8939 cambiar comportamiento de los comentarios en eventos rendimiento

See merge request artica/pandorafms!4889
 2022-07-05 15:44:24 +00:00
Diego Muñoz-Reja 3ebcf710ee Merge branch 'ent-9245-13886-auth-token-en-respuesta-de-vista-de-eventos' into 'develop' 
fix error events pandora_enterprise#9245

See merge request artica/pandorafms!5002
 2022-07-05 15:14:18 +00:00
Daniel Barbero Martin 12f73d86fd new filter search eventspandora_enterprise#8942 2022-07-05 17:02:40 +02:00
Daniel Barbero Martin 033027f360 modal sound events pandora_enterprise#9095 2022-07-04 17:09:30 +02:00
Diego Muñoz-Reja 08a9761046 Merge branch 'ent-9239-bug-eventos-nodo' into 'develop' 
bugs events pandora_enterprise#9239

See merge request artica/pandorafms!4995
 2022-07-04 11:04:04 +00:00
Daniel Barbero Martin 15363b1ac5 Merge remote-tracking branch 'origin/develop' into ent-9095-cambios-visuales-en-la-interfaz-consola-sonora-de-eventos 2022-07-04 09:12:10 +02:00
Daniel Barbero Martin de926b5677 fix error events pandora_enterprise#9245 2022-07-01 13:54:33 +02:00
Daniel Barbero Martin 2dc16a2a19 modal sound events pandora_enterprise#9095 2022-07-01 13:08:39 +02:00
Jimmy Olano c074cd81bf Merge branch 'ent-8302-Añadir-opción-de-mostrar-solo-grupos-con-datos-en-Group-view' into 'develop' 
Ent 8302 añadir opción de mostrar solo grupos con datos en group view

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8302

See merge request artica/pandorafms!4949
 2022-07-01 10:47:27 +00:00
Daniel Barbero Martin e28bfe9f3f modal sound events pandora_enterprise#9095 2022-06-30 17:17:05 +02:00
Diego Muñoz-Reja ef48206e7f Merge branch 'ent-8763-g-sanchez-anadir-filtro-de-grupos-al-widget-de-vista-tactica' into 'develop' 
Ent 8763 g sanchez anadir filtro de grupos al widget de vista tactica

See merge request artica/pandorafms!4937
 2022-06-30 12:54:40 +00:00
Daniel Barbero Martin e009257d2f bugs events pandora_enterprise#9239 2022-06-30 11:56:25 +02:00
Jimmy Olano f07ed9e4e9 Merge branch 'ent-9125-Bug-a-la-hora-de-crear-gráficas-personalizadas-desde-el-agente' into 'develop' 
Ent 9125 bug a la hora de crear gráficas personalizadas desde el agente

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9125

See merge request artica/pandorafms!4946
 2022-06-29 22:25:00 +00:00
Daniel Maya 547962c83a Merge branch 'develop' into ent-8763-g-sanchez-anadir-filtro-de-grupos-al-widget-de-vista-tactica 2022-06-29 17:27:25 +02:00
Diego Muñoz-Reja 9120eb44c5 Merge branch 'ent-9231-grave-problema-seguridad-vista-de-eventos-metaconsola' into 'develop' 
fix events pandora_enterprise#9231

See merge request artica/pandorafms!4990
 2022-06-28 15:37:46 +00:00
Daniel Barbero Martin 0957dd338f fix events pandora_enterprise#9231 2022-06-28 16:56:25 +02:00
José González b03356cc3c Merge branch 'develop' into 'ent-9089-Mejoras-usabilidad-menu-gestion-eventos' 
# Conflicts:
#   pandora_console/godmode/menu.php
 2022-06-28 14:08:13 +00:00
Daniel Maya 475524df04 #8939 conflict resolved 2022-06-28 10:58:17 +02:00
Daniel Barbero Martin 1c051f88bc Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/functions_events.php
 2022-06-27 16:07:19 +02:00
Daniel Barbero Martin 58f5f4e9f1 refactor events meta pandora_enterprise#9086 2022-06-23 12:47:49 +02:00
Daniel Barbero Martin 0c09e7fc22 refactor events meta pandora_enterprise#9086 2022-06-22 14:05:21 +02:00
Daniel Barbero Martin 4b00e8ee3c refactor events meta pandora_enterprise#9086 2022-06-22 10:29:19 +02:00
Daniel Barbero Martin c42852a18f refactor events meta pandora_enterprise#9086 2022-06-21 11:20:26 +02:00
Daniel Barbero Martin 9d23b9af4a refactor events meta pandora_enterprise#9086 2022-06-21 11:17:18 +02:00
Daniel Rodriguez 529ce88d00 Merge branch 'ent-9131-Falla-carga-de-eventos-v762-ante-eventos-especificos' into 'develop' 
Fix possible custom_data with null strings

See merge request artica/pandorafms!4952
 2022-06-21 08:31:53 +00:00
Daniel Rodriguez bf8cb56895 Merge branch 'ent-8590-indicar-a-que-satelite-pertenece-un-agente' into 'develop' 
Console changes for 8590

See merge request artica/pandorafms!4947
 2022-06-20 15:11:42 +00:00
Daniel Barbero Martin 3e59093b0e refactor events meta pandora_enterprise#9086 2022-06-20 12:29:00 +02:00
Daniel Rodriguez fa8ed3398f Merge branch 'ent-8061-vista-netflow-con-black-theme' into 'develop' 
Fix black theme issues

See merge request artica/pandorafms!4873
 2022-06-20 09:38:25 +00:00
Daniel Barbero Martin 7e25a86d52 refactor events meta pandora_enterprise#9086 2022-06-17 12:50:40 +02:00
Calvo 0c2823f23f Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-17 12:38:11 +02:00
Calvo 5ce0ebb72a Fix agent view satellite name visual 2022-06-17 10:09:37 +02:00
Daniel Rodriguez ffdc8ee656 Merge branch 'ent-9032-Mejora-visual-eventos-largos-destrozan' into 'develop' 
Improve event names

See merge request artica/pandorafms!4951
 2022-06-16 06:41:07 +00:00
Daniel Barbero Martin 8ad6d350af refactor events meta pandora_enterprise#9086 2022-06-15 13:06:10 +02:00
Daniel Barbero Martin 3b3e964cf9 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-14 07:57:18 +02:00
Daniel Barbero Martin 5968febd04 Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2022-06-13 17:10:19 +02:00
Daniel Barbero Martin 90013603a7 refactor events meta pandora_enterprise#9086 2022-06-13 17:06:09 +02:00
Daniel Rodriguez 38de162f94 Merge branch 'ent-9031-Mejora-visual-Cajas-de-busqueda-avanzada-de-ver-eventos' into 'develop' 
Ent 9031 mejora visual cajas de busqueda avanzada de ver eventos

See merge request artica/pandorafms!4925
 2022-06-13 09:22:54 +00:00
Daniel Rodriguez 3506fd0067 Merge branch 'ent-9030-cambiar-altura-lista-vista-filtro-eventos' into 'develop' 
Change selector size

See merge request artica/pandorafms!4920
 2022-06-13 09:22:22 +00:00
Daniel Barbero Martin 5680b82563 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-13 08:16:40 +02:00
José González 73a124b299 Fix possible custom_data with null strings 2022-06-09 14:00:53 +02:00
Ramon Novoa 48b20b255b Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-09 12:05:24 +02:00
José González bce182f2b2 Improve event names 2022-06-09 11:02:11 +02:00
Daniel Barbero Martin 8dbc860f4a refactor events meta pandora_enterprise#9086 2022-06-08 17:01:15 +02:00
Daniel Maya 3e15ed2726 #8302 Added show_empty_groups 2022-06-08 15:17:03 +02:00
Calvo 5297123d17 Console changes for 8950 2022-06-08 13:10:01 +02:00
Daniel Rodriguez a40efcfee5 Merge branch 'ent-9037-controles-pegados-en-agente-detail-view' into 'develop' 
Ent 9037 controles pegados en agente detail view

See merge request artica/pandorafms!4936
 2022-06-08 09:11:54 +00:00
Daniel Rodriguez a2c1b38a3f Merge branch 'ent-9011-Fallo-permisos-en-paradas-planificadas' into 'develop' 
fixed permissions in selectors

See merge request artica/pandorafms!4931
 2022-06-08 09:10:51 +00:00
Daniel Maya 6a8140b36c #9125 Fixed chart type 2022-06-08 10:59:46 +02:00
Daniel Barbero Martin 951a1703bf Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/include/functions_reporting.php
 2022-06-08 08:15:49 +02:00
Daniel Barbero Martin ee2810e680 refactor events meta pandora_enterprise#9086 2022-06-07 17:25:51 +02:00
Daniel Rodriguez fc18c1a168 Merge branch 'ent-9035-Si-no-hay-inventario,-no-deberia-mostrar-la-solapa-de-inventario' into 'develop' 
Hide inventory view if agent dont have inventory modules

See merge request artica/pandorafms!4916
 2022-06-07 11:52:37 +00:00
Daniel Rodriguez c433fcf3f0 Merge branch 'ent-9038-ocultar-opciones-en-la-busqueda-de-vista-de-modulos' into 'develop' 
Ent 9038 ocultar opciones en la busqueda de vista de modulos

See merge request artica/pandorafms!4930
 2022-06-07 09:12:51 +00:00
Daniel Maya d6fc15f0bf #8763 Added filter groups 2022-06-06 11:14:09 +02:00
edu.corral 9d7b047e72 9037 fixed agent view controls 2022-06-03 14:15:51 +02:00
José González 1be4948e2d Changed strings and improve code 2022-06-03 12:26:15 +02:00
Daniel Barbero Martin 1cd680a971 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/operation/events/events.php
 2022-06-03 09:28:18 +02:00
Daniel Rodriguez 3945cfe07a Merge branch 'ent-8737-Filtro-eventos-se-pierde-al-poner-pantalla-completa' into 'develop' 
Fix fb64 forgiven severity params

See merge request artica/pandorafms!4815
 2022-06-02 07:09:40 +00:00
Daniel Barbero Martin 0cda3d3613 refactor events meta pandora_enterprise#9086 2022-06-01 17:27:44 +02:00