Commit Graph

869 Commits

Author SHA1 Message Date
Pablo Aragon 936c9bcafb 10454-Events 2023-02-27 10:12:42 +01:00
Pablo Aragon e024658520 10454-Events 2023-02-27 09:57:17 +01:00
Pablo Aragon a9d49dea3b 10454-Fix filters 2023-02-24 10:04:23 +01:00
Pablo Aragon 1e384fd054 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 13:08:27 +01:00
Pablo Aragon 2081459556 10454-Fix event view 2023-02-22 13:08:15 +01:00
daniel 8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
2023-02-22 12:35:34 +01:00
Matias Didier cbbb874d7b Merge branch 'ent-10416-no-aplica-los-filtros-de-eventos-desde-servicio' into 'develop'
Ent 10416 no aplica los filtros de eventos desde servicio

See merge request artica/pandorafms!5551
2023-02-22 10:36:00 +00:00
Jimmy Olano 016a4b7975 Merge branch 'ent-10267-limitar-bloque-de-pagina-en-la-vista-de-eventos' into 'develop'
Ent 10267 limitar bloque de pagina en la vista de eventos

See merge request artica/pandorafms!5484
2023-02-20 23:00:29 +00:00
Daniel Cebrian f67bf4d084 #10416 added name agent in filter event 2023-02-20 13:10:00 +01:00
Jose Gonzalez 175d4b7341 Fixes in Event view and other fixes 2023-02-09 16:13:30 +01:00
Jose Gonzalez e3b2ec529a Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-02-03 14:16:47 +01:00
alejandro.campos@artica.es 4d24f281fe fixed minor bug 2023-02-01 14:56:30 +01:00
Daniel Cebrian 2b9f7f9b09 #10267 limit entries in events list 2023-02-01 10:47:36 +01:00
Matias Didier 6d2f4d7eac Merge branch 'ent-10208-sound-events-antiguo-aun-se-puede-usar-en-nodo' into 'develop'
remove old format events sounds pandora_enterprise#10208

See merge request artica/pandorafms!5468
2023-02-01 07:18:29 +00:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
daniel 95575b4e90 remove old format events sounds pandora_enterprise#10208 2023-01-27 12:37:25 +01:00
Jonathan 1513736c90 #7172 RSS add agent_name 2023-01-17 10:14:22 +01:00
Jonathan 6d465add5c #7172 RSS add agent_name 2023-01-17 10:10:59 +01:00
Jose Gonzalez 8421fb49ca Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-01-04 15:54:16 +01:00
alejandro.campos@artica.es 6a21efc42c fix bug when loading filters from base64 string 2022-12-14 11:08:24 +01:00
Daniel Barbero cbc598eb03 fixed minor error pandora_enterprise#9135 2022-12-13 09:30:56 +01:00
Daniel Barbero a0ddad63b8 Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos
Conflicts:
	pandora_console/extras/mr/59.sql
2022-12-13 09:17:39 +01:00
Diego Muñoz-Reja 31919d4d2c Merge branch 'ent-9801-bloqueo-de-boton-en-generacion-de-ficheros-pdf-csv-json-varias-secciones' into 'develop'
Prepare download control

See merge request artica/pandorafms!5276
2022-12-12 08:29:51 +00:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
Calvo d525cb594c WIP: Download wait message 2022-12-02 09:42:24 +01:00
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +01:00
Daniel Rodriguez 0fb90e3383 Merge branch 'ent-9861-stored-cross-site-scripting-vulnerability-in-create-event-section' into 'develop'
Fix events view XSS vulnerabilities

See merge request artica/pandorafms!5284
2022-11-23 09:46:52 +00:00
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
Calvo 5aa51f28de Fix events view XSS vulnerabilities 2022-11-22 15:54:19 +01:00
Daniel Barbero d1beb5cb2d fixed filters pandora_enterprise#9864 2022-11-22 11:35:38 +01:00
jose.gonzalez@pandorafms.com 8e0e249b81 Fixed views and styles 2022-11-21 14:49:07 +01:00
Daniel Barbero 4118a46b9f add new filter search events pandora_enterprise#9135 2022-11-18 14:04:54 +01:00
jose.gonzalez@pandorafms.com f99a7dc511 Adaptations 2022-11-07 14:04:07 +01:00
Daniel Barbero 33b1c0ab8f add new filter pandora_enterprise#9135 2022-11-03 12:00:58 +01:00
jose.gonzalez@pandorafms.com 2cb72f532c Adapted views 2022-10-26 17:00:54 +02:00
Daniel Rodriguez b6a38e1b7a Merge branch 'ent-9671-faltan-opciones-masivas-en-operaciones-con-eventos' into 'develop'
event multiple operations pandora_enterprise#9671

See merge request artica/pandorafms!5203
2022-10-25 09:05:43 +00:00
Diego Muñoz-Reja aff8fdb005 Merge branch 'ent-9425-agrupar-eventos-por-id_extra' into 'develop'
new group by events for extraid pandora_enterprise#9425

See merge request artica/pandorafms!5147
2022-10-24 15:19:21 +00:00
Daniel Barbero 6ef3505eab event multiple operations pandora_enterprise#9671 2022-10-19 16:20:49 +02:00
Daniel Barbero 47a2e01a33 Merge remote-tracking branch 'origin/develop' into ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya
Conflicts:
	pandora_console/extras/mr/58.sql
2022-10-18 07:59:26 +02:00
Jimmy Olano 9c413b355d Merge branch 'ent-9579-derivado-del-trabajo-q-a-765-desactivar-opcion-activate-events-history-en-metaconsola' into 'develop'
remove tmetaconsole_history token pandora_enterprise#9579

pandora_enterprise#9579

See merge request artica/pandorafms!5161
2022-10-14 08:33:26 +00:00
Daniel Barbero 4dd311063e fixed errors view events sort and save filters pandora_enterprise#9425 2022-10-14 09:31:45 +02:00
Daniel Barbero a21048c4c5 Merge remote-tracking branch 'origin/develop' into ent-9425-agrupar-eventos-por-id_extra 2022-10-14 08:11:51 +02:00
Diego Muñoz-Reja 6d076adb9f Merge branch 'ent-8597-13156-anadir-opciones-en-busqueda-de-eventos' into 'develop'
filter events multiselector nodes pandora_enterprise#8597

See merge request artica/pandorafms!5152
2022-10-11 15:15:07 +00:00
Daniel Barbero 58221a7c12 fixed minor error array servers pandora_enterprise#8597 2022-10-10 17:08:20 +02:00
Daniel Barbero ead788cfd5 ack_utimestamp integer pandora_enterprise#9578 2022-09-30 12:30:01 +02:00
Daniel Barbero 4609e141ee remove tmetaconsole_history token pandora_enterprise#9579 2022-09-30 08:56:19 +02:00
Daniel Barbero 8438045cf6 filter recursive groups in events pandora_enterprise#2133 2022-09-29 12:54:46 +02:00
Daniel Barbero 3dea1f3146 filter events multiselector nodes pandora_enterprise#8597 2022-09-29 09:17:37 +02:00
Daniel Barbero 9e2c6edfeb new group by events for extraid pandora_enterprise#9425 2022-09-27 15:08:09 +02:00
edu.corral af7ad37b50 ent 8659 fullname event owner 2022-09-16 11:04:01 +02:00