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

17097 Commits

Author SHA1 Message Date
artica ffacefa06e Auto-updated build strings. 2022-11-19 01:00:45 +01:00
Daniel Barbero a7d59fa0b3 fixed availavility report pandora_enterprise#9798 2022-11-18 14:10:06 +01:00
Daniel Barbero 4118a46b9f add new filter search events pandora_enterprise#9135 2022-11-18 14:04:54 +01:00
Daniel Rodriguez 18b8d3e0e1 Merge branch 'ent-9650-GISS-No-funciona-la-opcion-Dia-de-la-Semana-en-cron-de-modulos' into 'develop' 
fixed cron execution of modules with week day setted

See merge request artica/pandorafms!5210
 2022-11-18 08:35:59 +00:00
Daniel Barbero a31733ffef Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos 2022-11-18 07:51:26 +01:00
artica 616efb0f7d Auto-updated build strings. 2022-11-18 01:00:19 +01:00
alejandro.campos@artica.es eda1ace809 fix alerts fired widget 2022-11-17 12:46:37 +01:00
artica b6055908ae Auto-updated build strings. 2022-11-17 01:00:19 +01:00
Daniel Rodriguez cde26c127e Merge branch 'ent-9813-vista-ppal-de-agente-vista-heatmap-con-errores' into 'develop' 
Ent 9813 vista ppal de agente vista heatmap con errores

See merge request artica/pandorafms!5268
 2022-11-16 16:09:56 +00:00
Daniel Rodriguez fe6850a9c7 Merge branch 'ent-9793-imagen-de-fondo-en-consola-visual-no-carga-si-el-nombre-tiene-espacios' into 'develop' 
Fix VC background with spaces on his name

See merge request artica/pandorafms!5267
 2022-11-16 16:09:20 +00:00
alejandro.campos@artica.es 635eb692d1 minor fix 2022-11-16 16:43:21 +01:00
Calvo ef7ea84beb Added enterprise hook on excludedPassword funcion in open 2022-11-16 13:26:25 +01:00
Calvo b537fd042c Added enterprise hook on excludedPassword funcion in open 2022-11-16 13:20:52 +01:00
Calvo d8967804dd Change vc console backgroud blankspace with its entity 2022-11-16 09:32:08 +01:00
artica a225b1dd61 Auto-updated build strings. 2022-11-16 01:01:07 +01:00
alejandro.campos@artica.es a67e70f04e fixed api get events 2022-11-15 17:32:22 +01:00
Daniel Maya 5a7fcd6cc9 #9813 Fixed starmap 2022-11-15 14:18:12 +01:00
Calvo 51e832503a Fix VC background with spaces on his name 2022-11-15 13:54:57 +01:00
Calvo 43fd43d0d5 Updated php versopm notifications to php8 2022-11-15 10:29:15 +01:00
artica 2e7d5aa336 Auto-updated build strings. 2022-11-15 01:00:22 +01:00
Daniel Rodriguez 65ea42d8f7 Merge branch 'ent-9723-bug-con-el-get_events-de-la-api-14390' into 'develop' 
fix api get events pandora_enterprise#9723

See merge request artica/pandorafms!5239
 2022-11-14 11:33:59 +00:00
artica 4ecc5b9912 Auto-updated build strings. 2022-11-14 01:00:18 +01:00
artica 283f062646 Auto-updated build strings. 2022-11-13 01:00:18 +01:00
artica 24ee24be32 Auto-updated build strings. 2022-11-12 01:00:23 +01:00
alejandro.campos@artica.es 6a173664d4 Removed transactional server 2022-11-11 12:09:03 +01:00
Daniel Barbero 12b7c81620 fixed 24*7 availavility report pandora_enterprise#9798 2022-11-11 10:19:36 +01:00
Daniel Barbero e003d0d13a fixed get events API pandora_enterprise#9723 2022-11-11 08:55:20 +01:00
artica a8bb6706ca Auto-updated build strings. 2022-11-11 01:00:22 +01:00
Diego Muñoz-Reja 0a8405bc29 Merge branch 'ent-9794-14509-permisos-sobre-acciones-de-eventos-usuario' into 'develop' 
fixed acl error in events list pandora_enterprise#9794

