15ca89068d
Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7
...
Conflicts:
pandora_console/godmode/servers/manage_recontask_form.php
pandora_console/include/functions_events.php
Former-commit-id: 7ea5c9dcc8efe112ea64e2fcb6eef9670c9af613
2019-03-12 13:07:12 +01:00
5227390c87
se elimina linea de autosearch = false
...
Former-commit-id: aab03c4e38d41b098a8af818b45036f6524580de
2019-03-12 13:06:27 +01:00
aaf5d7bf89
New view user edit
...
Former-commit-id: 3901480a6b4ca2d412a67f6adfe7adefd2558e6f
2019-03-12 12:24:33 +01:00
d7983bec4e
WIP NetworkMap class
...
Former-commit-id: ae987e5f6f3ec0997746093d20f7dbd5758c9ff1
2019-03-12 12:05:54 +01:00
60337b0da7
Merge branch 'ent-3559-Poner-evento-en-in-progress-provoca-un-fallo-de-visualizacion' into 'develop'
...
Fixed error in event filters when is only new events
See merge request artica/pandorafms!2252
Former-commit-id: 3dd94c18cf9c3896d7a1f95546c879de63c86fe8
2019-03-12 11:18:51 +01:00
29f00dd1da
New login page
...
Former-commit-id: ae1cc9368536c6a9fbcea12ec2aa1d6b7584268a
2019-03-12 11:09:12 +01:00
c5722d2e10
New view user edit
...
Former-commit-id: 584df7ff9cca2b5898cdbcaec1d27ce8264a71cd
2019-03-12 10:59:44 +01:00
c6fa365b90
minor fix force discovery console task
...
Former-commit-id: be2a85079f51fca0222ac25f2f93ad5a14f3542d
2019-03-12 10:47:28 +01:00
e5190a91ee
WIP NetworkMap class
...
Former-commit-id: 90763db5291c638e89216da48e1fc4fdba92bc82
2019-03-12 10:29:35 +01:00
0ad8a0383f
WIP NetworkMap class
...
Former-commit-id: f2594c8388e4cb235e39f08945ad064e999cfbcb
2019-03-12 10:29:19 +01:00
9a702a90a1
New view user edit
...
Former-commit-id: 8f7f0fd62174d4e3dfcbd7774aff8c409057680b
2019-03-12 08:56:45 +01:00
67080c72d9
Auto-updated build strings.
...
Former-commit-id: d5c1d195e9648fa5b091c533b57a6e234275787c
2019-03-12 00:01:23 +01:00
1d660d259f
WIP NetworkMap class
...
Former-commit-id: 6694ee84fe5e9dc783010a3092753b4041370993
2019-03-11 20:10:08 +01:00
3437994915
Fixed code style
...
Former-commit-id: 7422b647bb92ecc2d724aa71911a446aff058d3a
2019-03-11 19:36:49 +01:00
92d2e505ed
Added advanced filter on netflow live view
...
Former-commit-id: 13e2d3d26f6bb2c2f25900793464390997be4e41
2019-03-11 19:26:50 +01:00
e672456998
fixes satellite contact interval detector
...
Former-commit-id: b3536e29fd7ae1330667eee7bf98a55ef3f65e4b
2019-03-11 18:04:23 +01:00
8696bd9f91
Fixed CSV on network/netflow explorer
...
Former-commit-id: b111d5717ee66754ae15aa25c79464da92678174
2019-03-11 18:04:01 +01:00
7bf44b7c5b
Fixed styles
...
Former-commit-id: 6292bf0badc9175b6fb801b326e58ac475ae2bfb
2019-03-11 17:57:08 +01:00
4cc3eb13b9
Fixed order_by filter (some filter where lost)
...
Former-commit-id: 8f58c2615e5e8d5ba85908a888ec3dd2bcdf6f14
2019-03-11 17:53:21 +01:00
5b3dd6121b
Fixed error in event filters when is only new events
...
Former-commit-id: a1e0529b58e4a1c62c8c35cba7b133c218f59a93
2019-03-11 17:14:26 +01:00
80fb8679a3
Merge branch 'ent-3578-ACL-visual-consol-not-working-properly' into 'develop'
...
Ent 3578 acl visual consol not working properly
See merge request artica/pandorafms!2250
Former-commit-id: 66f3e799ed124327f73061962a40dd1f63174b21
2019-03-11 17:02:10 +01:00
ccb41f1b68
Fixed z_dash(zoom) in networkmap
...
Former-commit-id: 2d19cd9234717cd5066d2ddd7094d367262ed1c4
2019-03-11 16:57:54 +01:00
e0d41957f9
Netflow graphs display as stacked
...
Former-commit-id: 58bdd14900b5d6e36041417d31b242f31af9358b
2019-03-11 16:25:10 +01:00
5f7680f4ee
WIP NetworkMap class
...
Former-commit-id: 0380bec0023a1c6a5eb3f902ed66738c1d297754
2019-03-11 15:40:44 +01:00
81bc8daa73
Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: ad74ff783b7a5747a85057c73c04bca37a622109
2019-03-11 15:38:14 +01:00
2188caaec2
WIP NetworkMap class
...
Former-commit-id: 5af817aef635798f1ebdfcf596f30939b327e2a7
2019-03-11 15:37:08 +01:00
9db8078e72
Fixed first painted map
...
Former-commit-id: 8f1098e312b4524568501a25642a533615e899f9
2019-03-11 15:18:09 +01:00
0920328e0a
Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: 0064084ad35250594897ae6bb85a1b26c4dbfaa0
2019-03-11 15:10:26 +01:00
c8bad2b68a
WIP NetworkMap class
...
Former-commit-id: e6918056fa9d71d33cc3b06e3c265dc3856e45af
2019-03-11 15:10:22 +01:00
fcab1ae612
WIP NetworkMap class
...
Former-commit-id: da5ce8681313cdf5c5a7ec7a005c3ebd273fea43
2019-03-11 15:09:31 +01:00
935db452d2
Network report. Fixed some styles
...
Former-commit-id: 19a181044bae3f5bcec1f873e20ec50c41a73f00
2019-03-11 15:02:22 +01:00
3b2d72308e
Merge branch 'ent-1800-Cambiar-informacion-de-los-instaladores' into 'develop'
...
Changed Maintainer in pandorafms-agent-unix
See merge request artica/pandorafms!2228
Former-commit-id: 861dfec496f2040810d0962e03cca41b2f180462
2019-03-11 14:23:00 +01:00
9a7bdd76ba
Merge branch 'ent-3681-Recuperar-el-boton-de-lista-de-servidores-con-estado' into 'develop'
...
Added button servers list in header
See merge request artica/pandorafms!2249
Former-commit-id: 21b5bfef18b66b8124fe8d3c26709675ecb14857
2019-03-11 14:12:25 +01:00
f4208a35f2
Changede sec=reporting to sec=network on visual console link to another console
...
Former-commit-id: 5cbbae6f99993a7b250feea354eb197fe6355969
2019-03-11 13:25:28 +01:00
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
db2f23a9c2
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: d0a201e884ba53c33e83c10ff5e0bbe896d00ff5
2019-03-11 12:59:19 +01:00
8f9beccf76
Fixed url
...
Former-commit-id: 7bed92d53f59a0b01034d3630dcddce8a7bc5cfa
2019-03-11 12:47:27 +01:00
cfa2c08b16
Merge branch 'ent-3668-No-se-puede-subir-ficheros-en-colecciones' into 'develop'
...
fix bug in functions_filemanager
See merge request artica/pandorafms!2243
Former-commit-id: 8a00098cb8917cc309dc5fe3bc327e5c70f9417b
2019-03-11 12:37:23 +01:00
bf0e8633ff
Added button servers list in header
...
Former-commit-id: 96d9f7a49d617b0a9f04df601c41bbce71009e38
2019-03-11 12:36:52 +01:00
ae006026bf
Merge branch '3243-SNMP_Browser_Wizard_no_buscan_en_el_exec_server_solo_lo_hacen_en_local' into 'develop'
...
fixed error in snmp browser change server
See merge request artica/pandorafms!2236
Former-commit-id: a6a45ffe82e01f49139d80e09a954cceb245ce12
2019-03-11 11:54:58 +01:00
62c38173eb
Merge branch 'ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup' into 'develop'
...
Changed radio buttons by checkbox switch
See merge request artica/pandorafms!2235
Former-commit-id: 23face1e62093414afb9be18a4353eeab073105f
2019-03-11 11:18:10 +01:00
c6c04fd0c9
Merge remote-tracking branch 'origin/develop' into ent-3616-Pantalla-de-login
...
Former-commit-id: e3261f935989cbc06f503abe6d8b762cef1b78f0
2019-03-11 10:08:44 +01:00
71afb7a741
New login page
...
Former-commit-id: 69408bda61a30561372a5ebaecc08fd04b434611
2019-03-11 10:07:22 +01:00
b6bb7b2697
Merge remote-tracking branch 'origin/develop' into ent-3578-ACL-visual-consol-not-working-properly
...
Former-commit-id: ebd11459b73a64d43228e4d764fc5fc7585ae056
2019-03-11 09:47:24 +01:00
1acde54a3f
Merge branch 'develop' into ent-3543-Cambio-visual-de-radio-buttons-y-checkbox-en-el-setup
...
Conflicts:
pandora_console/install.php
Former-commit-id: 89c947d8a835c4a63a8f9a91df5542a3fbc230d9
2019-03-11 09:46:59 +01:00
ccb669a204
Fixed minor errors in setup_ehorus
...
Former-commit-id: ed0ba17641714a87446b4db88d933d7b176e531e
2019-03-11 09:37:08 +01:00
0210c2381d
Auto-updated build strings.
...
Former-commit-id: 7f83037f89edf17156828a793fa1ae3a5920d818
2019-03-11 00:01:58 +01:00
b79815bb06
Auto-updated build strings.
...
Former-commit-id: e002aa51a4e0ad634ed459dcccd4444cb1d0081c
2019-03-10 00:01:25 +01:00
fd68b49710
Auto-updated build strings.
...
Former-commit-id: 6b07eeeea7577d37282399b23c8b409ab7253507
2019-03-09 00:01:32 +01:00
75b92a57c4
Created function run_graphviz
...
Former-commit-id: 3baf21fc620a09518641d63b456c43de32e305ed
2019-03-08 14:12:58 +01:00
daniel
marcos.alconada
Tatiana Llorente
fbsanchez
Alejandro Fraguas
artica
fermin831
samucarc
Daniel Rodriguez
Daniel Maya
Luis Calvo
alejandro-campos
manuel