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 |
|
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 |
|
Matias Didier
|
1d30123d53
|
Merge branch 'ent-10259-control-de-configuracion-en-tagent_acess' into 'develop'
Ent 10259 control de configuracion en tagent acess
See merge request artica/pandorafms!5504
|
2023-02-27 08:45:00 +00:00 |
|
artica
|
491958a105
|
Auto-updated build strings.
|
2023-02-27 01:00:21 +01:00 |
|
artica
|
ce5b0abda6
|
Auto-updated build strings.
|
2023-02-26 01:00:21 +01:00 |
|
artica
|
e38504d3df
|
Auto-updated build strings.
|
2023-02-25 01:00:27 +01:00 |
|
Daniel Cebrian
|
b367284d72
|
Merge branch 'develop' into 'ent-10259-control-de-configuracion-en-tagent_acess'
# Conflicts:
# pandora_console/include/class/ConsoleSupervisor.php
|
2023-02-24 11:09:16 +00:00 |
|
Daniel Cebrian
|
c7e53f5a1a
|
#10259 resolve conflics
|
2023-02-24 12:07:37 +01:00 |
|
Diego Muñoz-Reja
|
76dbaf46d2
|
Merge branch 'ent-10321-limitacion-del-numero-de-eventos' into 'develop'
Ent 10321 limitacion del numero de eventos
See merge request artica/pandorafms!5513
|
2023-02-24 10:06:44 +00:00 |
|
artica
|
4fdd5296a0
|
Auto-updated build strings.
|
2023-02-24 01:02:05 +01:00 |
|
Calvo
|
4374e78ad7
|
Removed Win32 service from pandora_server
|
2023-02-23 18:09:14 +01:00 |
|
Calvo
|
d1a3795acb
|
Added new indexes to mr and pandoradb
|
2023-02-23 12:58:33 +01:00 |
|
artica
|
1babcb408d
|
Auto-updated build strings.
|
2023-02-23 01:01:56 +01:00 |
|
Matias Didier
|
f371747619
|
Merge branch 'ent-9479-gestion-de-modulos-desde-metaconsola-sustitucion-del-wizard' into 'develop'
Ent 9479 gestion de modulos desde metaconsola sustitucion del wizard
See merge request artica/pandorafms!5509
|
2023-02-22 15:09:19 +00:00 |
|
Daniel Cebrian
|
2980e180d8
|
Merge branch 'develop' into 'ent-10307-14480-anadir-informacion-del-usuario-al-poner-un-evento-in-process'
# Conflicts:
# pandora_console/include/functions_events.php
|
2023-02-22 10:45:38 +00:00 |
|
Matias Didier
|
cbbb874d7b
|
Merge branch 'ent-10416-no-aplica-los-filtros-de-eventos-desde-servicio' into 'develop'
Ent 10416 no aplica los filtros de eventos desde servicio
See merge request artica/pandorafms!5551
|
2023-02-22 10:36:00 +00:00 |
|
Matias Didier
|
c8109dadd3
|
Merge branch 'ent-9523-derivado-del-trabajo-q-a-765-fe-de-errata-en-titulo-de-ventana-emergente-para-informacion-de' into 'develop'
Ent 9523 derivado del trabajo q a 765 fe de errata en titulo de ventana emergente para informacion de
See merge request artica/pandorafms!5496
|
2023-02-22 10:15:26 +00:00 |
|
Rafael Ameijeiras
|
3c71213c0d
|
Merge branch 'ent-10435-cambios-intaladores-online' into 'develop'
Ent 10435 cambios intaladores online
See merge request artica/pandorafms!5554
|
2023-02-22 10:12:00 +00:00 |
|
rafael
|
df86a428b7
|
10435 change gotty to be downloaded from firefly
|
2023-02-22 10:38:14 +01:00 |
|
alejandro.campos@artica.es
|
2a9494b48d
|
fix conflicts
|
2023-02-22 10:10:59 +01:00 |
|
alejandro.campos@artica.es
|
b76a4b1a48
|
fix conflicts
|
2023-02-22 10:10:14 +01:00 |
|
Daniel Cebrian
|
2b7b49db20
|
#10493 fixed pagination in tags
|
2023-02-22 09:29:55 +01:00 |
|
Daniel Cebrian
|
2f1060af56
|
#10493 fixed pagination in collection
|
2023-02-22 09:05:27 +01:00 |
|
rafael
|
ecf89a7b04
|
Merge branch 'develop' into ent-10435-cambios-intaladores-online
|
2023-02-22 08:48:07 +01:00 |
|
artica
|
53ca822779
|
Auto-updated build strings.
|
2023-02-22 01:02:03 +01:00 |
|
Daniel Cebrian
|
dfadbb0f80
|
#10493 added pagination in group module
|
2023-02-21 16:51:05 +01:00 |
|
Matias Didier
|
8b8414be52
|
Merge branch 'ent-10305-ultima-ejecucion-de-pandora-db-en-vista-about-da-53-anos-como-dato' into 'develop'
Ent 10305 ultima ejecucion de pandora db en vista about da 53 anos como dato
See merge request artica/pandorafms!5501
|
2023-02-21 15:31:31 +00:00 |
|
Daniel Cebrian
|
f9c3524be8
|
#10493 fixed pagination in profiles
|
2023-02-21 16:05:24 +01:00 |
|
Daniel Cebrian
|
2b185b5754
|
#10493 fixed pagination in alerts
|
2023-02-21 15:44:41 +01:00 |
|
Rafael
|
9d3f253dd4
|
10435 fixing os description for ssh banner
|
2023-02-21 15:36:37 +01:00 |
|
Rafael
|
f98b8baec1
|
Merge branch 'develop' into ent-10435-cambios-intaladores-online
|
2023-02-21 15:30:20 +01:00 |
|
rafael
|
77f4f4a680
|
10435 set new version number
|
2023-02-21 12:34:11 +01:00 |
|
Rafael Ameijeiras
|
776f0a69f5
|
Merge branch 'ent-10459-no-aplica-la-politica-de-contrasenas-en-el-cambio-de-password-usuario-admin' into 'develop'
Draft: Ent 10459 no aplica la politica de contrasenas en el cambio de password usuario admin
See merge request artica/pandorafms!5549
|
2023-02-21 09:03:33 +00:00 |
|
Rafael Ameijeiras
|
0fa39af4a9
|
Merge branch 'ent-10483-falla-el-csrf-en-login-despues-de-hacer-logout' into 'develop'
Draft: Ent 10483 falla el csrf en login despues de hacer logout
See merge request artica/pandorafms!5550
|
2023-02-21 09:02:40 +00:00 |
|