See merge request artica/pandorafms!5260
 2022-11-10 15:48:36 +00:00
Daniel Barbero 4385442690 fixed acl error in events list pandora_enterprise#9794 2022-11-10 13:13:44 +01:00
Daniel Barbero a246382325 fixed visual error pdf sla monthly pandora_enterprise#9789 2022-11-10 12:41:45 +01:00
Daniel Barbero c16901a5e2 fixed get events API pandora_enterprise#9723 2022-11-10 09:19:32 +01:00
artica 240bab48ec Auto-updated build strings. 2022-11-10 01:00:19 +01:00
artica dfe35f2819 Auto-updated build strings. 2022-11-09 01:00:21 +01:00
artica 94ba216f81 Updated version and build strings. 2022-11-08 13:01:55 +01:00
Rafael Ameijeiras 43690d3aa6 Merge branch 'ent-9745-XSS' into 'develop' 
fixed vulnerability in load of help iframes

See merge request artica/pandorafms!5245
 2022-11-08 11:49:46 +00:00
Daniel Barbero b8939cb624 fix api get agent criticity pandora_enterprise#9723 2022-11-08 09:00:25 +01:00
Daniel Maya 53ef84c7e5 #9765 Fixed check connection 2022-11-08 08:20:32 +01:00
Daniel Barbero 4ea2f505ab Merge remote-tracking branch 'origin/develop' into ent-9723-bug-con-el-get_events-de-la-api-14390 2022-11-08 08:17:01 +01:00
artica 778501d4bf Auto-updated build strings. 2022-11-08 01:00:31 +01:00
Daniel Rodriguez 038195146e Merge branch 'ent-9774-XSS-reporting-dashboard-module' into 'develop' 
fix xss

See merge request artica/pandorafms!5249
 2022-11-07 16:06:29 +00:00
Daniel Rodriguez 3417ec9421 Merge branch 'ent-9526-Rendimiento-al-editar-informes-sql-query' into 'develop' 
fix performance issue

See merge request artica/pandorafms!5199
 2022-11-07 16:05:58 +00:00
Diego Muñoz-Reja f637bc12b8 Merge branch 'ent-9762-14476-reporte-de-eventos-de-todos-los-nodos-desde-metaconsola' into 'develop' 
fix report agent groups pandora_enterprise#9762

See merge request artica/pandorafms!5250
 2022-11-07 15:55:54 +00:00
Luis Calvo a40f1909e7 Fix events view coun with no pagination 2022-11-07 16:19:18 +01:00
= 58e5f7180d Fix events view coun with no pagination 2022-11-07 15:59:56 +01:00
Daniel Rodriguez 4f99d94dc0 Merge branch 'ent-9714-traducciones' into 'develop' 
translates pandora_enterprise#9714

See merge request artica/pandorafms!5228
 2022-11-07 13:27:51 +00:00
alejandro.campos@artica.es e3d01930b1 minor change 2022-11-07 14:13:04 +01:00
Daniel Rodriguez 7646f0629b Merge branch 'ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores' into 'develop' 
multiple external alert policies pandora_enterprise#8733

See merge request artica/pandorafms!5205
 2022-11-07 12:44:23 +00:00
Daniel Barbero 0b3b1c4ec0 fix report agent groups pandora_enterprise#9762 2022-11-07 11:37:26 +01:00
alejandro.campos@artica.es 75fe9dd8d3 fix xss 2022-11-07 11:26:00 +01:00
artica 883b2067db Auto-updated build strings. 2022-11-07 01:00:19 +01:00
artica f05015ab16 Auto-updated build strings. 2022-11-06 01:00:18 +01:00
artica 5c7862c4e1 Auto-updated build strings. 2022-11-05 01:00:22 +01:00
edu.corral 341fe37def ent 7914 status scaling based on time 2022-11-04 12:13:38 +01:00
Daniel Barbero 39df7fe13a Merge remote-tracking branch 'origin/develop' into ent-9714-traducciones 
Conflicts:
	pandora_console/include/visual-console-client/maintenanceMode.png
	visual_console_client/src/lib/maintenanceMode.png
 2022-11-04 11:14:20 +01:00
