Calvo
|
c5b98a30aa
|
Merge remote-tracking branch 'origin/develop' into ent-10485-fix-inconsistency-between-lag-calculation-on-server-and-cosole
|
2023-03-03 11:30:44 +01:00 |
|
Calvo
|
5fb43198ea
|
Fix quores error
|
2023-03-03 11:22:39 +01:00 |
|
slerena
|
970c8e4830
|
Updated "DB First installed", this field was intented to be used on changes of major versions, not used anymore, but doesn't have amy sense to keepit in 6.x
|
2023-03-03 10:14:43 +00:00 |
|
Daniel Rodriguez
|
d1e8ee3308
|
Merge branch 'revert-cce6e2d2' into 'develop'
Revert "Merge branch..."
See merge request artica/pandorafms!5576
|
2023-03-03 10:12:41 +00:00 |
|
slerena
|
88ce83b9ac
|
Updated some dates and notices. Updated database schema version / build (build should be modified in each release)
|
2023-03-03 10:12:31 +00:00 |
|
Daniel Rodriguez
|
6f974508f0
|
Revert "Merge branch..."
This reverts merge request !5555
|
2023-03-03 10:11:35 +00:00 |
|
slerena
|
62ae32335d
|
Updated default values in config for heigh in report graphs (to 250px), and days delete for non-init agents (set to 7, was 0).
|
2023-03-03 10:08:34 +00:00 |
|
Daniel Rodriguez
|
cce6e2d222
|
Merge branch 'ent-10485-fix-inconsistency-between-lag-calculation-on-server-and-cosole' into 'develop'
Core: Fix and optimized lag calculaton. Console: optimized and unified queries with server
See merge request artica/pandorafms!5555
|
2023-03-03 08:32:34 +00:00 |
|
artica
|
1f046e9446
|
Auto-updated build strings.
|
2023-03-03 01:00:24 +01:00 |
|
Jimmy Olano
|
2d9406c53e
|
Merge branch 'ent-9700-URLs-de-la-consola-en-elementos-de-CV-no-se-redirigen-bien' into 'develop', JJOS.
fixed tinyMCE converting URLs to relative ones
See merge request artica/pandorafms!5523
|
2023-03-02 17:38:41 +00:00 |
|
Daniel Rodriguez
|
0a16fbbecf
|
Merge branch 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' into 'develop'
implemented agents view filter management
See merge request artica/pandorafms!5457
|
2023-03-02 17:21:13 +00: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 |
|
Daniel Rodriguez
|
7e9abf01dd
|
Merge branch 'ent-9805-14513-14958-problema-timestamp-vs-utimestamp-en-tevento-al-crear-eventos-por-api' into 'develop'
Unified event timestamp and utimestamp
See merge request artica/pandorafms!5561
|
2023-03-02 16:32:01 +00:00 |
|
Daniel Rodriguez
|
006b35679d
|
Merge branch 'ent-10093-Activar-modo-mantenimiento-en-politicas-cuando-se-ejecuta-el-pandora-db' into 'develop'
policy maintenance mode
See merge request artica/pandorafms!5506
|
2023-03-02 15:50:17 +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 |
|
Diego Muñoz-Reja
|
873334fd97
|
Merge branch 'ent-9622-omnishell-en-la-vista-solapa-de-agente' into 'develop'
Ent 9622 omnishell en la vista solapa de agente
See merge request artica/pandorafms!5508
|
2023-03-02 14:52:45 +00:00 |
|
Matias Didier
|
c4e8ff49d5
|
Merge branch 'ent-10569-Error-500-a-la-hora-de-abrir-vista-de-algun-agente-en-fenix' into 'develop'
error fix
See merge request artica/pandorafms!5574
|
2023-03-02 09:15:37 +00:00 |
|
Matias Didier
|
96569ae2e4
|
Merge branch 'ent-9517-buscar-por-campos-avanzados-de-agente' into 'develop'
#9517 Buscar por campos avanzados de agente
See merge request artica/pandorafms!5575
|
2023-03-02 07:52:33 +00:00 |
|
Jonathan
|
590ddc827c
|
#9819 Change MR and add pandoradb.sql create table teventsound
|
2023-03-02 08:29:06 +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 |
|
Jonathan
|
2f4543a023
|
#9517 Change MR sql
|
2023-03-02 08:20:43 +01:00 |
|
artica
|
f1bb7b450e
|
Auto-updated build strings.
|
2023-03-02 01:00:46 +01:00 |
|
Diego Muñoz-Reja
|
2057cf8d47
|
Merge branch 'ent-9666-nuevo-widget-event-cardboard' into 'develop'
Ent 9666 nuevo widget event cardboard
See merge request artica/pandorafms!5533
|
2023-03-01 15:49:47 +00:00 |
|
alejandro.campos@artica.es
|
fd13b376a5
|
Merge branch 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' of brutus.artica.es:artica/pandorafms into ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas
|
2023-03-01 16:10:30 +01:00 |
|
alejandro.campos@artica.es
|
296ec44ef4
|
minor fix
|
2023-03-01 16:10:18 +01:00 |
|
Matias Didier
|
3ab8d02037
|
Merge branch 'ent-10338-error-version-alt-en-pandora_snmp_bandwidth-pl' into 'develop'
Fix regex to extract version and oum
See merge request artica/pandorafms!5567
|
2023-03-01 14:08:40 +00:00 |
|
alejandro.campos@artica.es
|
36cfcc3c2f
|
error fix
|
2023-03-01 14:19:35 +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 |
|
Daniel Rodriguez
|
23f91fa0f3
|
Merge branch 'ent-9962-14776-Mergear-resultados-de-ITEM-SQL-Query-de-informes-en-META' into 'develop'
added all nodes option in sql query report item in meta
See merge request artica/pandorafms!5535
|
2023-03-01 12:29:54 +00:00 |
|
artica
|
6b23a0c696
|
Auto-updated build strings.
|
2023-03-01 01:00:24 +01:00 |
|
Jimmy Olano
|
a8d0f79540
|
Merge branch 'ent-10257-guardia-14543-no-muestra-modulos-no-init-en-vista-monitor-detail' into 'develop' (^JJOS)
Fix empty module data list view
See merge request artica/pandorafms!5472
|
2023-02-28 17:35:56 +00: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 |
|
alejandro.campos@artica.es
|
a1f172e713
|
several fixes
|
2023-02-28 17:06:31 +01:00 |
|
Matias Didier
|
25413c7173
|
Merge branch 'ent-10235-anadir-mas-indices-al-modelo-de-datos-2' into 'develop'
Added new indexes to mr and pandoradb
See merge request artica/pandorafms!5562
|
2023-02-28 14:27:38 +00:00 |
|
Matias Didier
|
9def6eb6d5
|
Merge branch 'ent-9047-vista-de-auditoria-mejoras-funcionales-y-esteticas' into 'develop'
Ent 9047 vista de auditoria mejoras funcionales y esteticas
See merge request artica/pandorafms!5500
|
2023-02-28 13:28:45 +00:00 |
|
Diego Muñoz-Reja
|
44cf59bfd3
|
Merge branch 'ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola' into 'develop'
Ent 10253 enforcement de opciones de configuracion aviso en consola
See merge request artica/pandorafms!5499
|
2023-02-28 12:27:54 +00:00 |
|
Matias Didier
|
cccae56b8a
|
Merge branch 'ent-9517-buscar-por-campos-avanzados-de-agente' into 'develop'
Ent 9517 buscar por campos avanzados de agente
See merge request artica/pandorafms!5446
|
2023-02-28 11:59:01 +00:00 |
|
Matias Didier
|
ad066b9e1a
|
Merge branch 'ent-10559-no-deja-borrar-tareas-ipam-creadas-antes-de-los-cambios-del-ticket-10133' into 'develop'
Ent 10559 no deja borrar tareas ipam creadas antes de los cambios del ticket 10133
See merge request artica/pandorafms!5568
|
2023-02-28 09:04:50 +00:00 |
|
artica
|
23e333f58d
|
Auto-updated build strings.
|
2023-02-28 01:00:26 +01:00 |
|
Diego Muñoz-Reja
|
0f635c8206
|
Merge branch 'ent-10127-14800-anadir-id_nodo-a-llamada-api-validate_events' into 'develop'
Ent 10127 14800 anadir id nodo a llamada api validate events
See merge request artica/pandorafms!5479
|
2023-02-27 16:53:01 +00:00 |
|
Daniel Cebrian
|
3259795a0b
|
#10559 control delete task list if not exist id
|
2023-02-27 16:15:34 +01:00 |
|
Matias Didier
|
47ec49280c
|
Merge branch 'ent-10335-15016-edicion-comunidad-snmp-desdes-operaciones-masivas' into 'develop'
Ent 10335 15016 edicion comunidad snmp desdes operaciones masivas
See merge request artica/pandorafms!5520
|
2023-02-27 14:39:49 +00:00 |
|
Daniel Cebrian
|
c8096d73b2
|
Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola
|
2023-02-27 14:58:25 +01:00 |
|
Daniel Cebrian
|
2c7d00a664
|
Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola
|
2023-02-27 13:34:41 +01:00 |
|
Daniel Cebrian
|
5d4c61f8c4
|
#10253 added notify enforcement in metaconsole
|
2023-02-27 13:26:32 +01:00 |
|
Matias Didier
|
86b7e278ad
|
Merge branch 'ent-10493-reinicio-de-la-paginacion-al-interactuar-con-un-elemento' into 'develop'
Ent 10493 reinicio de la paginacion al interactuar con un elemento
See merge request artica/pandorafms!5556
|
2023-02-27 11:08:42 +00:00 |
|
Calvo
|
fcd9a93f68
|
Fix code style
|
2023-02-27 10:53:59 +01:00 |
|
Rafael Ameijeiras
|
7262e2f710
|
Merge branch 'ent-10280-quitar-opciones-de-windows-en-la-ayuda-del-pandoraserver' into 'develop'
Removed Win32 service from pandora_server
See merge request artica/pandorafms!5565
|
2023-02-27 08:52:43 +00:00 |
|
Rafael Ameijeiras
|
2e7020176a
|
Merge branch 'ent-10273-cambios-plugin-google-sheet' into 'develop'
update google sheet plugin
See merge request artica/pandorafms!5474
|
2023-02-27 08:52:07 +00:00 |
|
Rafael Ameijeiras
|
b649d13d3f
|
Merge branch 'ent-10337-GUARDIA-Problema-con-el-db-interface-de-meta' into 'develop'
fixed node connection
See merge request artica/pandorafms!5517
|
2023-02-27 08:51:19 +00:00 |
|