marcos.alconada
f960e9037d
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: 9b7c696afb0860fb738d52e18668c80e634efbf5
2019-04-24 09:28:04 +02:00
artica
4a699c2b75
Auto-updated build strings.
...
Former-commit-id: d9c3cbb3cf9ddbd4d847aed58c79a3c8d795d7a5
2019-04-24 00:01:09 +02:00
marcos.alconada
6ef28a9b27
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: ca272bd529c0bc2182bbcc476f82bcfcf42175ed
2019-04-23 17:56:22 +02:00
Alejandro Fraguas
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
alejandro-campos
92da84c47f
fix bug in discovery progress popups
...
Former-commit-id: 756f4b002db192794a09d0b15f5b6e3a2daf8731
2019-04-23 16:40:08 +02:00
fbsanchez
74234e30a9
Merge branch 'fix/discovery3-oracle' into 'develop'
...
minor update
See merge request artica/pandorafms!2374
Former-commit-id: 97e6bb47208ccce8eb66fb4ca0c7e3be35b41b95
2019-04-23 16:36:13 +02:00
fbsanchez
bbedf36235
minor update
...
Former-commit-id: da7ef108bd3b71ece515407fb932e6b9bef761fd
2019-04-23 16:28:22 +02:00
marcos.alconada
8987a60755
restauro functions api
...
Former-commit-id: e22da32fb91e8f7b06d7fe627a9a3f2eca877390
2019-04-23 15:39:49 +02:00
marcos.alconada
58d2abbdae
restauro api
...
Former-commit-id: de9d1588e0e8ef53b48b72d52597963b59aee11f
2019-04-23 15:37:54 +02:00
marcos.alconada
4f25c89a74
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: 489946341bfbf5c985750eac90dd12f7cbea91e5
2019-04-23 14:53:43 +02:00
Alejandro Fraguas
619d5eaf7d
Merge branch 'ent-3667-Bug-informes-metaconsola-en-csv' into 'develop'
...
minor fix
See merge request artica/pandorafms!2371
Former-commit-id: d68d9354adbf4182a021d39fc174b8b9f54d82c1
2019-04-23 12:54:20 +02:00
fbsanchez
57d66e95ce
minor fix
...
Former-commit-id: 17cf4ce929b52904ea8c6120b3c36f859694211e
2019-04-23 12:20:12 +02:00
marcos.alconada
8345c1a85f
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: e28ec3130ff14c662953b33490c5525e257b0288
2019-04-23 09:37:41 +02:00
artica
883f3decb4
Auto-updated build strings.
...
Former-commit-id: 49a78e90a71388c7fb6d4fb8beb36f909429a0c2
2019-04-23 00:01:09 +02:00
alejandro-campos
01d1fb1c11
fixed visual bug
...
Former-commit-id: f2714283dd1f81c87505cdde349c33c6dd9bdc0b
2019-04-22 18:17:39 +02:00
alejandro-campos
0e02d71712
add missing image
...
Former-commit-id: 0e5c0140a919223403c33a7dde15f64fdde62ed8
2019-04-22 17:47:30 +02:00
alejandro-campos
4f6a81dc5b
visual changes to discovery
...
Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
2019-04-22 17:46:04 +02:00
Alejandro Fraguas
a6df522df7
Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas_2' into 'develop'
...
Fixed header missing in table alert status - #3707
See merge request artica/pandorafms!2365
Former-commit-id: e56a9610bc358898b5dc61a7f47d32561c72e36b
2019-04-22 17:31:49 +02:00
Daniel Rodriguez
3a68e1bb77
Merge branch 'ent-3882-revision-politicas' into 'develop'
...
Función auxiliar políticas
See merge request artica/pandorafms!2354
Former-commit-id: de065e2ef71e864862a4b2a93419cdf9285f092c
2019-04-22 16:27:51 +02:00
Alejandro Fraguas
f2d7584d70
Merge branch 'ent-3674-discovery-fase-3' into 'develop'
...
Ent 3674 discovery fase 3
See merge request artica/pandorafms!2315
Former-commit-id: d89d32a1432a3e449485eb113b3195dcc101ce80
2019-04-22 14:34:46 +02:00
fbsanchez
f06e81dcc4
Discovery: Minor update in description and extra information in log
...
Former-commit-id: b24c095a8c75d190ba03ea089a9d680fcccd5b2b
2019-04-22 13:49:58 +02:00
fbsanchez
19ec5a0733
minor fix
...
Former-commit-id: 34ebb713083bce476e15483e710f23295cf842cb
2019-04-22 13:26:17 +02:00
fbsanchez
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
fbsanchez
b31051f9a1
Merge branch 'fix/wizard_breadcrum' into 'develop'
...
Breadcrum fix do not rollback...
See merge request artica/pandorafms!2366
Former-commit-id: 473f668f6a6a9be11e551aecbb21317004785314
2019-04-22 10:56:26 +02:00
fbsanchez
e9af2b6a1e
Breadcrum fix do not rollback...
...
Former-commit-id: af2a9520e71da6a3287dc8c462a3dea5c72ba602
2019-04-22 10:45:07 +02:00
fbsanchez
8978b49a8b
minor fix while setting node_radius by default
...
Former-commit-id: 37b603adc1eb025c84b4e6d298815894be8adcf6
2019-04-22 09:33:51 +02:00
marcos.alconada
dc086463ee
Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
...
Former-commit-id: 079b5bccc12df71ccc2bb8642e6edf34c17724ca
2019-04-22 09:20:31 +02:00
fbsanchez
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
artica
ea7a8b2b90
Auto-updated build strings.
...
Former-commit-id: 5dcf18be78871aec110bc23387eed631fc9b23f4
2019-04-21 00:01:29 +02:00
artica
1dfda59ce6
Auto-updated build strings.
...
Former-commit-id: cd5e2305d2b22765879068907dd042a36f1d1524
2019-04-20 00:01:24 +02:00
artica
7283d87a17
Auto-updated build strings.
...
Former-commit-id: 7661f94b50736f6ebf6b75fc79b2a0570431f424
2019-04-19 00:01:25 +02:00
artica
9d8e2abd98
Auto-updated build strings.
...
Former-commit-id: 9f2ce52207e981ede2c5be3bd52b7747612091d3
2019-04-18 00:01:27 +02:00
Alejandro Fraguas
4cf8cefe69
Merge branch 'ent-3904-Tablas-que-no-se-han-cambiado-con-los-nuevos-estilos' into 'develop'
...
Changed styles from table database interface - #3904
See merge request artica/pandorafms!2364
Former-commit-id: e17d15d7001b0654dd6961242442a8793533ed8a
2019-04-17 15:21:41 +02:00
Alejandro Fraguas
eacef25778
Merge branch 'ent-3379-7306-problema-con-agente-secondary-mode-xml_buffer' into 'develop'
...
Do not get stuck trying to send buffered XML files to a secondary server.
See merge request artica/pandorafms!2359
Former-commit-id: b090e4f86b2bbb0d7e2728b80ceea1dfc149b262
2019-04-17 12:58:46 +02:00
Tatiana Llorente
aa34cf17be
Fixed header missing in table alert status - #3707
...
Former-commit-id: 900b4023316d9e4946a8f81871e19f7f897a7a8f
2019-04-17 12:57:45 +02:00
marcos.alconada
d2d8a3b0ba
solucion problema merge
...
Former-commit-id: 0ddc396a3f8168b5cea65484502f00ff6178c6df
2019-04-17 12:53:50 +02:00
marcos.alconada
bb7c9d0405
Merge branch 'ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola' into develop
...
Former-commit-id: 68a549dddd224c96ce4a85607d51a5e32e729b15
2019-04-17 12:49:39 +02:00
marcos.alconada
5de38e204f
Se añade la funcionalidad de sobreescribir perfiles existentes. Se cambia el campo id_grupo por id del perfil
...
Former-commit-id: 0bdec9661a9673a7695754bb7b8ab293650cca66
2019-04-17 12:45:38 +02:00
marcos.alconada
985726d5a2
modificaciones en api.php
...
Former-commit-id: f46abc58c079fbe584d2bda12f44e3b09c1a4693
2019-04-17 12:44:23 +02:00
Tatiana Llorente
05261e7924
Changed styles from table database interface - #3904
...
Former-commit-id: addb71fdbe4a584047230b4aa61c58e0acf25cd4
2019-04-17 11:49:49 +02:00
Alejandro Fraguas
6594095de7
Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' into 'develop'
...
Ent 3707 nuevo diseño para las tablas
See merge request artica/pandorafms!2352
Former-commit-id: 684daf476bf288e294b67f97fc80fdf6a6ddcce4
2019-04-17 10:19:42 +02:00
vgilc
5e8452b12c
Merge branch 'ent-3792_spec_console_enterprise_for_rhel7' into 'develop'
...
add line in update version script to include pandora_console_enterprise_rhel7.spec
See merge request artica/pandorafms!2363
Former-commit-id: e6678b6dd238e211d4edd57732789fd45242ffa4
2019-04-17 09:54:33 +02:00
Rafael Ameijeiras
abcbd92f1f
add line in update version script to include pandora_console_enterprise_rhel7.spec
...
Former-commit-id: d071f1242b3c29b46458690b2f6709ef3546b61b
2019-04-17 09:45:08 +02:00
Tatiana Llorente
83cda70e0a
Fixed styles of tables within tables with new class - #3707
...
Former-commit-id: 6775b6f96669d33fb2130bfca2448d40d2de0964
2019-04-17 09:34:24 +02:00
artica
ff5a33ba2c
Auto-updated build strings.
...
Former-commit-id: 20a5c2ce8013b740274a489a7afaa208a23b16e6
2019-04-17 00:01:32 +02:00
marcos.alconada
293b025c7f
Se elimina error de sintaxis
...
Former-commit-id: 0db25e1c670d645c6a3e53829a895024a30a8cd4
2019-04-16 18:35:54 +02:00
marcos.alconada
985fc952e1
actualizacion
...
Former-commit-id: 238764c594de2680d5f0c76a9c1b5fc7d8b8579d
2019-04-16 16:10:25 +02:00
marcos.alconada
5c2ebf0976
Camprobaciones en local para functiones
...
Former-commit-id: caaf9ac04d1c61011a4f2d337e775e72f41c6741
2019-04-16 16:08:06 +02:00
marcos.alconada
31aa5b6d67
Comprobaciones en local
...
Former-commit-id: f7a110f0c5f4119c9cb2da8fa3216ef8d748a616
2019-04-16 16:06:17 +02:00
marcos.alconada
83934100ef
change api
...
Former-commit-id: 064e8e8cdc1fae50424ca6a1796b27490970c084
2019-04-16 09:24:11 +02:00
