a03245a277
Visual Console Refactor: fixed the visual console background on the meta
...
Former-commit-id: 2c5ba2451691558502c0aab4f5bb91259afb2ef8
2019-04-22 09:40:08 +02:00
0911a00fe9
Visual Console Refactor: fixes
...
Former-commit-id: b180de5a6a105aa627f15895dc7890a294110db3
2019-04-17 13:50:53 +02:00
cbf921ba25
Visual Console Refactor: bugfixes
...
Former-commit-id: fc04eb9c6e6df024859e2b13034188ddaf1528ed
2019-04-17 12:32:08 +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
2bd88e858d
Merge remote-tracking branch 'origin/develop' into visual-console-refactor
...
Former-commit-id: 87f11087d0ce33be0be009d8e4e88ca525204350
2019-04-12 14:28:20 +02:00
2bf49e43cc
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: c409495771d58549575f68c52da38d2510f4f653
2019-04-12 14:24:49 +02:00
a82143d72b
Visual Console Refactor: improved the refresh management
...
Former-commit-id: d69eccbb2e06dfe70823d1bb1485f349a23089fe
2019-04-12 14:23:33 +02:00
3ae6423fc9
Add ACL for item vc
...
Former-commit-id: 7356f08a79378ada1df07ead930fcc01b84ba79c
2019-04-12 13:59:19 +02:00
e6741067ff
Visual Console Refactor: fixed the tab links from the main view
...
Former-commit-id: e3993cedba972d4c163f2eec7228f8748a137cec
2019-04-12 13:23:38 +02:00
0fe9c57e51
Visual Console Refactor: now the public view is updated on VC update
...
Former-commit-id: 9382876893e56f893d92636742905e171766b060
2019-04-12 13:17:33 +02:00
75d0e11dac
Visual Console Refactor: fixed some image urls to load them from the public view
...
Former-commit-id: 833a5529304b343ac22a0d054ced47d48667c306
2019-04-12 13:03:10 +02:00
3cda4523b4
Visual Console Refactor: now the rest of the view changes when the VC is udpated
...
Former-commit-id: c2972fa2b6a9177e6ce46efd36e122033fb109c4
2019-04-12 12:44:45 +02:00
26d5060232
fixed errors css
...
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
2019-04-12 10:10:04 +02:00
5d154eee04
Visual Console Refactor: minor fixes
...
Former-commit-id: 9959423e5556abe8f3fa2cbcd289a7ca1b5367bd
2019-04-12 10:06:53 +02:00
08ffb3cd2f
Visual Console Refactor: fixes
...
Former-commit-id: 69203c99cd2890830f13fe135a44872f3b19faab
2019-04-12 09:51:53 +02:00
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
3928a5a523
Visual Console Refactor: added the initial version of the background updates
...
Former-commit-id: 6c859ebebf4882b3e48e9ec5f99570687ec31117
2019-04-11 10:05:28 +02:00
52007832d8
removed refr in view and public_view
...
Former-commit-id: fbefbf31bcdb0686890077a85dc1e3a032c84b4d
2019-04-10 15:02:37 +02:00
00dbb83cfe
Visual Console Refactor: minor fixes
...
Former-commit-id: e1562bc91ab07db21ae41c4eed6bb8bea0990d62
2019-04-10 11:54:01 +02:00
0769c61b19
add map user edit
...
Former-commit-id: 0adbeea2f272233a9bd105bbb3d7d02ea3759ad7
2019-04-09 18:18:10 +02:00
aa01789b19
Added public_view
...
Former-commit-id: 15e3f67b28771eb56cd61bff56d1f09a4b3eec78
2019-04-09 17:45:21 +02:00
0e74c8f894
Visual Console Refactor: simplified code
...
Former-commit-id: 5b2f2e91733b99f8c5f18a8e34b7cec18101c242
2019-04-09 16:36:31 +02:00
c57b2b7611
Fixed item position and changed visual_console_view name
...
Former-commit-id: 985ca0cf474667284d60a025ffe1e4c0aa2e7d5a
2019-04-09 15:53:22 +02:00
cb2be4cd6f
Added DonutGraph
...
Former-commit-id: 09b54770531c96a6f5c504f06caaefc10463bba9
2019-04-08 16:21:26 +02:00
4c8736c3a1
Visual Console Refactor: refactored the visual console view
...
Former-commit-id: dbbed082521ea878edd4765971f058733f691c51
2019-04-08 10:31:04 +02:00
633ccc5f10
Update visual console view
...
Former-commit-id: f9d78c01055c88b2e2de62e5b14f3c17e116b155
2019-04-05 14:51:28 +02:00
faecabb1cc
Fixed problem with openlayer
...
Former-commit-id: 91eb396d550cd6a90c9c3ba4cbb0ec12c2c51c6e
2019-04-03 12:54:36 +02:00
db30a8650e
Added visual_console_view
...
Former-commit-id: a121bb8ee6fe338561fcf7efda289727e1ba7afe
2019-04-03 10:08:01 +02:00
59300bd757
Changed field for last contact to timestamp
...
Former-commit-id: 41678b6c2541a05a92bcb4631eff00e6b60d5660
2019-03-29 13:24:22 +01:00
b2f046e4d6
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/include/class/ConsoleSupervisor.php
pandora_console/include/class/NetworkMap.class.php
pandora_console/include/styles/pandora.css
pandora_console/operation/menu.php
Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
2019-03-27 12:11:23 +01:00
ba0ddfb826
style revission
...
Former-commit-id: d223662de64194115cf56264ceda987e732eb79a
2019-03-26 19:29:48 +01:00
ee6ab43a8c
minor fix
...
Former-commit-id: e1a238bd34f4264e6be9c8a826cc1057578dd0a7
2019-03-26 16:54:11 +01:00
2d1463ee0c
minor fixes networkmaps
...
Former-commit-id: 85dda0470280e1f0cf142f7393f1492c61f42c6b
2019-03-26 16:46:32 +01:00
f2e710907a
Normalized network/netflow interval-start ddate switch
...
Former-commit-id: 2cce98339fbcca9e7ef6bf29e7ace2d81c5ff525
2019-03-26 15:01:56 +01:00
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
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
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
c942242652
Changed map image size
...
Former-commit-id: 8e3757addb1c81bc4a5cdcff0fb45e396626d6b8
2019-03-25 17:59:02 +01:00
85474c6037
[Network usage map] Minor changes
...
Former-commit-id: 0dcbfaa911fad7d6ca6179689695d6829fd3822d
2019-03-25 16:40:07 +01:00
4a201bc74b
[Network usage map] Fixed menus and added header.
...
Former-commit-id: 1cdfc4f7f388f0705b32a362ce8c5f3ac1fb49b2
2019-03-25 16:00:57 +01:00
74e86768f8
Fixed no data message
...
Former-commit-id: 46b0c055d05a4c3309840fdb0eb697d78f1f6acd
2019-03-25 14:56:42 +01:00
d37acbb159
[Netflow usage map] Added data to show
...
Former-commit-id: ca4db091b4c0f40061b9f7b8f13c4fe915ce022e
2019-03-25 13:10:47 +01:00
4ea17bb0c6
fixed reload page twice
...
Former-commit-id: 5944f47d1e0d2e5997deb6afcab6744a514216f7
2019-03-25 12:53:50 +01:00
eba858d6c1
[Network usage map] Fixed timepickers
...
Former-commit-id: d5803cea0443eae7a0dca2846dfba199a5e35f3c
2019-03-25 12:32:39 +01:00
ddc01f9a4e
Added data from NTA to networl_usage_map
...
Former-commit-id: 9f6192faa1698959ce1ba44e13b974b8470a6a3c
2019-03-25 12:30:51 +01:00
6a1bf2fbce
Added first version of live map
...
Former-commit-id: c440a0d0785d83c17560438986b7b394223e4779
2019-03-25 11:34:03 +01:00
040f942c9f
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 9affd1c5f658a8c24c92f7e3b9868fc35868bd32
2019-03-25 10:29:49 +01:00
5411eb9d17
Merge branch 'ent-3735-Buguete-filtrado-de-eventos-por-grupo' into 'develop'
...
fix bug in event filter by group when not using secondary groups
See merge request artica/pandorafms!2276
Former-commit-id: e414c5033fbcde1d97a28190170454080531ef34
2019-03-25 10:22:45 +01:00
2711eb59ea
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395
2019-03-25 09:20:06 +01:00
83a80b6aa2
minor fix
...
Former-commit-id: 0d68f24c418109858469dce32fb1cfd79e585775
2019-03-22 19:28:32 +01:00
Alejandro Gallardo Escobar
Daniel Barbero Martin
Tatiana Llorente
Daniel Maya
Luis Calvo
fermin831
fbsanchez
Daniel Rodriguez
Alejandro Fraguas