Commit Graph

20607 Commits

Author SHA1 Message Date
Daniel Maya 64af349041 added class clock
Former-commit-id: ad23dd5fe0f6eb2251851cf794d0b1464d286ff5
2019-03-26 17:32:02 +01:00
fbsanchez 08a240746c breadcrum improvement discovery
Former-commit-id: af861b0601e50dbe45ed1cab77ce5ab6f26d3fad
2019-03-26 17:28:31 +01:00
Daniel Barbero Martin 19bf0ae940 Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: f1c63c2e0be43e9c01306375446fc1eaa3c039ef
2019-03-26 17:22:36 +01:00
Daniel Barbero Martin db39c3921b fixed minor error tasklist
Former-commit-id: 1ee10794b09e17c3b8403dfe5540195047595577
2019-03-26 17:22:14 +01:00
fbsanchez 3316d19bd3 minor fix
Former-commit-id: ff5da555c29cdde5d632e090f2b9ac779ead262f
2019-03-26 17:00:20 +01:00
fbsanchez ee6ab43a8c minor fix
Former-commit-id: e1a238bd34f4264e6be9c8a826cc1057578dd0a7
2019-03-26 16:54:11 +01:00
fbsanchez a76ad27825 minor fixes
Former-commit-id: f885316b4f063daac744ca458fa3d41a16d5d81b
2019-03-26 16:51:09 +01:00
fbsanchez 2d1463ee0c minor fixes networkmaps
Former-commit-id: 85dda0470280e1f0cf142f7393f1492c61f42c6b
2019-03-26 16:46:32 +01:00
Alejandro Gallardo Escobar e93cb8f9e7 Visual Console Refactor: removed a unused function
Former-commit-id: 786dac0e5ab299e91f5f645179c125f80332f17f
2019-03-26 16:36:44 +01:00
fbsanchez 511295f1c6 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: f43d6ace220a8058f91d115386bdf56e59550cbe
2019-03-26 16:32:19 +01:00
alejandro-campos a0f4eb1910 change discovery page title
Former-commit-id: 81bf2dc3d489acc1871f6c4cd385fc0f1c1b43aa
2019-03-26 16:10:03 +01:00
alejandro-campos 0d8322aeda Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: a9ac8888641116a4e98fbe7ac2d99901e771f275
2019-03-26 15:42:47 +01:00
alejandro-campos ec999341ba change discovery headers and add breadcrumbs to them
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
2019-03-26 15:42:33 +01:00
Daniel Barbero Martin e3b0b7ad11 fixed update progress bars task for 3 second
Former-commit-id: 7558c33e8540007608f7afd97ebf03e193a08def
2019-03-26 15:38:47 +01:00
Ramon Novoa fa7cdc020b Add a countdown to license error messages.
Former-commit-id: bba7ccf777c05801731a790351dc9920b1546262
2019-03-26 15:32:57 +01:00
Ramon Novoa aa0ab53cf3 Clear license errors when logging in.
Former-commit-id: 1f68f190ebc84202b0e39b92c12d065f8b52543c
2019-03-26 15:31:51 +01:00
fermin831 f880d9202a Adde no popup configuration token to avoid to show tooltips
Former-commit-id: d5b6260a065b40dfbc498db077a610c35a9e0fb3
2019-03-26 15:27:45 +01:00
fermin831 f2e710907a Normalized network/netflow interval-start ddate switch
Former-commit-id: 2cce98339fbcca9e7ef6bf29e7ace2d81c5ff525
2019-03-26 15:01:56 +01:00
alejandro-campos d1bd5fbb1a Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: 914a944b96af8bceb26bbb89dbac25452097e20a
2019-03-26 13:06:12 +01:00
Alejandro Gallardo Escobar a79a401530 Visual Console Refactor: renamed a pair of directories
Former-commit-id: 50a02b73c368f9957dfdcbd6c9ca8bdfdd9e0175
2019-03-26 12:12:10 +01:00
fermin831 a7ff654826 Removed output in netflow filter
Former-commit-id: 4f2cfac6efe1482c86179601bac88826057e7d5c
2019-03-26 11:58:31 +01:00
Alejandro Gallardo Escobar c4f22e2015 Visual Console Refactor: added linked visual console capabilities to the group item
Former-commit-id: 4f314c53781cd478078198b99b4ea02943579fd0
2019-03-26 11:56:42 +01:00
Ramon Novoa c25143c27e Add a notification for 'limited mode'.
Former-commit-id: dce72c7a9ea452029e5650a2012ff35cc6eca9b8
2019-03-26 11:53:03 +01:00
Ramon Novoa d740b32810 Add support for DESTDIR.
Former-commit-id: 0252a660a3d8250657cd5f7b8fcfd620172c8a65
2019-03-26 11:47:20 +01:00
Ramon Novoa c1536b7978 Do not crash if an extension cannot be loaded.
Former-commit-id: f303be21ceabe052545e53e1a4b6bcd08a4526c2
2019-03-26 11:46:50 +01:00
Alejandro Gallardo Escobar ef1a1f1057 Visual Console Refactor: the model's JSON representation is now sorted alphabetically
Added the linked visual console capabilities to the Icon item


