fermin831
|
a321a7465d
|
Merge branch 'ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
pandora_console/include/functions_netflow.php
pandora_console/operation/network/network_report.php
Former-commit-id: 4aa57202e051f4d9e8df95b000c54ac162021668
|
2019-03-11 13:19:17 +01:00 |
|
Fermin
|
dd8265f65e
|
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Former-commit-id: 65d43e483dc23616c44da3b26b73c94cbf10d3fe
|
2019-03-08 09:02:22 +01:00 |
|
fermin831
|
471770ec85
|
Reduced icon size on netflow explorer
Former-commit-id: 6d16a2583dcdbf62386b29662a914a538bae9275
|
2019-03-07 19:16:24 +01:00 |
|
fermin831
|
1f89cccbbe
|
Change item link filter by image filter in network/flow explorer
Former-commit-id: 521cca18646273361711e75ad85f64a9b9988046
|
2019-03-07 15:10:38 +01:00 |
Tatiana Llorente
|
7be5d3e9e0
|
new header and menu
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
|
2019-03-05 12:54:11 +01:00 |
|
Fermin
|
a01319464e
|
Added link with params html component and modify the network report
Former-commit-id: d95cfe164d67e70d5135feb68169bb825ee2d83a
|
2019-03-05 10:08:07 +01:00 |
|
Tatiana Llorente
|
36fa0fc41f
|
new header and menu
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
|
2019-03-04 08:39:56 +01:00 |
|
Tatiana Llorente
|
34eedc5330
|
new header and menu
Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45
|
2019-02-26 11:20:17 +01:00 |
|
Tatiana Llorente
|
3e87c8e931
|
new header and menu
Former-commit-id: 975b72219cb07e0d4f9b332607e554bd65ea7cc3
|
2019-02-26 10:43:59 +01:00 |
|
Tatiana Llorente
|
6ec148c59c
|
new header and menu
Former-commit-id: 4375597f0b77ccc577fa486c409e214a7ba00362
|
2019-02-25 12:28:41 +01:00 |
|
Tatiana Llorente
|
4c92375a58
|
new header and menu
Former-commit-id: 3509107664a968fc358a8bb3e662f27b26b10c73
|
2019-02-25 12:23:15 +01:00 |
|
Tatiana Llorente
|
526311d1c6
|
new header and menu
Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd
|
2019-02-25 11:54:46 +01:00 |
fbsanchez
|
8b5f50f883
|
Discovery minor fixes
Former-commit-id: 3914d7a99fb70d88c1a1f95d3c2aeb100f277266
|
2019-02-22 19:18:07 +01:00 |
|
fbsanchez
|
b1aa0fe2f2
|
Merge from develop
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
|
2019-02-22 12:30:27 +01:00 |
|
fbsanchez
|
4148387c50
|
Updates discovery
Former-commit-id: e99072a2b7a1ddd528698e12bdfe75b0b56ba25b
|
2019-02-21 13:05:48 +01:00 |
manuel
|
ad3e2b88bf
|
Minor fixes Wiz.Discovery
Former-commit-id: 750cd3ab1902ed3eda9806aa9b505d5e4a1175be
|
2019-02-21 11:19:38 +01:00 |
|
fbsanchez
|
08c6d782a4
|
Add menuentry discovery
Former-commit-id: bc40f0bda89947a88a912484642aa3c89ded64f8
|
2019-02-20 18:24:32 +01:00 |
|
fbsanchez
|
4834561e87
|
Wiz. minor fixes
Former-commit-id: b3963bf5994a8f9829922e0a1b0be3a20fc54fba
|
2019-02-20 14:38:00 +01:00 |
|
fbsanchez
|
a63e497497
|
Wiz. Added textarea input
Former-commit-id: 319ab37377e6649c1cd6c6adea1e956e934f2e23
|
2019-02-20 11:11:26 +01:00 |
|
manuel
|
ea70c0846c
|
Added href in wizard
Former-commit-id: 9b6b9e66d14257163f14bc904d5b13c6de9f9912
|
2019-02-19 16:34:11 +01:00 |
|
fbsanchez
|
85371424ee
|
Minor fixes and status check
Former-commit-id: 47a7e75579927c0ac109f303b77ebcc273334581
|
2019-02-19 11:13:07 +01:00 |
|
manuel
|
938408ada9
|
Added wizard
Former-commit-id: d47389f000b9295c21d9a56ed0138913d0045b76
|
2019-02-19 08:58:30 +01:00 |
|
fbsanchez
|
c49c8bc0b5
|
discovery minor style changes
Former-commit-id: ea572c9d797214cbfc6f1b9ff2025f0c4819b4ed
|
2019-02-15 18:44:59 +01:00 |
|
fbsanchez
|
5093094d7d
|
H&D tasklist and some visual changes
Former-commit-id: d9130ec520b0c23a9cf42ce62aae6c3d2432649b
|
2019-02-15 18:05:59 +01:00 |
|
manuel
|
32d34cd09b
|
Changed styles in host and devices
Former-commit-id: 743f203466e8e3745a33837054e5bc4faa69337c
|
2019-02-15 14:02:32 +01:00 |
|
fbsanchez
|
f777c59a83
|
WIP: H&D skel files css wiz&discov
Former-commit-id: e57758a9e77b19868262557d9e11a0ff7b38f02c
|
2019-02-15 10:00:23 +01:00 |
|
fbsanchez
|
7df9d4f78b
|
WIP: H&D merge
Former-commit-id: d53f7d5abed5cfc8d45e6a42bfd52089ff463ff3
|
2019-02-14 17:14:01 +01:00 |
|
fbsanchez
|
8acb658266
|
WIP: H&D
Former-commit-id: 7e74f1330b7e5cfdab3757ec62523942a1b4fe9f
|
2019-02-14 13:27:49 +01:00 |
Daniel Barbero
|
444b5c4bfd
|
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
Conflicts:
pandora_console/install.php
Former-commit-id: f26bcce527ebe225454700e8feca21610f91b20f
|
2019-02-14 07:51:53 +01:00 |
|
fbsanchez
|
5b4cadf138
|
minor style fix
Former-commit-id: ca2dcf89672832b7796c9b9cc555d36d9db503ec
|
2019-02-13 17:16:12 +01:00 |
|
fbsanchez
|
f75a292b34
|
minor fixes/updates in notifications UI
Former-commit-id: d4f5b7db1b5a6f0a023e33c4b8cd55db7765b11a
|
2019-02-13 16:40:37 +01:00 |
|
fermin831
|
855822f61e
|
Fixed arrow on notifications area
Former-commit-id: 6771d282bf7a6b5b9ddd0baec8a0a887f741d931
|
2019-02-13 12:44:30 +01:00 |
|
fermin831
|
fe50d6caff
|
Open toasts and messages into new window
Former-commit-id: ff3d565247225032219d4bbb5fa903bdae7730e8
|
2019-02-13 11:09:15 +01:00 |
|
fermin831
|
48724fe033
|
Added onclick to notification-item's
Former-commit-id: 2e4833686b08b104b11ba9023f6eca38e0ed6bd9
|
2019-02-12 16:46:21 +01:00 |
|
fermin831
|
cc2b2709f9
|
Show the notifications with AJAX
Former-commit-id: 73f407d13d3805dce879c1431311a4aaec00c152
|
2019-02-12 16:25:59 +01:00 |
|
fbsanchez
|
166c3bbe88
|
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora
Former-commit-id: d630994f964e43b28197f4d26469fa1484d08ac2
|
2019-02-12 12:41:11 +01:00 |
|
fbsanchez
|
42dc0c60be
|
supervisor
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
|
2019-02-12 11:41:21 +01:00 |
|
fbsanchez
|
851050f04e
|
message_edit.css added
Former-commit-id: f4e88b813dc1b39e50b0f997ace3768a10f406f1
|
2019-02-11 19:48:20 +01:00 |
|
fermin831
|
c355a581ff
|
Added toasts to notifications
Former-commit-id: 7429bf8d9c4f4e8bb16549172a59c33d22185821
|
2019-02-11 17:53:37 +01:00 |
|
daniel
|
4aae62ba36
|
Fixed error in reports
Former-commit-id: d3ad6cd8e1dd052fedc3dfe65bd5938537033f34
|
2019-02-11 17:05:05 +01:00 |
|
Fermin
|
d5d58e5b2b
|
Added outter shadow to notifications messages box
Former-commit-id: 1eed4b4f2ef7d58dbab73ccb2628bb0ef9ffc7ca
|
2019-02-08 18:53:28 +01:00 |
|
Fermin
|
0124bd0a17
|
Added real notifications (not AJAX jet)
Former-commit-id: 5d0dee32c4fb96ad8dcb4f3f70049e1d1c4936fc
|
2019-02-08 14:23:05 +01:00 |
|
daniel
|
16c742bd83
|
fixed report pdf
Former-commit-id: 442a90512fbb244154749ddefe0007cef65655c5
|
2019-02-08 14:10:19 +01:00 |
|
daniel
|
4d4b8bbc0d
|
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: 792472b0cc9b3f1ae56894c53407419c7fbd573e
|
2019-02-07 10:30:23 +01:00 |
|
Tatiana Llorente
|
4c2215a3db
|
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
Conflicts:
pandora_console/install.php
Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
|
2019-02-07 08:59:45 +01:00 |
Daniel Rodriguez
|
f098b72fe4
|
Merge branch 'ent-3274-Retoque-visual-vista-SNMP-interfaces' into 'develop'
Fixed height in slicesbar graph of table interface snmp - #3274
See merge request artica/pandorafms!2144
Former-commit-id: c4e83cd7a6525aae2a567a90b3fb7d4d1ebb70bf
|
2019-02-06 18:56:47 +01:00 |
|
fermin831
|
37d02ddf59
|
Added disabled status to switches
Former-commit-id: 7fee49f58e4be84bfb8bad08303b203d71dafe16
|
2019-02-06 18:18:48 +01:00 |
|
manuel.montes
|
d113bfbeb8
|
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: 57658aa74a36e6ca9bc53af58e3732e895cf977c
|
2019-02-06 17:02:58 +01:00 |
|
manuel.montes
|
dee7c769f2
|
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/godmode/setup/setup_auth.php
pandora_console/godmode/setup/setup_ehorus.php
pandora_console/godmode/setup/setup_general.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/styles/pandora.css
modificado: pandora_console/include/functions_html.php
Former-commit-id: feaf2f5d3defda182f9cdaf151854257aeba1b22
|
2019-02-06 16:11:46 +01:00 |
|
daniel
|
19c5a1c844
|
fixed error pdf
Former-commit-id: 2a81a654df0c216951c61f36ff31a05ce5f7e29a
|
2019-02-06 15:58:36 +01:00 |