Alejandro Gallardo Escobar
|
2bd88e858d
|
Merge remote-tracking branch 'origin/develop' into visual-console-refactor
Former-commit-id: 87f11087d0ce33be0be009d8e4e88ca525204350
|
2019-04-12 14:28:20 +02:00 |
|
Alejandro Gallardo Escobar
|
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 |
|
Alejandro Gallardo Escobar
|
a82143d72b
|
Visual Console Refactor: improved the refresh management
Former-commit-id: d69eccbb2e06dfe70823d1bb1485f349a23089fe
|
2019-04-12 14:23:33 +02:00 |
|
Daniel Barbero Martin
|
3ae6423fc9
|
Add ACL for item vc
Former-commit-id: 7356f08a79378ada1df07ead930fcc01b84ba79c
|
2019-04-12 13:59:19 +02:00 |
|
Alejandro Gallardo Escobar
|
e6741067ff
|
Visual Console Refactor: fixed the tab links from the main view
Former-commit-id: e3993cedba972d4c163f2eec7228f8748a137cec
|
2019-04-12 13:23:38 +02:00 |
|
Alejandro Gallardo Escobar
|
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 |
|
Alejandro Gallardo Escobar
|
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 |
|
Alejandro Gallardo Escobar
|
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 |
|
marcos.alconada
|
ddfd3339ff
|
add api
Former-commit-id: 7704a1226754067aee849526329eebce372063a1
|
2019-04-12 11:39:34 +02:00 |
|
Daniel Barbero Martin
|
26d5060232
|
fixed errors css
Former-commit-id: eebae84a94b3c32350beb5cea4816b8fded28b32
|
2019-04-12 10:10:04 +02:00 |
|
Alejandro Gallardo Escobar
|
5d154eee04
|
Visual Console Refactor: minor fixes
Former-commit-id: 9959423e5556abe8f3fa2cbcd289a7ca1b5367bd
|
2019-04-12 10:06:53 +02:00 |
|
Alejandro Gallardo Escobar
|
08ffb3cd2f
|
Visual Console Refactor: fixes
Former-commit-id: 69203c99cd2890830f13fe135a44872f3b19faab
|
2019-04-12 09:51:53 +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 |
|
fermin831
|
153ba4279e
|
Added secondary groups in global search
Former-commit-id: a569f78754d1f683b1585c235f1f568425c83fad
|
2019-04-11 16:57:43 +02:00 |
|
Alejandro Gallardo Escobar
|
3928a5a523
|
Visual Console Refactor: added the initial version of the background updates
Former-commit-id: 6c859ebebf4882b3e48e9ec5f99570687ec31117
|
2019-04-11 10:05:28 +02:00 |
|
Daniel Maya
|
52007832d8
|
removed refr in view and public_view
Former-commit-id: fbefbf31bcdb0686890077a85dc1e3a032c84b4d
|
2019-04-10 15:02:37 +02:00 |
|
Alejandro Gallardo Escobar
|
00dbb83cfe
|
Visual Console Refactor: minor fixes
Former-commit-id: e1562bc91ab07db21ae41c4eed6bb8bea0990d62
|
2019-04-10 11:54:01 +02:00 |
|
Tatiana Llorente
|
2a37224653
|
New design for the tables - #3707
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
|
2019-04-10 10:06:27 +02:00 |
|
Daniel Barbero Martin
|
0769c61b19
|
add map user edit
Former-commit-id: 0adbeea2f272233a9bd105bbb3d7d02ea3759ad7
|
2019-04-09 18:18:10 +02:00 |
|
Daniel Maya
|
aa01789b19
|
Added public_view
Former-commit-id: 15e3f67b28771eb56cd61bff56d1f09a4b3eec78
|
2019-04-09 17:45:21 +02:00 |
|
Alejandro Gallardo Escobar
|
0e74c8f894
|
Visual Console Refactor: simplified code
Former-commit-id: 5b2f2e91733b99f8c5f18a8e34b7cec18101c242
|
2019-04-09 16:36:31 +02:00 |
|
Daniel Maya
|
c57b2b7611
|
Fixed item position and changed visual_console_view name
Former-commit-id: 985ca0cf474667284d60a025ffe1e4c0aa2e7d5a
|
2019-04-09 15:53:22 +02:00 |
|
Daniel Maya
|
cb2be4cd6f
|
Added DonutGraph
Former-commit-id: 09b54770531c96a6f5c504f06caaefc10463bba9
|
2019-04-08 16:21:26 +02:00 |
|
Alejandro Gallardo Escobar
|
4c8736c3a1
|
Visual Console Refactor: refactored the visual console view
Former-commit-id: dbbed082521ea878edd4765971f058733f691c51
|
2019-04-08 10:31:04 +02:00 |
|
Daniel Maya
|
633ccc5f10
|
Update visual console view
Former-commit-id: f9d78c01055c88b2e2de62e5b14f3c17e116b155
|
2019-04-05 14:51:28 +02:00 |
|
Tatiana Llorente
|
aa640efc44
|
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
Former-commit-id: 43e5f9f044a351f1c6cf1c192b9f92cba6d1b0b3
|
2019-04-05 13:19:42 +02:00 |
|
Tatiana Llorente
|
d91631e0e1
|
New design for the tables - #3707
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
|
2019-04-05 13:18:38 +02:00 |
|
Daniel Maya
|
faecabb1cc
|
Fixed problem with openlayer
Former-commit-id: 91eb396d550cd6a90c9c3ba4cbb0ec12c2c51c6e
|
2019-04-03 12:54:36 +02:00 |
|
Daniel Maya
|
db30a8650e
|
Added visual_console_view
Former-commit-id: a121bb8ee6fe338561fcf7efda289727e1ba7afe
|
2019-04-03 10:08:01 +02:00 |
|
Tatiana Llorente
|
f497d3bd2e
|
Added class to action buttons and moved checkbox to the left side
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
|
2019-04-02 13:42:30 +02:00 |
|
Luis Calvo
|
8b5744a6c1
|
Added unknown status image
Former-commit-id: 1b7da57a8f3f409902053a9e5c05edeb28b67033
|
2019-03-29 15:00:52 +01:00 |
|
Luis Calvo
|
59300bd757
|
Changed field for last contact to timestamp
Former-commit-id: 41678b6c2541a05a92bcb4631eff00e6b60d5660
|
2019-03-29 13:24:22 +01:00 |
|
Tatiana Llorente
|
26451c41a1
|
New design for the tables - #3707
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
|
2019-03-29 11:05:52 +01:00 |
|
Tatiana Llorente
|
34598f391b
|
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
|
2019-03-27 17:05:50 +01:00 |
|
Tatiana Llorente
|
845cb85c55
|
New design for tables - #3707
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
|
2019-03-27 17:03:55 +01:00 |
|
fermin831
|
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 |
|
fbsanchez
|
ba0ddfb826
|
style revission
Former-commit-id: d223662de64194115cf56264ceda987e732eb79a
|
2019-03-26 19:29:48 +01:00 |
|
fbsanchez
|
ee6ab43a8c
|
minor fix
Former-commit-id: e1a238bd34f4264e6be9c8a826cc1057578dd0a7
|
2019-03-26 16:54:11 +01:00 |
|
fbsanchez
|
2d1463ee0c
|
minor fixes networkmaps
Former-commit-id: 85dda0470280e1f0cf142f7393f1492c61f42c6b
|
2019-03-26 16:46:32 +01:00 |
|
marcos.alconada
|
94768935ee
|
Pending to review
Former-commit-id: c874be78a33585942c825f23b48010b2d604cd7c
|
2019-03-26 15:42:56 +01:00 |
|
fermin831
|
f2e710907a
|
Normalized network/netflow interval-start ddate switch
Former-commit-id: 2cce98339fbcca9e7ef6bf29e7ace2d81c5ff525
|
2019-03-26 15:01:56 +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 |
|
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 |
|
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 |
|
fermin831
|
85474c6037
|
[Network usage map] Minor changes
Former-commit-id: 0dcbfaa911fad7d6ca6179689695d6829fd3822d
|
2019-03-25 16:40:07 +01:00 |
|
fermin831
|
4a201bc74b
|
[Network usage map] Fixed menus and added header.
Former-commit-id: 1cdfc4f7f388f0705b32a362ce8c5f3ac1fb49b2
|
2019-03-25 16:00:57 +01:00 |
|
fermin831
|
74e86768f8
|
Fixed no data message
Former-commit-id: 46b0c055d05a4c3309840fdb0eb697d78f1f6acd
|
2019-03-25 14:56:42 +01:00 |
|
fermin831
|
d37acbb159
|
[Netflow usage map] Added data to show
Former-commit-id: ca4db091b4c0f40061b9f7b8f13c4fe915ce022e
|
2019-03-25 13:10:47 +01:00 |
|
Daniel Barbero Martin
|
4ea17bb0c6
|
fixed reload page twice
Former-commit-id: 5944f47d1e0d2e5997deb6afcab6744a514216f7
|
2019-03-25 12:53:50 +01:00 |
|