13b32003b3
save changes ticket 3937
...
Former-commit-id: 264c0fed3ddcf7c34796af0a3c2bd4d48a6763bb
2019-05-16 11:37:48 +02:00
a9834dc415
Merge branch 'develop' into 'ent-4004-Estilos-Discovery'
...
Conflicts:
pandora_console/godmode/wizards/HostDevices.class.php
Former-commit-id: de7b4b069e1c5f673b567fcb3271ec867d0fbae1
2019-05-10 09:55:54 +02:00
8027238dfd
Merge branch 'ent-3925-eliminar-custom-response-deprecated' into 'develop'
...
Ent 3925 eliminar custom response deprecated
See merge request artica/pandorafms!2390
Former-commit-id: aa92dfe86b9039f45db063cd1a711b26e8c36442
2019-05-09 17:52:46 +02:00
9b51928e35
Added HTML edit feature, needed because TinyEdit adds lot's of HTML and is not practical. You need to edit the contents in HTML. Is not a security issue, because only admin can edit this news contents.
...
Former-commit-id: 4039346ffe4fc2628f515b4cdaeaf1655377e74b
2019-05-09 16:01:51 +02:00
c775d0359c
Merge branch 'ent-3973-al-hacer-update-de-un-comando-persiste-valor-antiguo-de-los-campos-al-refrescar-la-vista' into 'develop'
...
Show new values after update
See merge request artica/pandorafms!2405
Former-commit-id: aa2b2a4857e47a4999ef9ca42f6ba1b59fa9d714
2019-05-09 14:36:51 +02:00
7c3e883c01
Merge branch 'ent-3770-texto-del-pandora-diag' into 'develop'
...
Ent 3770 texto del pandora diag
Closes pandora_enterprise#3529, pandora_enterprise#1744, pandora_enterprise#3305, pandora_enterprise#3121, and pandora_enterprise#3252
See merge request artica/pandorafms!2393
Former-commit-id: d78409acd362ebc5308495c359344f5b706685cd
2019-05-09 13:01:28 +02:00
23b3d07f37
Merge remote-tracking branch 'origin/develop' into ent-3925-eliminar-custom-response-deprecated
2019-05-09 09:29:27 +02:00
f5114918b5
Unify the styles of Discovery with Pandora - #4004
2019-05-09 08:45:55 +02:00
0a7539cc3a
Merge branch 'ent-3990-7999-colecciones-no-funcionan-no-se-puede-subir-ni-crear-archivos' into 'develop'
...
fixed filemanager
See merge request artica/pandorafms!2408
2019-05-08 18:26:23 +02:00
1ffc6bd028
Merge remote-tracking branch 'origin/develop' into ent-3770-texto-del-pandora-diag
...
Former-commit-id: 35f8be06ed6fff20ff930a19429a0cbcf5aff33d
2019-05-08 14:36:04 +02:00
72a127c085
Merge branch 'ent-3773-fallo-paginacion-templates-alerts' into 'develop'
...
Fixed pagination in Alert templates
See merge request artica/pandorafms!2391
2019-05-08 13:40:18 +02:00
247605f308
Merge branch 'ent-3664-Al_aplicar_un_cambio_en_un_agente_se_muestra_que_se_ha_realizado_con_exito_pero_no_actualiza_campos_a_primera_vista' into 'develop'
...
Eliminated the cache when update agents
See merge request artica/pandorafms!2242
2019-05-08 12:50:40 +02:00
297f53b9de
Merge branch 'ent-3608-Update-Manager-Online' into 'develop'
...
Ent 3608 update manager online
See merge request artica/pandorafms!2379
2019-05-08 11:20:12 +02:00
610e0dabbf
Merge branch 'develop' into ent-3773-fallo-paginacion-templates-alerts
2019-05-08 11:17:15 +02:00
99f5cab83d
fixed filemanager
2019-05-08 10:55:20 +02:00
fa14fa9510
Show new values after update
2019-05-07 17:47:47 +02:00
a92f81272a
Merge branch 'ent-3835-pandora-db-historical-fails-when-port-setted' into develop
2019-05-07 15:05:03 +02:00
fff3a783a1
Se restablece archivo modificado
...
Former-commit-id: 1dca6ef8291dbd98951da31fc765130c9c450316
2019-05-06 18:09:30 +02:00
e1951c45a4
Se añade al 28
...
Former-commit-id: 1607d9cbc88fe0e029df46ada20046899558829e
2019-05-06 18:06:59 +02:00
16f687574e
Merge branch 'ent-3847-Bug-en-edicion-de-modulos-locales-posible-condicion-especial' into 'develop'
...
Fixed bug in unlinked modules
See merge request artica/pandorafms!2347
Former-commit-id: 32bea7e188131ae6115f6c45012dafe648f811cd
2019-05-03 12:41:01 +02:00
e424a2a684
Fixed bug in unlinked modules edition
...
Former-commit-id: ec9ee4ecbc53a5c617aaf2cee52f7cbbf8f94da8
2019-05-03 12:14:23 +02:00
d16b96309b
Fixed pagination in Alert templates
...
Former-commit-id: 88def9abc66ae8fddceb97ec55823b92ddc1bb1f
2019-04-29 14:45:11 +02:00
da8507c4b4
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: 56da7f09fa90543ae4b07af79da5dd308a4aa395
2019-04-25 16:05:27 +02:00
c1272035cc
Merge remote-tracking branch 'origin/develop' into visual-console-refactor
...
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
2019-04-24 17:05:20 +02:00
e543b64833
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: dcf81c584d7d2dc8ee8def3e8786d7e67f92da46
2019-04-24 16:20:42 +02:00
50e994e065
Merge branch 'ent-bug-conflicto-con-simple-selects-con-atributo-size' into 'develop'
...
change way to print discovery simple multiple inputs
See merge request artica/pandorafms!2378
Former-commit-id: a4de7318635a68d1c9c1343b3674a93581d5ce23
2019-04-24 13:55:02 +02:00
759a533180
Merge branch 'ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola' into 'develop'
...
Commit para revisar progreso
See merge request artica/pandorafms!2289
Former-commit-id: b8924b2fc0d151274809ab625fa840b27412d493
2019-04-24 13:47:15 +02:00
fc40518e65
minor fix in task description (Discovery.cloud.aws.rds)
...
Former-commit-id: 1c32a684edddc17eef5a4bb5260a148632767efb
2019-04-24 13:29:18 +02:00
8aa1737d23
New style for update manager online Open Version - #3608
...
Former-commit-id: 782a5467c6249e73cbcf5ef1f3185a3edfc6a9d5
2019-04-24 12:45:07 +02:00
7433d52130
change way to print discovery simple multiple inputs
...
Former-commit-id: 845171053b2002d036f0f8992a2aacad4ec0a561
2019-04-24 12:32:33 +02:00
f116bfc3fd
Updated discovery task selector
...
Former-commit-id: dc692cd11f2bd81dcb7d4dea57954d77562ef561
2019-04-24 10:10:08 +02:00
194f4400f7
Merge branch 'ent-3647-Revision-estilos-discovery-con-la-nueva-linea-de-estilos' into 'develop'
...
Ent 3647 revision estilos discovery con la nueva linea de estilos
See merge request artica/pandorafms!2370
Former-commit-id: 0f46544f8b05ee464c4dd85301f7a23a4067267a
2019-04-23 17:48:00 +02:00
2bafba0764
Se añade el contenido del fichero borrado
...
Former-commit-id: 9d2e8a9d873bd70549bf4bb1a6a9f7318dc4f36a
2019-04-23 17:40:49 +02:00
1eeba6855e
New style for update manager online - #3608
...
Former-commit-id: 488cdae753c5a7fff6e1c69dce4da9675e4ef425
2019-04-23 13:57:12 +02:00
a79092ded0
New style for update manager online - #3608
...
Former-commit-id: 43222aa59ceb936bf4c16fc73d08bba04f65abd9
2019-04-23 11:41:45 +02:00
ecd63667e5
New style for update manager online - #3608
...
Former-commit-id: 3cb6fb7aae2f73bc60e11cd97e3af0fda1c89354
2019-04-23 11:33:19 +02:00
579c9e7083
New style for update manager online - #3608
...
Former-commit-id: 5c69869fb8c79071589c16d25b5bf314910dc501
2019-04-23 10:12:35 +02:00
4f6a81dc5b
visual changes to discovery
...
Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
2019-04-22 17:46:04 +02:00
973ce07811
New style for update manager online - #3608
...
Former-commit-id: 377766a3a53d111f3531bff9ea7796cc6d02c143
2019-04-22 16:56:31 +02:00
2ca68daf9a
New style for update manager online - #3608
...
Former-commit-id: ea7a378d1c4092b3b0540fe2a94ae7415e7a200e
2019-04-22 15:45:57 +02:00
518a9a1eed
New style for update manager online - #3608
...
Former-commit-id: 8fb65c7064238d8f2180db6fedd99058667f804e
2019-04-22 15:41:57 +02:00
f06e81dcc4
Discovery: Minor update in description and extra information in log
...
Former-commit-id: b24c095a8c75d190ba03ea089a9d680fcccd5b2b
2019-04-22 13:49:58 +02:00
19ec5a0733
minor fix
...
Former-commit-id: 34ebb713083bce476e15483e710f23295cf842cb
2019-04-22 13:26:17 +02:00
ca05867e55
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
...
Former-commit-id: 3b243ec4bd93ba4cb494f0ea1a53043cc8e890c6
2019-04-22 13:23:58 +02:00
fa0da4504e
Fixed bug connection ok when db connection returns null
...
Former-commit-id: d2d6ea104bea4a0d0b4ffb2c64818428ee6ad703
2019-04-22 12:00:06 +02:00
e9af2b6a1e
Breadcrum fix do not rollback...
...
Former-commit-id: af2a9520e71da6a3287dc8c462a3dea5c72ba602
2019-04-22 10:45:07 +02:00
cbdd8e7104
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
...
Former-commit-id: 4efed0a1512550d09b8beb6a9851f7b1eeb3ff0c
2019-04-22 09:01:24 +02:00
fb87b97cd4
Merge remote-tracking branch 'origin/develop' into ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola
...
Former-commit-id: 628100b56c9528995e0f95ef8918dedaba16c8dd
2019-04-17 15:12:56 +02:00
d5b83b867b
Visual Console Refactor: bugfix
...
Former-commit-id: 8ea3faa88a1fd46d4f992e174e7916b91d9e9160
2019-04-16 17:44:39 +02:00
998a66f654
Visual Console Refactor: added a setting to use the legacy VC and added the relation line width setup option to the client
...
Former-commit-id: c6bb6ed82a8e84c485ad7270ebb46150fdfcfa8b
2019-04-16 12:23:03 +02:00
alejandro-campos
Tatiana Llorente
Daniel Rodriguez
slerena
marcos.alconada
Alejandro Fraguas
Daniel Maya
Daniel Barbero Martin
Ramon Novoa
manuel
Alejandro Gallardo Escobar
fbsanchez
Luis Calvo