Jimmy Olano a548d2a798 Merge branch 'ent-9722-cartel-de-licencia-expirada' into 'develop' 
Ent 9722 cartel de licencia expirada

#9722

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9722

See merge request artica/pandorafms!5237
 2022-11-04 10:07:56 +00:00
edu.corral 1ff9b8c420 ent 7914 time based status scaling components 2022-11-04 09:45:06 +01:00
artica dce2b3f915 Auto-updated build strings. 2022-11-04 01:00:24 +01:00
alejandro.campos@artica.es 514b350e14 fixed performance problems 2022-11-03 18:20:39 +01:00
Daniel Barbero ccc2e830f4 add sound events to metaconsole pandora_enterprise#8854 2022-11-03 15:12:50 +01:00
edu.corral fb4b42e6c5 ent 9722 expired license notifications 2022-11-03 13:55:06 +01:00
alejandro.campos@artica.es 2c7d7e4044 fixed vulnerability in load of help iframes 2022-11-03 13:53:10 +01:00
Daniel Barbero 33b1c0ab8f add new filter pandora_enterprise#9135 2022-11-03 12:00:58 +01:00
edu.corral 5eee3ade4a ent 9722 expired license 2022-11-03 11:36:28 +01:00
Daniel Rodriguez e52da7d379 Merge branch 'ent-9105-poder-anadir-colecciones-al-satellite-server' into 'develop' 
Ent 9105 poder anadir colecciones al satellite server

See merge request artica/pandorafms!5202
 2022-11-03 10:28:32 +00:00
artica 08f0d416cd Auto-updated build strings. 2022-11-03 01:00:24 +01:00
alejandro.campos@artica.es 92455e7ef9 fixed backup cron task 2022-11-02 17:36:17 +01:00
Daniel Barbero 0ff07d7224 add new macro event response group_contact pandora_enterprise#9246 2022-11-02 16:59:04 +01:00
Daniel Barbero 94fb25d104 Merge remote-tracking branch 'origin/develop' into ent-9705-14417-pestanas-dentro-de-widget-events-incorrecta-visualizacion 2022-11-02 13:42:13 +01:00
Daniel Barbero 7655c23637 fix api get events pandora_enterprise#9723 2022-11-02 13:40:23 +01:00
edu.corral 8d34ef88c5 ent 9722 expired licence notification 2022-11-02 09:19:15 +01:00
Daniel Barbero 19109a682e fix images maintenance mode 2022-11-02 08:14:11 +01:00
Junichi Satoh 98cc59a136 Updated Japanese console translations. 2022-11-02 15:55:00 +09:00
artica 42db6497aa Auto-updated build strings. 2022-11-02 01:00:18 +01:00
artica 91795a3078 Auto-updated build strings. 2022-11-01 01:00:24 +01:00
Daniel Rodriguez d99ccaba9e Merge branch 'ent-9729-xss-en-busqueda-de-libreria-de-modulos' into 'develop' 
Fix module library XSS

See merge request artica/pandorafms!5233
 2022-10-31 14:12:46 +00:00
Daniel Barbero 331219ba16 Merge remote-tracking branch 'origin/develop' into ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores 
Conflicts:
	pandora_console/extras/mr/58.sql
 2022-10-31 14:13:45 +01:00
Daniel Rodriguez a1210c7814 Merge branch 'ent-9233-Historico-de-traps' into 'develop' 
implemented trap history

See merge request artica/pandorafms!5116
 2022-10-31 11:17:29 +00:00
Daniel Rodriguez 0be07d1bb4 Merge branch 'ent-9536-autoincremento-de-indices-en-la-sync-de-meta-nodo' into 'develop' 
force insert with primary key pandora_enterprise#9536

See merge request artica/pandorafms!5171
 2022-10-31 10:06:15 +00:00
