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

1062 Commits

Author SHA1 Message Date
alejandro.campos@artica.es e0090aee95 wrap csv fields with string delimiter on export 2023-05-08 14:47:22 +02:00
Pablo Aragon 886bde919b 11135-Move js code from ui_print_datatable 2023-05-08 14:25:57 +02:00
alejandro.campos@artica.es 4cac880eca send login hash info in post body in meta links to node 2023-05-05 13:04:02 +02:00
daniel e77a63a91f fix select2 pandora_enterprise#11110 2023-05-04 12:57:01 +02:00
Daniel Rodriguez 06b58d3dfc Merge branch 'ent-10191-nuevas-alertas-sonoras-son-poco-usables' into 'develop' 
Ent 10191 nuevas alertas sonoras son poco usables

See merge request artica/pandorafms!5689
 2023-04-28 06:04:18 +00:00
Jonathan f5c517ae7d #10191 event sound fix select2 2023-04-21 09:30:22 +02:00
Pablo Aragon 9e124933b0 10886-Confict 2023-04-18 10:42:37 +02:00
Pablo Aragon bd4066c690 10886-Timestamp events with ui_print_timestamp() 2023-04-17 15:43:53 +02:00
Daniel Rodriguez 895b1bea7c Merge branch 'ent-10945-timestamp-desconocido-en-vista-de-eventos' into 'develop' 
Ent 10945 timestamp desconocido en vista de eventos

See merge request artica/pandorafms!5717
 2023-04-13 14:53:45 +00:00
Daniel Maya a8277dc19f #10945 Fix timestamp 2023-04-13 12:25:18 +02:00
Jorge Rincon 06203dc503 #9464 fix tag filters 2023-04-12 11:02:35 +02:00
Jonathan b36ade1821 #10191 fix url event sounds 2023-04-11 16:24:37 +02:00
Pablo Aragon 5f1e20e399 10886-Timestamp events with ui_print_timestamp() 2023-04-11 15:31:27 +02:00
Jonathan 3a96c60bac #10191 new event sound modal 2023-04-11 13:50:11 +02:00
Daniel Rodriguez ca16c5dd61 Merge branch 'ent-10441-control-de-cache-en-actualizaciones' into 'develop' 
Ent 10441 control de cache en actualizaciones

See merge request artica/pandorafms!5623
 2023-03-31 07:33:26 +00:00
Pablo Aragon 2b121a2fd2 New qrcode.js version & vcard 2023-03-29 15:34:03 +02:00
Jimmy Olano 5044c23ef3 Merge branch 'ent-9529-14208-definir-timezone-por-defecto-para-nuevos-usuarios' into 'develop', JJOS. 
Draft: Ent 9529 14208 definir timezone por defecto para nuevos usuarios

See merge request artica/pandorafms!5492
 2023-03-29 02:28:47 +00:00
Pablo Aragon 5969928003 10408-Fix action column & 10398-Events pure mode 2023-03-28 12:39:02 +02:00
Jonathan 3057e67d1f Merge conflict solution 2023-03-27 12:11:53 +02:00
Daniel Cebrian 075d0a1c4f #10441 added version file in css 2023-03-24 12:06:40 +01:00
daniel 594d34931c fixed styles 2023-03-17 13:20:58 +01:00
Jonathan d323ab7fe5 Timezonevisual correction and fix conflict 2023-03-15 09:06:07 +01:00
Daniel Cebrian e36bb1d065 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-14 08:36:12 +01:00
daniel 0643b4e0ba fixed styles 2023-03-13 12:19:27 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
Jonathan 2a11873638 #9529 fix events last contact value 2023-03-06 12:12:36 +01:00
Jonathan cf29caedcd Conflict solution 2023-03-06 11:04:05 +01:00
Pablo Aragon f3b9d73855 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 12:43:35 +01:00
Pablo Aragon b18a689225 About meta and observer input password 2023-03-03 12:40:58 +01:00
daniel 5d7738a05e Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/operation/events/events.php
 2023-03-03 08:20:44 +01:00
