Commit Graph

20478 Commits

Author SHA1 Message Date
manuel 00b5fc0a2c Added helps
Former-commit-id: 54292202ea50b6a15c909875853b52fe2f1a045a
2019-05-06 16:59:31 +02:00
manuel b1dd6edc64 Added changes in helps
Former-commit-id: e63717665df7be9e2f00b5492ef77c8e93a4e9a4
2019-04-30 12:28:11 +02:00
manuel 7045e59e87 Added changes in helps
Former-commit-id: 863eec78c48a3a29b62326dc7ef2609b2990819c
2019-04-30 10:44:53 +02:00
manuel 6bd8221bc0 changed helps
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +02:00
Daniel Barbero Martin ac41e9255f helpers
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
fbsanchez ad4fc07492 Merge branch 'fix/discovery' into 'develop'
minor fix in task description (Discovery.cloud.aws.rds)

See merge request artica/pandorafms!2380

Former-commit-id: 129790601ed4f5b8ac70851d4da8aa2b4f29dc78
2019-04-24 13:35:24 +02:00
fbsanchez fc40518e65 minor fix in task description (Discovery.cloud.aws.rds)
Former-commit-id: 1c32a684edddc17eef5a4bb5260a148632767efb
2019-04-24 13:29:18 +02:00
Alejandro Fraguas cec4bb49ff Merge branch 'ent-3705-borrado-completo-de-la-carpeta-colecciones-nodo-metaconsola' into 'develop'
Fixed filemanager uploading on meta

See merge request artica/pandorafms!2377

Former-commit-id: 847cb1daefac473ab92d3e326257428e8cd9880a
2019-04-24 12:58:17 +02:00
Luis Calvo a5e80f5070 Fixed filemanager uploading on meta
Former-commit-id: e3c4b6150e70c589763a50a7e3bac6175997dd17
2019-04-24 11:12:26 +02:00
fbsanchez 273a475238 Merge branch 'fix/discovery' into 'develop'
Updated discovery task selector

See merge request artica/pandorafms!2375

Former-commit-id: b9a2a048179cb9d98664136b4b2d4974718426ec
2019-04-24 10:15:28 +02:00
artica 8bba24e13a Updated version and build strings.
Former-commit-id: 2a7a7c9475be0dc4d62e7d7471ed892bc5adecf4
2019-04-24 10:14:40 +02:00
fbsanchez f116bfc3fd Updated discovery task selector
Former-commit-id: dc692cd11f2bd81dcb7d4dea57954d77562ef561
2019-04-24 10:10:08 +02:00
artica 4a699c2b75 Auto-updated build strings.
Former-commit-id: d9c3cbb3cf9ddbd4d847aed58c79a3c8d795d7a5
2019-04-24 00:01:09 +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
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
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
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
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
artica 8bf92720ee Auto-updated build strings.
Former-commit-id: 544097161030608395112a142ed341e26700a678
2019-04-16 00:01:30 +02:00
Daniel Rodriguez 7c8b1fcf27 Merge branch 'ent-3625-Aviso-No-acceso-a-página' into 'develop'
Ent 3625 aviso no acceso a página

See merge request artica/pandorafms!2357

Former-commit-id: 7e4824a223e85f73b02bf6b85c37a83dc137979b
2019-04-15 18:32:54 +02:00
Ramon Novoa c971191477 Do not get stuck trying to send buffered XML files to a secondary server.
Ref pandora_enterprise#3379


Former-commit-id: 7f7a1ca5958cd8959516de5f46737d7b88074dd0
2019-04-15 16:22:14 +02:00
Tatiana Llorente 29c282dc79 Changed popup no access - #3625
Former-commit-id: 0798f53d9074a580309aeb9f9577ec518efd9264
2019-04-15 14:42:58 +02:00