Daniel Rodriguez 41946bfda7 Merge branch 'ent-4822-estado-de-consola-visual-mantenimiento' into 'develop' 
add mode maintenance VC pandora_enterprise#4822

See merge request artica/pandorafms!5191
 2022-10-31 10:02:44 +00:00
Calvo 7bdf103725 Fix module library XSS 2022-10-31 10:19:13 +01:00
artica 1288a3c00b Auto-updated build strings. 2022-10-31 01:00:17 +01:00
artica c1290bd7d0 Auto-updated build strings. 2022-10-30 01:00:19 +02:00
artica 0eb3c12cd9 Auto-updated build strings. 2022-10-29 01:00:22 +02:00
Jimmy Olano 15955d2329 Merge branch 'ent-5584-9778-nuevo-editor-masivo-de-usuarios-meta-y-nodo-post' into 'develop' 
Ent 5584 9778 nuevo editor masivo de usuarios meta y nodo post

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/5584

See merge request artica/pandorafms!5153
 2022-10-28 15:18:15 +00:00
Jimmy Olano af73da2291 Merge branch 'ent-4043-proyectos-banco-de-credenciales-contrasenas-para-modulos' into 'develop' 
Ent 4043 proyectos banco de credenciales contrasenas para modulos

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/4043

See merge request artica/pandorafms!5172
 2022-10-28 14:00:46 +00:00
Daniel Barbero 12c4217b3f fix timestamp modal event grouped by extra id pandora_enterprise#9716 2022-10-28 10:10:53 +02:00
Daniel Barbero 10750e2464 translates pandora_enterprise#9714 2022-10-28 08:35:21 +02:00
artica 0da1247d68 Auto-updated build strings. 2022-10-28 01:00:26 +02:00
Daniel Barbero 6d19391c72 fix interfaces charts pandora_enterprise#9683 2022-10-27 16:12:17 +02:00
Calvo 8a43421b49 Fix module type validadion on api set create network module 2022-10-27 15:18:15 +02:00
Calvo eed8361621 Check group and profile exist on api add permission user to group 2022-10-27 15:03:50 +02:00
Calvo a96eb2ce29 Hide meta treeview user hash 2022-10-27 12:35:31 +02:00
Daniel Maya 382e74ae36 resolved conflict 2022-10-27 09:42:40 +02:00
Daniel Barbero 59f0bba7f3 fix styles events list dashboards pandora_enterprise#9705 2022-10-27 09:07:04 +02:00
artica bf6f5479e8 Auto-updated build strings. 2022-10-27 01:00:24 +02:00
alejandro.campos@artica.es 8d611a8e7f implemented float formatting and option in reports to change visualization format 2022-10-26 18:25:16 +02:00
Jimmy Olano d9c5b59eff Merge branch 'ent-9630-Bug-en-codigo-de-functions-api-php' into 'develop' 
fix typo in code

Ref pandora_enterprise#9630

See merge request artica/pandorafms!5189
 2022-10-26 11:02:42 +00:00
Daniel Barbero 17889c51c1 new image pandora_enterprise#4822 2022-10-26 09:54:55 +02:00
Diego Muñoz-Reja 00a1e74473 Merge branch 'ent-9332-13917-fallos-al-autenticarse-con-ldap-cuando-tenemos-la-contrasena-encriptada' into 'develop' 
Fix entities ldap admin pass

See merge request artica/pandorafms!5217
 2022-10-26 07:53:31 +00:00
Daniel Barbero 3273fc23ed Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento 
Conflicts:
	pandora_console/extras/mr/58.sql
 2022-10-26 09:42:02 +02:00
artica b1c35e7385 Auto-updated build strings. 2022-10-26 01:00:24 +02:00
Calvo 36f58579be Fix entities ldap admin pass 2022-10-25 18:46:49 +02:00
Calvo c2c62bae06 Fix missing parameter meta on event comments ajax 2022-10-25 17:37:56 +02:00
Calvo b8c2fe52b5 Added ACL to apì get tree agents plugin user and plugin pass 2022-10-25 15:33:22 +02:00
Daniel Rodriguez 8aa6ea8bc8 Merge branch 'ent-8725-lista-exclusion-passwords' into 'develop' 
Added exclude words for passwords control