daniel 310ad88707 fixed styles 2023-03-02 19:25:31 +01:00
Jonathan fdab2cff8e Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos 2023-03-02 08:26:53 +01:00
daniel a5e6e569e8 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 08:04:00 +01:00
Daniel Rodriguez 424c4db9de Merge branch 'ent-10302-errores-de-fecha-con-eventos-y-tz' into 'develop' 
Ent 10302 errores de fecha con eventos y tz

See merge request artica/pandorafms!5524
 2023-03-01 12:31:27 +00:00
Pablo Aragon 3dbe668973 Events meta 2023-02-28 17:47:49 +01:00
Pablo Aragon 38a05d2a79 Events meta 2023-02-28 09:50:42 +01:00
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
Daniel Cebrian 0990fe672e #10324 added system fav menu in agent and events 2023-02-23 09:48:13 +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
Daniel Cebrian 3d5458ae46 #10302 fixed ack date 2023-02-22 11:36:09 +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
Daniel Cebrian 50e8b457f8 #10302 fixed tz in event list 2023-02-09 11:42:42 +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
Jonathan 181b172ba8 #9529 timezone visual for new users 2023-02-01 16:57:48 +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
Jonathan b88f26500b #9819 Change labels Accoustic console 2023-01-31 08:35:47 +01:00
Jonathan 7923a5919c Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos 2023-01-31 08:18:17 +01:00
Jonathan 34fede2ce1 #9819 New section configuration sound event 2023-01-27 12:42:23 +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
Daniel Maya 53cbb4d3da #9107 conflict resolved 2022-08-29 10:13:39 +02:00
Daniel Barbero Martin bbf9174903 fix error custom data events list pandora_enterprise#9304 2022-07-22 10:11:14 +02: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
Daniel Barbero Martin 84fbf0e3dd double refresh page events pandora_enterprise#9279 2022-07-18 16:44:31 +02:00
Daniel Maya 987678b339 #9107 Fixed filter event 2022-07-15 11:38:46 +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
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 de926b5677 fix error events pandora_enterprise#9245 2022-07-01 13:54:33 +02:00
Daniel Barbero Martin e28bfe9f3f modal sound events pandora_enterprise#9095 2022-06-30 17:17:05 +02:00
Daniel Barbero Martin e009257d2f bugs events pandora_enterprise#9239 2022-06-30 11:56: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 9d23b9af4a refactor events meta pandora_enterprise#9086 2022-06-21 11:17:18 +02:00
Daniel Barbero Martin 3e59093b0e refactor events meta pandora_enterprise#9086 2022-06-20 12:29:00 +02:00
Daniel Barbero Martin 7e25a86d52 refactor events meta pandora_enterprise#9086 2022-06-17 12:50:40 +02: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 8dbc860f4a refactor events meta pandora_enterprise#9086 2022-06-08 17:01:15 +02:00
Daniel Barbero Martin ee2810e680 refactor events meta pandora_enterprise#9086 2022-06-07 17:25: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 Barbero Martin 0cda3d3613 refactor events meta pandora_enterprise#9086 2022-06-01 17:27:44 +02:00
Daniel Maya f4784f4922 #9031 Fixed css filter 2022-05-31 17:09:15 +02:00
Daniel Barbero Martin f6de9fb0a0 events sound pandora_enterprise#7960 2022-05-31 10:10:44 +02:00
Daniel Barbero Martin 8e78110d5d events sound pandora_enterprise#7960 2022-05-30 17:47:28 +02:00
José González 24ff171f7f Change selector size 2022-05-27 12:17:26 +02:00
Daniel Maya 4ae2df8ded #8939 comment optimization 2022-05-17 13:42:38 +02:00
José González 77636d68ff Fix fb64 forgiven severity params 2022-04-11 15:22:37 +02:00
alejandro.campos@artica.es d137e0d798 implemented custom data filter in event view 2022-03-29 18:09:19 +02:00
alejandro.campos@artica.es 24d144ae26 minor fix 2022-03-23 17:23:45 +01:00
alejandro.campos@artica.es c7dd55e959 minor fix 2022-03-23 17:18:24 +01:00
alejandro.campos@artica.es 5757d4a933 implement csv export of events in meta and minor fixes 2022-03-23 14:24:39 +01:00
alejandro.campos@artica.es e1ec4ce40e change storage format of custom data field in DB 2022-03-18 11:23:29 +01:00
Jose Gonzalez 40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
Daniel Maya e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
Daniel Rodriguez 10e282b76b Merge branch 'ent-8108-Error-en-la-vista-de-eventos-de-un-agente-concreto' into 'develop' 
fixed filter loaded from event graph on agent view

