miguel angel rasteu
|
5060398661
|
#11206 Fix conflict
|
2023-10-13 09:00:03 +02:00 |
Rafael Ameijeiras
|
dda7c2a0c0
|
Merge branch 'ent-12205-interfaz-configuracion-ehorus-pandora-rc-a-nivel-de-usuario-ha-desaparecido' into 'develop'
Ent 12205 interfaz configuracion ehorus pandora rc a nivel de usuario ha desaparecido
See merge request artica/pandorafms!6544
|
2023-10-11 07:18:34 +00:00 |
|
miguel angel rasteu
|
f22fd10659
|
#12205 Fix url
|
2023-10-10 13:44:57 +02:00 |
|
miguel angel rasteu
|
23c5836ddc
|
#12205 Change ehorus images
|
2023-10-10 11:34:11 +02:00 |
|
miguel angel rasteu
|
133826b498
|
#12205 Fix ehorus conf interfaz
|
2023-10-10 09:57:09 +02:00 |
alejandro.campos@artica.es
|
0e0b5bba43
|
Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual
|
2023-10-09 14:17:25 +02:00 |
|
Alejandro Campos
|
0f381b0db7
|
Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada'
# Conflicts:
# pandora_console/extras/mr/66.sql
|
2023-10-03 13:11:09 +00:00 |
Matias Didier
|
9e4903e545
|
Merge branch 'ent-12145-16086-gis-no-carga-en-mapas' into 'develop'
Ent 12145 16086 gis no carga en mapas
See merge request artica/pandorafms!6514
|
2023-10-03 08:52:21 +00:00 |
|
alejandro.campos@artica.es
|
0771094e85
|
minor changes
|
2023-10-02 16:42:32 +02:00 |
|
alejandro.campos@artica.es
|
85598d5012
|
Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual
|
2023-09-28 16:36:59 +02:00 |
Jonathan
|
a1d170cf0f
|
#12145 remove maxlength
|
2023-09-28 11:47:58 +02:00 |
|
Jonathan
|
c577fedff4
|
#12145 remove maxlength
|
2023-09-28 11:46:15 +02:00 |
|
alejandro.campos@artica.es
|
3f2caf9404
|
some gotty changes
|
2023-09-27 18:28:12 +02:00 |
|
alejandro.campos@artica.es
|
19a9f82fe1
|
gotty changes
|
2023-09-25 19:08:24 +02:00 |
|
alejandro.campos@artica.es
|
6f8212ed40
|
Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada
|
2023-09-20 15:46:47 +02:00 |
daniel
|
802f0bf83b
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-09-12 12:37:31 +02:00 |
|
daniel
|
5093d54137
|
ITSM pandora_enterprise#11471
|
2023-09-11 18:14:32 +02:00 |
|
miguel angel rasteu
|
99f92b9bec
|
#10676 Fix truncate text
|
2023-09-11 10:09:34 +02:00 |
|
daniel
|
3d5a5c856b
|
ITSM pandora_enterprise#11471
|
2023-09-08 13:09:03 +02:00 |
|
alejandro.campos@artica.es
|
318fa38721
|
Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada
|
2023-09-07 17:44:51 +02:00 |
|
alejandro.campos@artica.es
|
753851410e
|
implemented os version management
|
2023-09-06 17:02:15 +02:00 |
|
alejandro.campos@artica.es
|
f8911bcf9c
|
implemented os version management
|
2023-09-06 17:00:16 +02:00 |
|
daniel
|
fce86cb2ac
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-09-06 07:50:27 +02:00 |
|
daniel
|
a059f18b4b
|
ITSM pandora_enterprise#11471
|
2023-09-04 16:36:58 +02:00 |
|
Jonathan
|
d9e897568a
|
Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha
|
2023-08-24 10:06:19 +02:00 |
|
Jonathan
|
ab50a519ea
|
#10639 version 2 datepicker
|
2023-08-24 09:36:15 +02:00 |
|
daniel
|
512d5331d3
|
ITSM pandora_enterprise#11471
|
2023-08-23 18:52:06 +02:00 |
|
daniel
|
5a61f074d7
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-08-22 09:22:11 +02:00 |
|
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 |