See merge request artica/pandorafms!5174
 2022-10-25 09:07:08 +00: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
artica ce4fc25209 Auto-updated build strings. 2022-10-25 01:00:22 +02:00
alejandro.campos@artica.es 8bf3de92ae fixed cron execution of modules with week day setted 2022-10-24 17:23:08 +02: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 Maya dbe329f1de #9494 Fixed custom data 2022-10-24 15:17:02 +02:00
Daniel Barbero 821bdf16da fix error types php7.2 pandora_enterprise#9695 2022-10-24 09:26:22 +02:00
artica 204d711b30 Auto-updated build strings. 2022-10-24 01:00:19 +02:00
artica bd0f136dc0 Auto-updated build strings. 2022-10-23 01:00:17 +02:00
artica 4118f7656b Auto-updated build strings. 2022-10-22 01:00:24 +02:00
Jimmy Olano d6ae6d5dbb Merge branch 'ent-9468-bug-vista-de-omnishell-boton-refresh-y-estilos' into 'develop' 
Fix style issue

pandora_enterprise#9468

See merge request artica/pandorafms!5123
 2022-10-21 11:48:11 +00:00
Diego Muñoz-Reja 3f37e2556c Merge branch 'ent-9457-14121-llamadas-api-no-funcionan-con-usuario-ldap-con-login-error' into 'develop' 
API and LDAP remote user fix with login error fix

See merge request artica/pandorafms!5135
 2022-10-21 11:24:31 +00:00
Daniel Rodriguez f57876b332 Merge branch 'ent-9591-mejoras-vista-administracion-agentes-satellite' into 'develop' 
Ent 9591 mejoras vista administracion agentes satellite

See merge request artica/pandorafms!5190
 2022-10-21 11:09:21 +00:00
Daniel Rodriguez a3dc8be0e5 Merge branch 'ent-9254-13891-encriptar-contrasenas-en-replicacion-de-bbdd' into 'develop' 
Ent 9254 13891 encriptar contrasenas en replicacion de bbdd

See merge request artica/pandorafms!5140
 2022-10-21 10:42:16 +00:00
Diego Muñoz-Reja 92c01531e7 Merge branch 'ent-9178-13815-alto-tiempo-de-espera-si-el-ldap-secundario-no-esta-disponible' into 'develop' 
Added ldap timeout

See merge request artica/pandorafms!5134
 2022-10-21 10:28:04 +00:00
Diego Muñoz-Reja 423d4b8763 Merge branch 'ent-9641-mejorar-heatmaps' into 'develop' 
Ent 9641 mejorar heatmaps

See merge request artica/pandorafms!5196
 2022-10-21 09:29:40 +00:00
Daniel Rodriguez be7a5add28 Merge branch 'ent-9460-14121-Reducir-permisos-necesarios-para-set-module-data' into 'develop' 
change permissions

See merge request artica/pandorafms!5127
 2022-10-21 09:27:47 +00:00
Daniel Rodriguez 77cb8be6cc Merge branch 'ent-2190-filtros-en-migracion-de-agentes-metaconsola' into 'develop' 
Added id to form on html print form grid

See merge request artica/pandorafms!5181
 2022-10-21 09:26:26 +00:00
José González 984fd10897 Merge branch 'develop' into 'ent-8725-lista-exclusion-passwords' 
# Conflicts:
#   pandora_console/include/auth/mysql.php
 2022-10-21 06:44:47 +00:00
artica e31699eed7 Auto-updated build strings. 2022-10-21 01:00:25 +02:00
Daniel Barbero 688597a006 multiple external alert policies pandora_enterprise#8733 2022-10-20 16:42:26 +02:00
Daniel Rodriguez 60a76530e0 Merge branch 'ent-9648-Notificaciones-por-defecto-en-creación-de-usuario' into 'develop' 
Added control for add the notifications by default to users

See merge request artica/pandorafms!5195
 2022-10-20 13:41:28 +00:00
