Commit Graph

20450 Commits

Author SHA1 Message Date
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 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
fbsanchez 072fec3dd1 removed map link from mysql/oracle/RDS discovery tasks
Former-commit-id: c01ca25dbe4ca16265a6377d80f60f6d603b7664
2019-04-15 13:03:11 +02:00
fbsanchez 6648e0268a removed reconview link from menu
Former-commit-id: 41b80e4eaa41617982c91a218aee3902b76e4fde
2019-04-15 12:54:22 +02:00
vgilc f3590e1d54 Merge branch 'ent-3792_spec_console_enterprise_for_rhel7' into 'develop'
fixed minor bug in the open spec

See merge request artica/pandorafms!2356

Former-commit-id: e5a73f169ba8044a94b25b27d99cf384785221e5
2019-04-15 11:33:42 +02:00
Daniel Rodriguez 3e15b77095 Merge branch 'ent-3790-sobra-una-columna-de-tnetflow_filter' into 'develop'
Ent 3790 sobra una columna de tnetflow filter

See merge request artica/pandorafms!2313

Former-commit-id: 31e8399658450e3f0ac4bd591f7eee631b3ba937
2019-04-15 11:22:28 +02:00
Rafael Ameijeiras eca7f6e53a fixed minor bug in the open spec
Former-commit-id: 0d8aacf0d4e7ae6199d103e62b6a6a8891c3a0f2
2019-04-15 11:20:57 +02:00
Marcos Alconada d3d5312f40 Update 27.sql
Former-commit-id: 4e027274bb9edeb51dc64f935ddd3ee2bfd62d0d
2019-04-15 11:14:41 +02:00
artica 68258661b1 Auto-updated build strings.
Former-commit-id: a45bf5f65399be38165be423f0b40a40e4468522
2019-04-15 00:01:24 +02:00
artica d0f6726d00 Auto-updated build strings.
Former-commit-id: b06d9487fb226c80a72020082f0b33ee2af854f7
2019-04-14 00:01:23 +02:00
artica ef0f7cded8 Auto-updated build strings.
Former-commit-id: c9f4339d4c39a14d446e1a3ea42c28d68398670d
2019-04-13 00:01:31 +02:00
fbsanchez 8bdc980ab0 minor fix
Former-commit-id: 4222b217953e88da43d0f50d3217a065dbb13332
2019-04-12 23:47:21 +02:00
fbsanchez 5d176bb61f Merge branch 'ent-3792-spec_console_enterprise_for_rhel7' into 'develop'
spec console open and build_rpm for rhel7

See merge request artica/pandorafms!2355

Former-commit-id: d40cbedb10b628adc8c710c2b37d0eaf64657af6
2019-04-12 19:24:54 +02:00
fbsanchez 45c9f6d51c Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 4c13aa9288330584db108ab04fd9ac096b2714ce
2019-04-12 19:24:27 +02:00
fbsanchez fa6529b652 Merge remote-tracking branch 'origin/develop' into ent-3792-spec_console_enterprise_for_rhel7
Former-commit-id: 8c7e1f5f4aad250e01931a420f8da8819817152f
2019-04-12 19:18:15 +02:00
Tatiana Llorente 6a9c972ed6 Changed popup no access - #3625
Former-commit-id: c58c9f47bab666985ed4cfe0c9c5edf1ed057e76
2019-04-12 13:54:48 +02:00
Daniel Rodriguez 9da83faade Merge branch 'ent-3806-Nuevo_mapa_Edicion_usuario' into 'develop'
add map user edit

See merge request artica/pandorafms!2349

Former-commit-id: 921eb0faff704e17f26024ab2add32f53e151df7
2019-04-12 13:11:27 +02:00
Daniel Rodriguez a792128906 Merge branch 'ent-3522-Conservar-perfiles-de-usuarios-standard-en-caso-de-cambio-LDAP/AD' into 'develop'
Added token save profile user

See merge request artica/pandorafms!2343

Former-commit-id: f6558be197626904837589df0a7559df60b2ef3e
2019-04-12 12:53:20 +02:00
Tatiana Llorente b50ed1c810 New arrow and timestamp images - #3707
Former-commit-id: 908928e47d7e635eee1e18925b176835f8e9c928
2019-04-12 10:41:55 +02:00
marcos.alconada 1b5786aedb Merge remote-tracking branch 'origin/develop' into ent-3790-sobra-una-columna-de-tnetflow_filter
Former-commit-id: 652770c2bad08caef82584fc440736ee36abd03d
2019-04-12 10:32:07 +02:00
Daniel Barbero Martin 26d5060232 fixed errors css
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
2019-04-12 10:10:04 +02:00
manuel 61552bc201 Fixed ldap login
Former-commit-id: bd94a6112a88b3143973ab7f915de40995149ca8
2019-04-12 10:03:18 +02:00
Tatiana Llorente 59c2734b5a Deleted old files. Centered the map. Fixed broken image in meta. - #3806
Former-commit-id: 30ebc8e1afeb3401011ee359ecd8626436d85fb7
2019-04-12 09:20:55 +02:00
artica f5088299f3 Auto-updated build strings.
Former-commit-id: 3e8354494b7250c6bdcefbe8a961411bdfe5180a
2019-04-12 00:01:24 +02:00
fbsanchez e80649073f Minor fixes
Former-commit-id: 71698d61db59e7f94fb8c770715decb0fe6e5f0f
2019-04-11 15:36:55 +02:00
fbsanchez 342e4b78c9 Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 3640f0730c8f44cfe865b5a2947b8d0ee5c56ad0
2019-04-11 15:12:46 +02:00
fbsanchez e998c8dd70 Discovery RDS
Former-commit-id: e03d600b06fec25fb5808b9425cc94832d9d1268
2019-04-11 15:05:03 +02:00
Rafael Ameijeiras c91893c948 spec console open and build_rpm for rhel7
Former-commit-id: 324d90d95ea5757285e64ba3e28346ef007a815f
2019-04-11 13:45:57 +02:00
Tatiana Llorente c33a2cfaf6 Change arrow images to sort the table in custom reports - #3707
Former-commit-id: 62613d1c4e41fff93217ddb111c3b8c7ddc08ff4
2019-04-11 10:26:26 +02:00