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 |
alejandro-campos
|
ec999341ba
|
change discovery headers and add breadcrumbs to them
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
|
2019-03-26 15:42:33 +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
|
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 |
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
|
c682e5f326
|
Remove new font in edit user
Former-commit-id: dc7da7f1fe9df0abacfb267fb7b5c6773f35df2c
|
2019-03-25 16:27:25 +01:00 |
|
Tatiana Llorente
|
a841472bff
|
Changes in header
Former-commit-id: 6ef8f7fc6513562e782e7d89dc5a13a4369480c4
|
2019-03-25 12:50:43 +01:00 |
|
Tatiana Llorente
|
fe7103ba9c
|
Changes in header
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
|
2019-03-25 12:41:39 +01:00 |
|
fermin831
|
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 |
|
fermin831
|
af9936c78f
|
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
pandora_console/install.php
Former-commit-id: 13c6146ea07be2c0d1bb571e70c644f1f68ae2bc
|
2019-03-21 13:26:55 +01:00 |
|
fbsanchez
|
6fb6963501
|
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 9df9a4c3a4a50e191af5167129df1352e712171e
|
2019-03-20 17:40:08 +01:00 |
|
Tatiana Llorente
|
5d409cd778
|
New view user edit
Former-commit-id: 551c2036cd69e34c66e12a8cbcef3345fbf3919a
|
2019-03-20 16:45:24 +01:00 |
|
Tatiana Llorente
|
d27c509817
|
Merge remote-tracking branch 'origin/develop' into ent-3610-Vista-Edicion-de-Usuario
Former-commit-id: fb1fffdf576bd46ba733717abf2425ee0e0d607c
|
2019-03-20 13:28:07 +01:00 |
|
Tatiana Llorente
|
a99c8b1a7b
|
New view user edit
Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54
|
2019-03-20 13:26:15 +01:00 |
Daniel Maya
|
c2033715a9
|
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: 4e097a7169f1ecb05c843076b67f98f0ea1370af
|
2019-03-18 09:06:20 +01:00 |
|
Daniel Maya
|
d13e7bbf44
|
new generic functions
Former-commit-id: 09352ca97ea73505acdb44d14cde79b0d916d286
|
2019-03-18 09:05:47 +01:00 |
Daniel Barbero
|
d5108efb0d
|
fixed error update manager delete files
Former-commit-id: 88b915f9278eba5949c867ae514a104ce796aec1
|
2019-03-15 12:19:02 +01:00 |
|
Daniel Barbero Martin
|
a1aa480421
|
add delete files in update manager
Former-commit-id: 880dfc8079e7e85fa1fcba4746927caf1a2d2c06
|
2019-03-14 18:04:28 +01:00 |
|
fermin831
|
b660da6e84
|
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/install.php
Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b
|
2019-03-14 10:49:16 +01:00 |
|
fbsanchez
|
f4290e52fe
|
Minor fix notif. ball margins
Former-commit-id: 36705558ac7b2ef94115068acb0bce01662b8ecc
|
2019-03-13 15:55:24 +01:00 |
|
fbsanchez
|
750c64fbd7
|
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
|
2019-03-13 09:52:00 +01:00 |
|
Tatiana Llorente
|
aaf5d7bf89
|
New view user edit
Former-commit-id: 3901480a6b4ca2d412a67f6adfe7adefd2558e6f
|
2019-03-12 12:24:33 +01:00 |
|
Tatiana Llorente
|
29f00dd1da
|
New login page
Former-commit-id: ae1cc9368536c6a9fbcea12ec2aa1d6b7584268a
|
2019-03-12 11:09:12 +01:00 |
|
Tatiana Llorente
|
c5722d2e10
|
New view user edit
Former-commit-id: 584df7ff9cca2b5898cdbcaec1d27ce8264a71cd
|
2019-03-12 10:59:44 +01:00 |
|
Tatiana Llorente
|
9a702a90a1
|
New view user edit
Former-commit-id: 8f7f0fd62174d4e3dfcbd7774aff8c409057680b
|
2019-03-12 08:56:45 +01:00 |
|
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 |
|
Tatiana Llorente
|
71afb7a741
|
New login page
Former-commit-id: 69408bda61a30561372a5ebaecc08fd04b434611
|
2019-03-11 10:07:22 +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 |
|
fbsanchez
|
3e39e727b6
|
WIP: Unified class NetworkMapClass
Former-commit-id: 6e6f4afb70be008602f51dfbd383bb855613e084
|
2019-03-07 18:57:48 +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 |
|
daniel
|
00283a5c6a
|
progress task list
Former-commit-id: 5b8a10cdc792e74538784ae27367bc1ca2c7bed0
|
2019-03-07 14:45:26 +01:00 |
|
fbsanchez
|
aef10cf649
|
Fixed grown in notifications
Former-commit-id: c563f2388d27d4fffbcfaf34fbd1c4d83ad4ef84
|
2019-03-06 19:39:07 +01:00 |
|
fbsanchez
|
40bc938000
|
notifications font color and some minor changes
Former-commit-id: d56c7ed04a10ef693867df7709002169f865bbc3
|
2019-03-06 16:38:06 +01:00 |
|
fbsanchez
|
825128e31e
|
WIP: minor updates in notification wrapper
Former-commit-id: 1dd6fcf1ca43cc9d3b0c633c7bd6487240c2b5bf
|
2019-03-05 19:10:44 +01:00 |
|
fbsanchez
|
63ee3b0329
|
wip: style checks
Former-commit-id: 527c939420f9790b7b0850a207dd5221721986fd
|
2019-03-05 19:02:23 +01:00 |
|
fbsanchez
|
70e4e86cdf
|
Merge remote-tracking branch 'origin/ent-3432-Nueva-cabecera-y-menu-lateral' into ent-3595-discovery-fase-2
Former-commit-id: ba98fda78052b11f7bb579cf84d5e29e557e68ac
|
2019-03-05 18:58:26 +01:00 |
|
Daniel Maya
|
e26c81aa6c
|
Fixed images and reset map in networkmap
Former-commit-id: d56dc68d542aa1e4d30a3014acc53b44dc07191e
|
2019-03-05 15:33:27 +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 |