miguel angel rasteu
|
970cc997cc
|
#11051 Fix conflict
|
2023-08-21 08:25:53 +02:00 |
|
daniel
|
a63824d802
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/extras/mr/66.sql
pandora_console/godmode/users/user_management.php
|
2023-08-21 08:08:34 +02:00 |
|
Rafael Ameijeiras
|
46e5d4edcd
|
Merge branch 'ent-11022-mejora-en-visualizacion-de-licencia' into 'develop'
Ent 11022 mejora en visualizacion de licencia
See merge request artica/pandorafms!6204
|
2023-08-18 06:35:41 +00:00 |
|
daniel
|
8bc65474f0
|
ITSM pandora_enterprise#11471
|
2023-08-16 16:52:57 +02:00 |
|
daniel
|
64c7f56235
|
ITSM pandora_enterprise#11471
|
2023-08-14 10:59:56 +02:00 |
|
daniel
|
133eef456a
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-08-14 08:14:34 +02:00 |
|
Jorge Rincon
|
5a440f1078
|
#11851 fixed setup interval editor
|
2023-08-09 09:47:09 +02:00 |
|
daniel
|
7f82273dc4
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/extras/mr/65.sql
|
2023-08-09 08:59:01 +02:00 |
|
Rafael Ameijeiras
|
019efcb124
|
Merge branch 'ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro' into 'develop'
Ent 11668 noticias en consola tienen fondo blanco en tema oscuro
See merge request artica/pandorafms!6182
|
2023-08-04 06:45:42 +00:00 |
|
Rafael Ameijeiras
|
b2821c0db3
|
Merge branch 'ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola' into 'develop'
Ent 11713 bugs de visualizacion de los botones de accion en metaconsola y consola
See merge request artica/pandorafms!6249
|
2023-08-04 06:34:35 +00:00 |
|
miguel angel rasteu
|
1009404bfd
|
Merge branch 'develop' into ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro
|
2023-08-03 13:42:49 +02:00 |
|
Daniel Maya
|
ddcfa02e6f
|
#11739 Fixed date_format 2
|
2023-08-03 12:51:50 +02:00 |
|
miguel angel rasteu
|
1dc24cdfb4
|
#11668 Fix black theme
|
2023-08-03 12:22:20 +02:00 |
|
Daniel Maya
|
8bbaa11ce3
|
resolved conflict
|
2023-07-31 09:44:46 +02:00 |
|
miguel angel rasteu
|
95e17b46bf
|
Merge branch 'develop' into ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola
|
2023-07-31 09:03:03 +02:00 |
|
Daniel Rodriguez
|
42a5fc0716
|
Merge branch 'ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados-manualmente' into 'develop'
Ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados
See merge request artica/pandorafms!6051
|
2023-07-27 13:08:05 +00:00 |
|
alejandro.campos@artica.es
|
6114787764
|
Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id
|
2023-07-27 13:32:26 +02:00 |
|
Daniel Rodriguez
|
84f61c9022
|
Merge branch 'ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada' into 'develop'
Ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada
See merge request artica/pandorafms!6028
|
2023-07-27 10:27:55 +00:00 |
|
Daniel Rodriguez
|
c2d7c10442
|
Merge branch 'ent-11606-Quitar-consolas-visuales-legacy' into 'develop'
remove legacy visual console
See merge request artica/pandorafms!6140
|
2023-07-26 11:09:44 +00:00 |
|
daniel
|
1bf7f1e36e
|
ITSM pandora_enterprise#11471
|
2023-07-21 14:23:42 +02:00 |
|
Daniel Rodriguez
|
4148074996
|
Merge branch 'ent-11012-Flag-Experimental-para-la-consola' into 'develop'
added setup token
See merge request artica/pandorafms!6133
|
2023-07-21 07:23:33 +00:00 |
|
daniel
|
3e2c2990df
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-07-20 08:28:36 +02:00 |
|
daniel
|
1f1b85561c
|
Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id
|
2023-07-19 11:39:06 +02:00 |
|
daniel
|
5cf31fc77e
|
ITSM fixed pandora_enterprise#11471
|
2023-07-19 11:36:03 +02:00 |
|
daniel
|
9a72d0740c
|
ITSM fixed pandora_enterprise#11471
|
2023-07-18 15:13:08 +02:00 |
|
Rafael Ameijeiras
|
06d3664b2f
|
Merge branch 'ent-10254-15114-anadir-timeout-y-secondary-server-a-ad' into 'develop'
Ent 10254 [#15114]Añadir timeout y secondary server a AD
See merge request artica/pandorafms!6091
|
2023-07-18 10:14:29 +00:00 |
|
miguel angel rasteu
|
fd56631ae4
|
#11713 Fix action button title
|
2023-07-14 13:07:04 +02:00 |
|
Diego Muñoz-Reja
|
57058c4f9c
|
Merge branch 'ent-11266-no-se-habilita-el-log-de-consola-en-770-ni-771' into 'develop'
Ent 11266 no se habilita el log de consola en 770 ni 771
See merge request artica/pandorafms!6001
|
2023-07-13 07:55:47 +00:00 |
|
daniel
|
d3412a7ad1
|
add filter events comments pandora_enterprise#11387
|
2023-07-10 16:26:33 +02:00 |
|
Matias Didier
|
a575c3028f
|
Merge branch 'ent-11037-modificar-etiqueta' into 'develop'
Ent 11037 modificar etiqueta
See merge request artica/pandorafms!5795
|
2023-07-07 11:57:33 +00:00 |
|
Daniel Cebrian
|
496058e144
|
Merge branch 'develop' into ent-11437-automatic-logout-mechanism-has-been-disabled
|
2023-07-06 12:12:23 +02:00 |
|
miguel angel rasteu
|
4ff400f54c
|
#11022 Add agent usage details
|
2023-07-03 13:18:50 +02:00 |
|
miguel angel rasteu
|
8ad4e8261e
|
#10563 Fix config enable feedback
|
2023-07-03 10:22:22 +02:00 |
|
miguel angel rasteu
|
5f864d53a8
|
#11051 Add action to mark all notification as read
|
2023-07-03 09:18:30 +02:00 |
|
Gorka Sanchez
|
28f99d2c27
|
Merge branch 'ent-10741-15263-cuadro-de-busqueda-de-modulos-en-agente-limitado-a-5-caracteres' into 'develop'
Ent 10741 15263 cuadro de busqueda de modulos en agente limitado a 5 caracteres
See merge request artica/pandorafms!5713
|
2023-06-30 11:39:50 +00:00 |
|
miguel angel rasteu
|
ac92b5979c
|
#10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality
|
2023-06-30 08:35:37 +02:00 |
|
alejandro.campos@artica.es
|
087c0c18cc
|
Merge remote-tracking branch 'origin/develop' into ent-9781-14477-Control-reportes-SQL-Query-en-PDF
|
2023-06-29 12:00:44 +02:00 |
|
Rafael Ameijeiras
|
520f0c77d1
|
Merge branch 'ent-10266-tip-sobre-opcion-de-setup-en-version-opensource-setup-visual-precision-de-datos' into 'develop'
Ent 10266 tip sobre opcion de setup en version opensource setup visual precision de datos
See merge request artica/pandorafms!5703
|
2023-06-27 11:26:02 +00:00 |
|
Matias Didier
|
fde3857674
|
Merge branch 'ent-11476-cambiar-headers-de-copyright' into 'develop'
Ent 11476 cambiar headers de copyright
See merge request artica/pandorafms!6069
|
2023-06-22 13:24:47 +00:00 |
|
Pablo Aragon
|
cbbf675d82
|
11620-Login background 772
|
2023-06-20 11:40:40 +02:00 |
|
alejandro.campos@artica.es
|
77ff766f84
|
remove legacy visual console
|
2023-06-19 15:25:37 +02:00 |
|
alejandro.campos@artica.es
|
1499af3a2d
|
added setup token
|
2023-06-19 11:04:08 +02:00 |
|
Daniel Cebrian
|
052852f2d1
|
#10254 added timeout in active directory
|
2023-06-13 13:20:28 +02:00 |
|
Daniel Cebrian
|
8678df6982
|
#10254 added secondary server in ad
|
2023-06-13 12:37:28 +02:00 |
|
Daniel Cebrian
|
1980458572
|
#11437 added new control session
|
2023-06-08 14:06:15 +02:00 |
|
miguel angel rasteu
|
db62a91cb6
|
#11476 Fix https url
|
2023-06-08 13:19:01 +02:00 |
|
miguel angel rasteu
|
1f8752ee63
|
#11476 Fix pandora url
|
2023-06-08 13:10:16 +02:00 |
|
miguel angel rasteu
|
64204b6ff7
|
#11476 Fix ascci art
|
2023-06-08 12:42:10 +02:00 |
|
miguel angel rasteu
|
933f69f2ab
|
#11476 Change copyright header
|
2023-06-08 11:53:13 +02:00 |
|
Félix Suárez
|
17262c45e0
|
FrontEnd display and Token DB update
|
2023-06-06 16:02:04 -06:00 |
|