Former-commit-id: acda22da54a259404f201190af9e481262ddde03
2019-03-26 11:45:50 +01:00
samucarc 34b057befd Fixed errors in Diagnostic tool
Former-commit-id: a82e827df2266c0962df62ee44ad35dc1e0d04d6
2019-03-26 11:18:15 +01:00
fbsanchez d05b78520f minor style fix tasklist popup
Former-commit-id: 628e94f56a92558e3af648520ca13d4fb658d184
2019-03-26 11:09:17 +01:00
fbsanchez 174256ab70 minor approach csv report
Former-commit-id: a875a42dc53c85942dd8f80f0b5a0f788fb39ca5
2019-03-26 10:55:50 +01:00
Alejandro Gallardo Escobar 1517ec8d3c Visual Console Refactor: added fetching, extraction and validation for the linked agents, modules and visual consoles
Former-commit-id: fafc8c4a0e7306d918f22f1bdaea2e8ce147b31f
2019-03-26 10:12:43 +01:00
fermin831 a2f5b8502a Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/include/styles/pandora.css

Former-commit-id: ad45f5bd3f07d6ef7a6d8d6a291d6a2fd75fda78
2019-03-26 10:11:13 +01:00
Alejandro Gallardo Escobar b8eb44244f Visual Console Refactor: minor fixes
Former-commit-id: 2cacb9769708ccf4dce00d39300dfd510c0d1108
2019-03-26 09:59:32 +01:00
Alejandro Gallardo Escobar ecfba2e00c Merge branch 'ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual
Former-commit-id: e064684c8e12e7a9cf09fad9e56eccd4e52e6fe8
2019-03-26 09:49:34 +01:00
Alejandro Gallardo Escobar d6707d2747 Visual Console Refactor: minor name changes
Former-commit-id: 10973b070a566568dfc7f9236b184abee1f26c7a
2019-03-26 09:49:00 +01:00
Daniel Maya 7d66d0b0fe Fixed Group class (VisualConsole)
Former-commit-id: 6a241cdc76935f92f99b9cc31b66acd3082571ca
2019-03-26 09:48:50 +01:00
Daniel Rodriguez 5b0555e7cb Merge branch 'ent-3754-Ajustes-menú-lateral' into 'develop'
Ent 3754 ajustes menú lateral

See merge request artica/pandorafms!2291

Former-commit-id: 2cfa456d9e49aa262f08c690426bcbabb180392b
2019-03-26 09:42:29 +01:00
Daniel Rodriguez c3f7dd38d0 Merge branch 'ent-3342-SLA-status-transalation-error-fail' into 'develop'
Added translation files with string Fail

See merge request artica/pandorafms!2290

Former-commit-id: 0ba45f1aad523dcf45585a2bb44becd3e92b2747
2019-03-26 09:33:39 +01:00
fermin831 189d4864dc [Network usage map] Refactorized some code
Former-commit-id: 83fe7cedef01b4d4d38045b15c6b37ec936d5fb3
2019-03-26 09:10:28 +01:00
Daniel Maya 205c95bcb8 Added Group, Icon and line
Former-commit-id: d13c4cdfd03f299812c588aa41685296d35675f9
2019-03-26 08:46:29 +01:00
fermin831 58e74c1db1 Fixed minor warning
Former-commit-id: 38278d285faa6aea5f61d0933543b7e24926ae79
2019-03-26 08:40:22 +01:00
artica 90a2e28247 Auto-updated build strings.
Former-commit-id: b835fca52692b4696092f9cd5c5737705b7c8153
2019-03-26 00:01:25 +01:00
fbsanchez 4031ae9bf7 minor update in notification viewer
Former-commit-id: 990993ee0c2df7d9fb39a358b94c27b7df968426
2019-03-25 20:23:07 +01:00
fbsanchez 436e60c736 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 49dc95bbeca973fe13b0c82dc205778294c6066f
2019-03-25 20:14:24 +01:00
fbsanchez 3d0f25cd6e discovery task status overview
Former-commit-id: 5eeb3a3220c05f30f0559d50620aa29389fb145c
2019-03-25 20:00:05 +01:00
fbsanchez 6cc6f6f125 discovery task status overview
Former-commit-id: 329d03c109b9e09788302212752f372647b19c56
2019-03-25 19:58:01 +01:00
alejandro-campos 9947fb8f34 remove console.log
Former-commit-id: 12feadfc9094d8507e5e7df595e7667a67964362
2019-03-25 19:42:12 +01:00
alejandro-campos 079f578830 fix bad behavior of pandoras side menu on page load
Former-commit-id: b1d4eb3e2464fa441f16190d29b2d57cfaa9e3c5
2019-03-25 19:37:45 +01:00
Luis Calvo 5a38be13ea Added translation files with string Fail
Former-commit-id: a0176a1fd734b7bdc1d5ffa49d29c059eb96acda
2019-03-25 18:22:42 +01:00
Daniel Rodriguez dcf40fed3d Merge branch 'ent-3610-Vista-Edicion-de-Usuario' into 'develop'
Ent 3610 vista edicion de usuario

See merge request artica/pandorafms!2278

Former-commit-id: bf55b5206e79b5747b4215a05569b58ae70a35b0
2019-03-25 18:16:07 +01:00
Tatiana Llorente c942242652 Changed map image size
Former-commit-id: 8e3757addb1c81bc4a5cdcff0fb45e396626d6b8
2019-03-25 17:59:02 +01:00