See merge request artica/pandorafms!4564
 2021-12-28 12:02:56 +00:00
Jose Gonzalez 37675e0fce Added php8 function and solve issue with agent id sorting in events 2021-12-16 16:35:31 +01:00
fbsanchez cad0c6cea6 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-02 10:43:30 +01:00
alejandro.campos@artica.es da22381044 fixed filter loaded from event graph on agent view 2021-12-01 11:13:28 +01:00
Calvo d7f590bacb Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-24 13:42:48 +01:00
fbsanchez a9485024f4 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-23 14:29:23 +01:00
Daniel Maya c3295b8fd2 #8191 Fixed filter 2021-11-19 11:38:11 +01:00
Calvo 9d3c691ad1 Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-15 18:33:35 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Daniel Rodriguez ce40b36923 Merge branch 'ent-7582-anadir-selector-horas-eventos' into 'develop' 
Ent 7582 anadir selector horas eventos

Closes pandora_enterprise#7582

See merge request artica/pandorafms!4266
 2021-09-21 13:17:30 +00:00
Calvo 3204fdb71f Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-09-01 11:06:20 +02:00
Daniel Rodriguez 22587a0dde Merge branch 'ent-7036-11346-Introducir-el-campo-de-IP-del-agente-en-la-vista-de-eventos' into 'develop' 
Ent 7036 11346 introducir el campo de ip del agente en la vista de eventos

See merge request artica/pandorafms!4275
 2021-08-25 13:00:42 +00:00
Daniel Rodriguez fe30b9c785 Merge branch 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' into 'develop' 
implemented capacity to handle string data for event data

See merge request artica/pandorafms!4184
 2021-08-17 12:19:54 +00:00
Calvo 34c3b00426 WIP: Revision ACL part 3 2021-08-13 15:57:01 +02:00
Daniel Rodriguez 77d00fd9e2 Merge branch 'ent-7647-vulnerabilidad-xss-en.nombre.filtro-eventos' into 'develop' 
Fixedd XSS on load filter event name

See merge request artica/pandorafms!4174
 2021-08-09 09:00:15 +00:00
Alejandro Campos ff93169049 Merge branch 'develop' into 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' 
# Conflicts:
#   pandora_console/extras/mr/48.sql
 2021-08-09 06:45:46 +00:00
fbsanchez 3d5ae6887c Event migration warnings popups 2021-07-07 16:11:20 +02:00
Daniel Maya 66e9539818 Added agent ip in custom events 2021-07-07 16:07:08 +02:00
José González 47b6e40799 Added controls for filter with hours 2021-07-05 17:42:45 +02:00
alejandro.campos@artica.es 240efc4dcf truncate string 2021-06-08 16:48:01 +02:00
alejandro.campos@artica.es fdc6d2f4c8 implemented capacity to handle string data for event data 2021-06-08 16:09:37 +02:00
Calvo 2f3cae8d61 Fixedd XSS on load filter event name 2021-06-04 13:36:32 +02:00
Daniel Barbero Martin d88520f752 Wip command center 2021-05-28 14:32:41 +02:00
Daniel Barbero Martin 6b248da428 Wip command center 2021-05-25 17:39:21 +02:00
Daniel Barbero Martin 0b36853553 Wip command center 2021-05-24 17:35:15 +02:00
Daniel Maya 8ef21d9b15 Ent 7395 filtro de eventos en metaconsola server 2021-04-28 10:50:04 +00:00
Daniel Rodriguez 5857c0d231 Merge branch 'ent-7393-Filtro-de-eventos-en-Metaconsola-Severity' into 'develop' 
Ent 7393 filtro de eventos en metaconsola severity

