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 |
|
miguel angel rasteu
|
a433a78a4c
|
#Fix graph
|
2023-09-07 10:44:46 +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 |
|
Jonathan
|
84bb4780ca
|
#10639 new datepicker style and save filter
|
2023-08-29 12:17:41 +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
|
dca15b5637
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-08-23 18:54:01 +02:00 |
|
Rafael Ameijeiras
|
1fa70b3afc
|
Merge branch 'ent-11852-advertencia-al-usar-intervalos-largos' into 'develop'
Ent 11852 advertencia al usar intervalos largos
See merge request artica/pandorafms!6346
|
2023-08-23 05:56:19 +00:00 |
|
daniel
|
5a61f074d7
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-08-22 09:22:11 +02:00 |
|
Jonathan
|
563323d0be
|
#11852 warning time lapse more than 30 days
|
2023-08-21 13:05:39 +02:00 |
|
miguel angel rasteu
|
ebd98b479d
|
#11051 Fix conflict css
|
2023-08-21 09:01:05 +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 |
|
Jorge Rincon
|
5e91d8a340
|
Merge branch develop into ent-11315-anadir-filtrado-al-wizard-de-servicios
|
2023-08-18 09:38:05 +02:00 |
|
daniel
|
8bc65474f0
|
ITSM pandora_enterprise#11471
|
2023-08-16 16:52:57 +02:00 |
|
daniel
|
133eef456a
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-08-14 08:14:34 +02:00 |
|
Daniel Rodriguez
|
c4ff61a2c0
|
Merge branch 'ent-11326-security-hardening-console' into 'develop'
Ent 11326 Security hardening: Console
See merge request artica/pandorafms!6242
|
2023-08-11 08:20:03 +00:00 |
|
Daniel Cebrian
|
06eae47560
|
Merge branch 'develop' into ent-11326-security-hardening-console
|
2023-08-09 13:27:21 +02:00 |
|
Jorge Rincon
|
f1cbe8c360
|
#11851 Fixed operation of the interval field, allowing to add more than one.
|
2023-08-09 12:47:51 +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
|
752878fdeb
|
Merge branch 'ent-9558-derivado-del-trabajo-q-a-765-error-en-metaconsola-parama-para-el-fichero-de-imagen' into 'develop'
Ent 9558 derivado del trabajo q a 765 error en metaconsola parama para el fichero de imagen
See merge request artica/pandorafms!6306
|
2023-08-07 07:27:50 +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 |
|
Rafael Ameijeiras
|
0b680568b5
|
Merge branch 'ent-11739-compatibilidad-php-8-2-second' into 'develop'
Ent 11739 compatibilidad php 8 2 second
See merge request artica/pandorafms!6300
|
2023-08-04 06:32:37 +00:00 |
|
miguel angel rasteu
|
135c6835bd
|
#11713 fix title buttons
|
2023-08-03 12:51:09 +02:00 |
|
Pablo Aragon
|
413528146b
|
9558-Fix background url html_print_autocomplete_modules()
|
2023-08-03 08:25:38 +02:00 |
|
Rafael Ameijeiras
|
e6eee88a63
|
Merge branch 'ent-11377-users-bulk-operations-usuarios-con-perfil-x-anadido-no-aparecen-al-intentar-borrar-perfil' into 'develop'
Ent 11377 users bulk operations usuarios con perfil x anadido no aparecen al intentar borrar perfil
See merge request artica/pandorafms!6010
|
2023-08-02 10:42:36 +00:00 |
|
Daniel Maya
|
aef7f0edd0
|
#11739 Fixed deprecated functions 4
|
2023-08-01 14:51:31 +02:00 |
|
Jonathan
|
f2328407b1
|
Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha
|
2023-08-01 09:39:56 +02:00 |
|
Daniel Maya
|
ad24712eed
|
resolved conflict 2
|
2023-07-31 09:48:42 +02:00 |
|
miguel angel rasteu
|
9781809b22
|
#11713 Fix title
|
2023-07-31 09:27:50 +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 Maya
|
858a6230b3
|
resolved conflict
|
2023-07-31 09:02:58 +02: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 Cebrian
|
001ffc1799
|
Merge branch 'develop' into ent-11326-security-hardening-console
|
2023-07-26 10:55:49 +02:00 |
|
Rafael Ameijeiras
|
ce9d5218e7
|
Merge branch 'ent-11724-bug-del-boton-show-hide-de-campos-sensibles' into 'develop'
Ent 11724 bug del boton show hide de campos sensibles
See merge request artica/pandorafms!6238
|
2023-07-25 07:50:19 +00:00 |
|
alejandro.campos@artica.es
|
354324b9d1
|
implemented database ha view in metaconsole
|
2023-07-24 13:11:05 +02:00 |
|
daniel
|
1bf7f1e36e
|
ITSM pandora_enterprise#11471
|
2023-07-21 14:23:42 +02:00 |
|
miguel angel rasteu
|
5084c0490b
|
#11386 Fix changes in soun event dialog
|
2023-07-21 13:32:12 +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 |
|
Jorge Rincon
|
844f61cc73
|
#11315 Change type of select to select_from_sql
|
2023-07-18 09:34:14 +02:00 |
|
miguel angel rasteu
|
2e4066973a
|
#11377 Show all groups
|
2023-07-17 12:32:47 +02:00 |
|
daniel
|
a29497f659
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-07-17 10:52:15 +02:00 |
|
Rafael Ameijeiras
|
d860d613d6
|
Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop'
Ent 10598 nuevo wizard de bienvenida
See merge request artica/pandorafms!6043
|
2023-07-17 05:57:29 +00:00 |
|
miguel angel rasteu
|
fd56631ae4
|
#11713 Fix action button title
|
2023-07-14 13:07:04 +02:00 |
|
daniel
|
a3eefacc80
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-07-12 16:35:24 +02:00 |
|
Daniel Cebrian
|
0e2d1ee47f
|
#11326 security hardening
|
2023-07-12 15:54:04 +02:00 |
|
Jonathan
|
4ad1aa6237
|
#11687 show all in agent group
|
2023-07-12 15:35:22 +02:00 |
|
miguel angel rasteu
|
8332dce850
|
#11724 Fix show hide button
|
2023-07-12 13:15:46 +02:00 |
|
Matias Didier
|
f5f71531ee
|
Merge branch 'ent-9756-anadir-escalado-de-estados-a-op-masivas' into 'develop'
Ent 9756 anadir escalado de estados a op masivas
See merge request artica/pandorafms!6079
|
2023-07-11 10:48:55 +00:00 |
|