Daniel Cebrian
|
abf8792ec9
|
#9073 fixed error error for multiple io_safe_input
|
2023-03-08 09:13:04 +01:00 |
|
Daniel Cebrian
|
a4634717d8
|
Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida
|
2023-03-07 13:49:39 +01:00 |
|
Daniel Cebrian
|
135793454c
|
#9073 added images
|
2023-03-06 12:20:08 +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 |
Alejandro Campos
|
f297f6fff9
|
Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas'
# Conflicts:
# pandora_console/extras/mr/62.sql
# pandora_console/pandoradb.sql
|
2023-03-02 16:53:42 +00:00 |
Diego Muñoz-Reja
|
5d756ee393
|
Merge branch 'ent-9819-crear-tip-en-consola-sonora-de-eventos' into 'develop'
Ent 9819 crear tip en consola sonora de eventos
See merge request artica/pandorafms!5466
|
2023-03-02 15:25:31 +00:00 |
Jonathan
|
590ddc827c
|
#9819 Change MR and add pandoradb.sql create table teventsound
|
2023-03-02 08:29:06 +01:00 |
|
Jonathan
|
2f4543a023
|
#9517 Change MR sql
|
2023-03-02 08:20:43 +01:00 |
|
daniel
|
a758528968
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/extras/mr/62.sql
pandora_console/include/class/AuditLog.class.php
|
2023-03-01 07:56:32 +01:00 |
|
Alejandro Campos
|
f94c7e2a04
|
Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas'
# Conflicts:
# pandora_console/extras/mr/62.sql
|
2023-02-28 16:11:46 +00:00 |
Calvo
|
d1a3795acb
|
Added new indexes to mr and pandoradb
|
2023-02-23 12:58:33 +01:00 |
|
alejandro.campos@artica.es
|
2a9494b48d
|
fix conflicts
|
2023-02-22 10:10:59 +01:00 |
Jose Gonzalez
|
da58e4b9e0
|
Ticket 10484 Fixed List Operating Systems
|
2023-02-20 13:02:24 +01:00 |
|
Jose Gonzalez
|
333a93fad2
|
Added MR
|
2023-02-20 11:45:59 +01:00 |