Commit Graph

715 Commits

Author SHA1 Message Date
Luis 2f2556ef79 Ent 6680 ventana de perdida de conexion incorrecta 2020-11-04 16:41:25 +01:00
Daniel Rodriguez 946c548244 Merge branch 'ent-6626filtros-de-eventos-personalizados-no-guardia-varios-apartados' into 'develop'
Primeras modificaciones del filtro de eventos

See merge request artica/pandorafms!3585
2020-10-30 14:42:41 +01:00
daniel b3043c2e01 Fixed template events 2020-10-30 13:29:50 +01:00
Daniel Rodriguez 9a5291da5a Merge branch 'ent-6578-Bugs-eventos-sonoros-3' into 'develop'
fixed sound events

See merge request artica/pandorafms!3566
2020-10-30 12:16:54 +01:00
Daniel Rodriguez 12b36e7f5a Merge branch 'ent-6554-status-vacio-al-exportar-eventos-a-csv' into 'develop'
fixed error with value status field

See merge request artica/pandorafms!3548
2020-10-29 15:15:52 +01:00
marcos 765d37d4e9 formato funcion 2020-10-29 15:06:01 +01:00
Daniel Maya 43ca5e4972 Ent 6482 fallo en la agrupación de eventos 2020-10-29 12:53:09 +01:00
marcos cf108c0a17 se cambia el valor del modulo y marca en el filtro usado 2020-10-29 12:30:54 +01:00
marcos edc9038783 Primeras modificaciones del filtro de eventos 2020-10-29 10:24:37 +01:00
alejandro-campos 4ff0923589 fixed sound events 2020-10-23 13:53:38 +02:00
marcos 8b6b573bde fixed error with value status field 2020-10-21 16:18:07 +02:00
fbsanchez 42cca865ac groups_get_children and propagate update 2020-10-21 11:38:57 +02:00
fbsanchez 2187f9d0c9 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
2020-10-02 14:56:07 +02:00
fbsanchez b07d24ed25 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
Conflicts:
	pandora_console/include/functions_api.php
	pandora_console/operation/events/events.php
2020-09-30 18:38:27 +02:00
fbsanchez 5d63bc547e Group selection review 2020-09-29 14:22:58 +02:00
fbsanchez 5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
fbsanchez 724de97818 removed extra content 2020-09-18 11:53:16 +02:00
fbsanchez 696b58544c fixes 2020-09-18 11:47:50 +02:00
fbsanchez bc166dfba2 module custom id in event list + minor fixes 2020-09-17 16:51:23 +02:00
Daniel Rodriguez aceedbe795 Merge branch 'ent-6250-Errores-log-consola' into 'develop'
Ent 6250 errores log consola

Closes pandora_enterprise#6250

See merge request artica/pandorafms!3436
2020-09-15 15:30:07 +02:00
fbsanchez c2238ac295 minor changes 2020-09-11 15:30:18 +02:00
fbsanchez 09a5bad4f1 Fixes in visualization (groups selection) 2020-09-11 15:17:08 +02:00
fbsanchez 3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +02:00
Jose Gonzalez 18a993145e Fixed type array warning messages 2020-09-07 14:38:43 +02:00
marcos 6f02ee8206 fixed error with refresh in events filter 2020-09-04 12:38:46 +02:00
alejandro-campos 6b989109d8 fix event pagination when events history is activated 2020-08-13 10:34:31 +02:00
Luis Calvo 9a8c42f4ac Fixed xss event comments vulnerabiluty and some acls on event ajax 2020-06-26 15:36:51 +02:00
alejandro-campos 1d167d4aba fixed agent id strange behavior in events table 2020-05-25 11:12:29 +02:00
Daniel Maya 8ae8ac45f5 Ent 5690 vulnerabilidad critica inyeccion de comandos en llamada a event response 2020-04-15 15:50:08 +02:00
fbsanchez e48ef76f35 merge 2020-03-26 14:38:23 +01:00
Tatiana Llorente 4777ecd4bf Ent 5439 error grafica eventos de agente 2020-03-24 10:12:14 +01:00
fbsanchez ce11d89953 Frontent changes 2020-03-13 14:03:50 +01:00
Tatiana Llorente 7c928b8100 Ent 4795 check seleccionar todos queda marcado 2020-01-14 08:37:04 +01:00
Daniel Maya 7204e7c0f2 Ent 4862 mas opciones en los filtros de severidad 2020-01-13 18:24:29 +01:00
Tatiana Llorente 1747806256 Ent 3136 no se ven los eventos en el mapa de servicios cuando haces click en los elementos de un servicio creado en la meta 2020-01-13 18:19:50 +01:00
Tatiana Llorente 9d3426c0e9 Ent 4897 filtro erroneo de eventos al clickar en grafica events 24h de agente 2 2019-12-10 15:29:35 +01:00
marcos 21bf49c218 update id_source_event 2019-11-22 13:38:08 +01:00
Marcos Alconada 34cdcdfd6e Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este'
# Conflicts:
#   pandora_console/extras/mr/29.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
#   pandora_console/include/functions_events.php
2019-11-21 10:13:00 +01:00
Daniel Rodriguez 137571f2d1 Merge branch 'ent-4856-8969-Filtro-user-ack-evento-no-funciona-del-todo-bien' into 'develop'
user ack filter in event list not displaying users with all group

See merge request artica/pandorafms!2860
2019-11-06 14:45:09 +01:00
Daniel Rodriguez d460429509 Merge branch 'ent-4898-No-funciona-filtro-de-eventos-cuando-el-idioma-del-usuario-está-en-catalán' into 'develop'
Fixed agent name and error lenght

See merge request artica/pandorafms!2845
2019-11-06 13:14:06 +01:00
alejandro-campos e9b516c399 change access permission to users in user ack filter in event list 2019-11-06 12:56:42 +01:00
Daniel Rodriguez 0e628a365d Merge branch 'ent-4625-Cambiar-titulo-a-archivo-CSV-de-la-vista-de-eventos' into 'develop'
Ent 4625 cambiar titulo a archivo csv de la vista de eventos

See merge request artica/pandorafms!2783
2019-11-05 16:57:23 +01:00
alejandro-campos 9fc635a7a9 user ack filter in event list not displaying users with all group 2019-11-05 11:03:28 +01:00
Daniel Maya 8573add0b3 Fixed agent name and error lenght 2019-10-30 13:01:59 +01:00
Tatiana Llorente 5264de2008 Merge branch 'develop' into 'ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos'
Conflicts:
   pandora_console/operation/events/events.php
2019-10-17 09:27:00 +02:00
Alejandro Fraguas 78610b127c Merge branch 'ent-4682-Comentarios-en-eventos-no-se-ven-en-metaconsola' into 'develop'
Ent 4682 comentarios en eventos no se ven en metaconsola

See merge request artica/pandorafms!2775
2019-10-15 11:42:00 +02:00
Tatiana Llorente d2dc6ba9c1 Merge remote-tracking branch 'origin/develop' into ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos
Conflicts:
	pandora_console/operation/events/events.php
2019-10-08 09:14:08 +02:00
Tatiana Llorente 8a85edac93 Merge remote-tracking branch 'origin/develop' into ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos 2019-10-08 08:59:39 +02:00
Daniel Rodriguez debbbdc4e5 Merge branch 'ent-4726-truncado-eventos-texto-muy-largo' into 'develop'
Improved truncate system and solved issue

See merge request artica/pandorafms!2774
2019-10-07 13:49:57 +02:00
Tatiana Llorente 305d74878c Changed title of csv in events - #4625 2019-10-04 11:51:30 +02:00