See merge request artica/pandorafms!4070
 2021-04-28 06:51:25 +00:00
Daniel Maya dd124fa7d9 Fixed severity 2021-04-26 14:09:07 +02:00
alejandro.campos@artica.es 8f58b74976 fixed filter load in events view 2021-04-21 13:05:18 +02:00
Daniel Rodriguez 79b11a6b30 Merge branch 'ent-4264-cambios-vista-de-eventos' into 'develop' 
Ent 4264 cambios vista de eventos

See merge request artica/pandorafms!3893
 2021-04-12 08:47:13 +00:00
Daniel Rodriguez b89a860ba7 Merge branch 'ent-6969-bug-refresco-eventos' into 'develop' 
Fixed mixed response from event datatables

See merge request artica/pandorafms!3952
 2021-04-07 10:55:25 +00:00
Daniel Rodriguez e54e06b6ac Merge branch 'ent-7030-Alertas-sonoras-VS-eventos-API' into 'develop' 
fixed errors sound events

See merge request artica/pandorafms!3916
 2021-04-06 17:11:37 +00:00
daniel 89ffb05466 fixed errors sound events 2021-04-06 17:11:37 +00:00
Marcos Alconada 9e1bacb66e fixed visual error 2021-03-29 07:23:03 +00:00
Marcos Alconada 9dd17acb57 fixed visual error 2021-03-26 13:40:55 +00:00
Calvo d9d98fe1e3 Fixed mixed response from event datatables 2021-03-25 13:20:30 +01:00
Daniel Rodriguez f92c75639a Merge branch 'ent-7089-11446-trazas-en-el-codigo-de-release' into 'develop' 
Removed extra verbosity

See merge request artica/pandorafms!3899
 2021-03-23 09:29:05 +00:00
Marcos Alconada 04bae1b4fb fixed visual errors 2021-03-18 17:05:50 +00:00
fbsanchez b63f1ad681 Removed extra verbosity 2021-03-15 10:07:36 +01:00
Daniel Maya 2f7d0f1795 fixed permissions on response 2021-03-11 16:11:06 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Daniel Rodriguez 06a027127f Merge branch 'ent-6851-Quitar-marquesina-de-vista-de-eventos' into 'develop' 
Ent 6851 quitar marquesina de vista de eventos

See merge request artica/pandorafms!3752
 2021-03-09 16:39:26 +00:00
Daniel Maya b54845fdcf Ent 6851 quitar marquesina de vista de eventos 2021-03-09 16:39:26 +00:00
Daniel Rodriguez 825c1f05f0 Merge branch 'ent-6527-mal-link-elementos-servicio' into 'develop' 
Added control for id_agent_module

Closes pandora_enterprise#6527

See merge request artica/pandorafms!3703
 2021-03-09 16:38:32 +00:00
Daniel Rodriguez 4996be48dc Merge branch 'ent-6966-No-se-ve-fecha-validacion' into 'develop' 
Fixed issue with date

Closes pandora_enterprise#6966

See merge request artica/pandorafms!3818
 2021-03-09 16:37:34 +00:00
fbsanchez 40e97f6cf6 Removed warnings 2021-02-09 10:25:08 +01:00
Jose Gonzalez aee474e43c Fixed issue with date 2021-02-04 14:54:11 +01:00
Luis Calvo 778419e71d Merge remote-tracking branch 'origin/develop' into ent-6844-quitar-vista-estadisticas-eventos 2021-01-25 13:06:36 +01:00
Luis Calvo 210f2057cd Removes event_statistics view 2020-12-21 17:56:24 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
Jose Gonzalez fd6aef1b37 Added control for id_agent_module 2020-12-09 18:15:01 +01:00
Luis 50b1fa3c56 Changed check connection method to ajax. Check deleted from login 2020-12-03 12:27:55 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
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