Diego Muñoz-Reja 9bb8d4cc8b Merge branch 'ent-9166-13760-guardia-usuario-no-ve-vista-ncm' into 'develop' 
Fix ACL for ncm

See merge request artica/pandorafms!4966
 2022-10-20 13:02:54 +00:00
Jimmy Olano a276eb4dba Merge branch 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php' into 'develop' 
fixed vulnerability

Ref pandora_enterprise#9592

See merge request artica/pandorafms!5176
 2022-10-20 12:10:59 +00:00
Calvo 2d71c75405 Added title to printFormAsGrid 2022-10-20 13:42:08 +02:00
Daniel Rodriguez 6657052308 Merge branch 'ent-9631-14357-No-se-guardan-los-cambios-en-Setup-Setup-Performance' into 'develop' 
fix several problems in history db settings

See merge request artica/pandorafms!5188
 2022-10-20 07:21:11 +00:00
Daniel Rodriguez 45722e9aa4 Merge branch 'ent-9612-PDF-informes-de-inventario-no-se-adapta-al-texto-y-es-ilegible' into 'develop' 
workaround to avoid visual issue in PDFs

See merge request artica/pandorafms!5183
 2022-10-20 07:19:26 +00:00
Daniel Rodriguez 35fcfa275f Merge branch 'ent-9117-diferencia-de-estilos-en-mouseovers-del-tree-view-de-servicios' into 'develop' 
Ent 9117 diferencia de estilos en mouseovers del tree view de servicios

See merge request artica/pandorafms!5185
 2022-10-20 07:13:39 +00:00
artica 61b3bc724a Auto-updated build strings. 2022-10-20 01:00:21 +02:00
alejandro.campos@artica.es 17a87392e3 minor fix 2022-10-19 18:38:27 +02:00
alejandro.campos@artica.es f87737a093 minor fix 2022-10-19 17:07:22 +02:00
Daniel Barbero 6ef3505eab event multiple operations pandora_enterprise#9671 2022-10-19 16:20:49 +02:00
Daniel Maya bfc1289ba6 #9105 Added collections satellite 2022-10-19 13:59:16 +02:00
Diego Muñoz-Reja c8e8ea61f3 Merge branch 'ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya' into 'develop' 
filter recursive groups in events pandora_enterprise#2133

See merge request artica/pandorafms!5155
 2022-10-19 11:46:38 +00:00
Jimmy Olano aaedb39849 Merge branch 'ent-9392-no-funciona-insertar-agentes-en-paradas-planificadas' into 'develop' 
Fix planned downtime issues

Ref: pandora_enterprise#9392

See merge request artica/pandorafms!5166
 2022-10-19 11:00:04 +00:00
artica 95c485db38 Auto-updated build strings. 2022-10-19 01:00:22 +02:00
Daniel Barbero f219a9678f minor fix 500 pandora_enterprise#9667 2022-10-18 16:55:05 +02:00
Daniel Barbero 1acb67ecad fixed multi selector pandora_enterprise#8620 2022-10-18 13:40:09 +02:00
Daniel Barbero 40dc913aca Merge remote-tracking branch 'origin/develop' into ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard 2022-10-18 12:53:28 +02:00
Diego Muñoz-Reja dfb5776f68 Merge branch 'ent-8648-Improvement-for-SNMP-interface-wizard' into 'develop' 
Added default definition for SNMP Interface Wizard

See merge request artica/pandorafms!5168
 2022-10-18 09:25:17 +00:00
Alejandro Campos c995a5eafb Merge branch 'develop' into 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php' 
# Conflicts:
#   pandora_console/extras/mr/58.sql
 2022-10-18 07:23:29 +00: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
artica ed8b6678cd Auto-updated build strings. 2022-10-18 01:00:21 +02:00
alejandro.campos@artica.es 08ab924160 fix performance issue 2022-10-17 18:08:48 +02:00
Daniel Rodriguez 38af75ccc1 Merge branch 'ent-9266-13916-formulario-de-registro-usuario-se-restablece-tras-error' into 'develop' 
Fix user form reset if profile fails

See merge request artica/pandorafms!5137
 2022-10-17 11:27:16 +00:00