Commit Graph

1075 Commits

Author SHA1 Message Date
Jose Martin fed70d531e Merge branch 'ent-13527-Arreglar-visualización-de-consola-sonora-en-tema-oscuro' into 'develop'
Ent 13527 arreglar visualización de consola sonora en tema oscuro

See merge request artica/pandorafms!7305
2024-04-30 06:58:49 +00:00
Jorge Rincon 1b812155e7 #13527 Fixed dark theme styles sound console 2024-04-29 10:15:02 +02:00
Daniel Cebrian 4c485be711 Merge branch 'develop' into ent-13035-cambiar-comportamiento-del-mecanismo-de-loginhash-meta 2024-04-26 12:41:08 +02:00
Jose Martin e2fc9e27bf Merge branch 'ent-13287-botones-columnas-sobrantes-en-eventos-para-usuario-sin-permisos' into 'develop'
Ent 13287 botones columnas sobrantes en eventos para usuario sin permisos

See merge request artica/pandorafms!7261
2024-04-25 06:32:33 +00:00
Jose Martin fc8538108a Merge branch 'ent-13223-Se-pueden-abrir-muchas-instrucciones-de-evento-de-manera-simultánea' into 'develop'
Ent 13223 se pueden abrir muchas instrucciones de evento de manera simultánea

See merge request artica/pandorafms!7270
2024-04-24 11:43:25 +00:00
Jorge Rincon a41a1becfa #13223 Fixed instructions dialog in events as a modal 2024-04-24 09:56:48 +02:00
Jorge Rincon cacd05d667 #13223 Fixed instructions dialog in events 2024-04-23 17:12:36 +02:00
Daniel Cebrian 64013c0416 #13264 added regex in sql 2024-04-23 16:56:28 +02:00
Pablo Aragon 9a4f2aa7c9 13287-Remove columns Options and Checkbox in Events for users without EW. Fix no_sorteable_columns in Events 2024-04-23 08:29:08 +02:00
Daniel Cebrian 9bd75bdf74 #13083 fixed tz time acoustic console 2024-04-18 15:56:28 +02:00
Daniel Cebrian 8d9a89a6a8 Merge branch 'develop' into ent-13035-cambiar-comportamiento-del-mecanismo-de-loginhash-meta 2024-04-15 09:54:30 +02:00
Daniel Cebrian 22c1b6e872 #13035 refactored password_hash 2024-04-11 10:26:53 +02:00
Pablo Aragon 9eb5f31be8 13286-Change controls in Events full screen 2024-04-02 18:46:41 +02:00
Pablo Aragon 29077006d6 13261-Break line in acustic events 2024-04-01 14:58:11 +02:00
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