Commit Graph

620 Commits

Author SHA1 Message Date
Daniel Rodriguez e1e3a953f9 Merge branch 'ent-13079-17199-carga-de-eventos-en-metaconsola-es-muy-lenta-con-regexp' into 'develop'
Ent 13079 [#17199] Carga de eventos en metaconsola es muy lenta (con regexp)

See merge request artica/pandorafms!7055
2024-03-27 11:57:13 +00:00
Pablo Aragon 327516b931 13138-Add label event filter 2024-03-21 14:47:03 +01:00
Daniel Cebrian 8c5b56f055 #13079 only apply reduce events comments with group events 2024-03-21 11:26:36 +01:00
Daniel Cebrian 47895f5f66 #13079 fixed group events 2024-03-21 11:04:30 +01:00
Daniel Cebrian db871e8a29 #13079 performance events fixed in comments 2024-03-20 17:15:30 +01:00
daniel 9771639318 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
2024-02-27 17:27:10 +01:00
alejandro.campos@artica.es c9bde8d90a Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query 2024-02-23 11:14:17 +01:00
alejandro.campos@artica.es 195766e11c minor fixes 2024-02-22 15:05:48 +01:00
alejandro.campos@artica.es df7435132a change regex search in events 2024-02-16 10:10:38 +01:00
Jonathan 0dcced8b53 #12695 wip removing warnings 2024-02-12 17:59:27 +01:00
daniel 851b046add Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-02-12 08:05:36 +01:00
Jonathan 6e1fb2f061 #12695 wip removing warnings 2024-02-08 17:17:17 +01:00
Jonathan 2246fd8049 #12695 WIP warnings 2024-02-07 16:39:33 +01:00
Daniel Cebrian d4ceb1ac4d Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 17:11:30 +01:00
daniel 10ee8f572a Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-01-30 16:27:58 +01:00
Daniel Cebrian 5b7a123086 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 13:21:44 +01:00
Daniel Cebrian 4971c29819 #12789 fixed pagination in events 2024-01-30 09:25:17 +01:00
Daniel Cebrian 61e38865f6 Merge branch 'develop' into ent-12789-busqueda-por-regex-funciona-mal 2024-01-30 08:53:04 +01:00
daniel df1d2675ed Merge remote-tracking branch 'origin' into ent-12019-api-2-0 2024-01-30 08:13:47 +01:00
Daniel Cebrian 1738a06cf2 #12789 added tip in regex search 2024-01-29 13:42:09 +01:00
Diego Muñoz-Reja eba2f45ed1 Merge branch 'ent-12629-Eventos-se-quedan-tostados-cuando-el-filtro-no-encuentra-nada' into 'develop'
fix filter bug

See merge request artica/pandorafms!6761
2024-01-29 12:39:42 +00:00
Daniel Cebrian f01902903c #12789 fixed regex in event table 2024-01-29 13:38:29 +01:00
Rafael Ameijeiras ccaa25da23 Merge branch 'ent-12657-mostrar-show-entries-de-eventos-de-menor-a-mayor' into 'develop'
Ent 12657 mostrar show entries de eventos de menor a mayor

See merge request artica/pandorafms!6785
2024-01-29 09:30:55 +00:00
Alejandro Campos 618f677906 Merge branch 'develop' into 'ent-12629-Eventos-se-quedan-tostados-cuando-el-filtro-no-encuentra-nada'
# Conflicts:
#   pandora_console/include/functions_events.php
#   pandora_console/operation/events/events.php
2024-01-26 13:42:59 +00:00
daniel 375c2879f6 new api 2.0 2024-01-25 15:44:50 +01:00
Daniel Cebrian fbb5d349a2 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-24 11:58:00 +01:00
Daniel Cebrian 17056e4ac3 #12460 merge with 12643 2024-01-22 15:30:46 +01:00
Daniel Cebrian d504267460 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-22 15:18:01 +01:00
Daniel Cebrian 54e3f94d62 #12782 fixed button sound events style in events 2024-01-22 15:07:25 +01:00
Matias Didier b38d50a3b2 Merge branch 'ent-12515-bug-al-mostrar-el-evento-completo-en-un-tooltip-en-la-vista-de-eventos' into 'develop'
Ent 12515 bug al mostrar el evento completo en un tooltip en la vista de eventos

See merge request artica/pandorafms!6787
2024-01-22 09:30:08 +00:00
Rafael Ameijeiras 6e9a367d05 Merge branch 'ent-12677-corregir-timezone-en-eventos' into 'develop'
fix timezone events pandora_enterprise#12677

See merge request artica/pandorafms!6796
2024-01-19 08:38:39 +00:00
Daniel Cebrian bb2d908de7 #12460 fixed deprecated log 2024-01-17 12:25:57 +01:00
Jonathan c862946813 Merge branch 'develop' into ent-12657-mostrar-show-entries-de-eventos-de-menor-a-mayor 2024-01-09 09:25:22 +01:00
Daniel Cebrian bb92202ba2 #12706 fixed events groups by agent 2023-12-26 18:33:31 +01:00
Daniel Cebrian adffdc3cd0 #12706 fixed line break in events metaconsole 2023-12-26 16:55:14 +01:00
daniel 1b034d696c fix timezone events pandora_enterprise#12677 2023-12-20 13:54:20 +01:00
Rafael Ameijeiras 8658dbc938 Merge branch 'ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center' into 'develop'
fix error js load modal filter sound events pandora_enterprise#12607

See merge request artica/pandorafms!6739
2023-12-20 10:21:51 +00:00
Rafael Ameijeiras 46b315fbaf Merge branch 'ent-12643-conteo-paginacion-de-eventos-no-funciona' into 'develop'
Ent 12643 conteo paginacion de eventos no funciona

See merge request artica/pandorafms!6781
2023-12-19 15:05:05 +00:00
daniel d57f0971b6 Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center
Conflicts:
	pandora_console/include/javascript/pandora.js
2023-12-19 14:41:12 +01:00
Jonathan 8a9fbbac8b #12515 event title ... over 300 characters 2023-12-18 16:32:39 +01:00
Jonathan 5c047fc1b5 #12657 entries order function datatables 2023-12-18 14:46:44 +01:00
Jonathan f35e7d52ed #12643 fix pagination 2023-12-15 11:34:27 +01:00
Daniel Cebrian 67ffe8627b #12647 fixed line break in event list 2023-12-14 19:08:34 +01:00
daniel 9e3c17bf2c Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 2023-12-14 16:32:33 +01:00
Rafael Ameijeiras e71a104e74 Merge branch 'ent-12566-mejoras-en-visualizacion-de-eventos' into 'develop'
Draft: Ent 12566 Mejoras en visualización de eventos

See merge request artica/pandorafms!6735
2023-12-14 08:57:44 +00:00
Rafael Ameijeiras dcdd3e139e Merge branch 'ent-12468-instrucciones-se-rompen-en-vista-de-eventos' into 'develop'
Ent 12468 instrucciones se rompen en vista de eventos

See merge request artica/pandorafms!6711
2023-12-14 08:39:44 +00:00
Daniel Cebrian fed0d92805 #12566 fixed colums module_custom_id and event_custom_id length_ 2023-12-13 19:53:14 +01:00
alejandro.campos@artica.es 160514cfbe fix filter bug 2023-12-13 10:08:13 +01:00
Daniel Cebrian 1a9bdf97d1 #12566 changes in view events 2023-12-11 17:01:40 +01:00
Daniel Cebrian 7f4dc4fbe4 #12460 fixed log deprecated 2023-12-11 09:18:40 +01:00