tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,997 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

19997 Commits

Author SHA1 Message Date
fbsanchez 1b99c5db49 WIP netclass editor 
Former-commit-id: 2c7dffb63e4f9c587c3cdcbf8f87f134a82c1299
 2019-03-19 20:43:08 +01:00
fbsanchez 97b53db82b wip relationships 
Former-commit-id: 7f582f8c0197f488438226120eaea4c4dcc1646e
 2019-03-18 18:11:54 +01:00
fbsanchez 1ddeda295c WIP networkmap class 
Former-commit-id: fbd4ed5e5784c510bc1ea66f1627e61fa176573c
 2019-03-17 01:39:56 +01:00
fbsanchez fe045962e7 wip generate_dot 
Former-commit-id: f41d5a55ec9cd8f27124d6697e92c5fb3009a2d2
 2019-03-15 20:44:57 +01:00
Daniel Barbero 7e345035e1 add height and round border in d3 graph progress 
Former-commit-id: 8eacfe068c1ae744fd04a752f65ed44f747d6158
 2019-03-15 10:22:55 +01:00
Daniel Barbero 0593e72f3e move custom net scan and script to OPEN 
Former-commit-id: ad30ba98670d23ff895b95beb9f58d1105473e3d
 2019-03-15 09:11:18 +01:00
fbsanchez 8c8f368993 WIP: NetworkMaps rebuild 
Former-commit-id: d3ca9d0de1b718a35bbc4aae80982b2c4705a454
 2019-03-14 18:51:48 +01:00
fbsanchez 99b1aadacb discovery icon set 
Former-commit-id: d88ba9c57d7a4c590e7a6965b2a4a9f7fd473790
 2019-03-14 17:21:16 +01:00
fbsanchez f4290e52fe Minor fix notif. ball margins 
Former-commit-id: 36705558ac7b2ef94115068acb0bce01662b8ecc
 2019-03-13 15:55:24 +01:00
fbsanchez f5b0e6b1a4 minor fix radial redirection 
Former-commit-id: 0676ff2eb51a7ea281eb1410b1e5c4082c39d074
 2019-03-13 12:55:24 +01:00
fbsanchez 95c61024f7 Cleanup Networkmaps 
Former-commit-id: 68893c73092e80bf4a67a0aa82c51ec242aab01f
 2019-03-13 11:38:03 +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
artica 99afea22cb Auto-updated build strings. 
Former-commit-id: 9d92b8845f144366f2d7ed521fefbea0ce7e8eac
 2019-03-13 00:01:24 +01:00
fbsanchez e61d409acc fix in redirection after map creation 
Former-commit-id: dbe1a326942df79f77d8973e8a83781778fa59b0
 2019-03-12 19:23:40 +01:00
fbsanchez bf9b84f266 discarded ranksep var as recommended edge len 
Former-commit-id: 24fe2b0f7ff49b9bdf4e4ef6463ddf5f66de04d8
 2019-03-12 18:38:58 +01:00
fbsanchez 663c1e0841 NetworkMap class rc1 
Former-commit-id: 871da4e80cd5909f6bb1da567e3fbe55709690a5
 2019-03-12 18:32:55 +01:00
fbsanchez 1bc326c00c WIP: NetworkMap class 
Former-commit-id: 888621c19262397298ac934e26e55a0b0ab218ec
 2019-03-12 18:17:18 +01:00
Alejandro Fraguas cb1fc5dc67 Merge branch 'ent-3616-Pantalla-de-login' into 'develop' 
Ent 3616 pantalla de login

See merge request artica/pandorafms!2248

Former-commit-id: c6e02af2b50a12933ec31cd5496fafb10a646c7a
 2019-03-12 17:23:04 +01:00
fbsanchez c91c79a735 WIP experiments with graphviz 
Former-commit-id: cee005851cd7ed05aa43fd3037c5c7d743d06fa7
 2019-03-12 16:52:42 +01:00
fbsanchez 06f8aae91a WIP NetworkMap class 
Former-commit-id: 575e0b5d078d01ac82ce313eda57084441fb4301
 2019-03-12 16:22:28 +01:00
Daniel Rodriguez d314062623 Merge branch 'ent-2674-Nueva_macro_event_timestamp' into 'develop' 
Ent 2674 nueva macro event timestamp

See merge request artica/pandorafms!2244

Former-commit-id: 9414e607f69637c19a5d8e61e80a2d43abb9ce0b
 2019-03-12 13:51:47 +01:00
Alejandro Fraguas dbf0229ce0 Merge branch 'ent-3084-Warnings_en_PHP_7' into 'develop' 
fixed warnings php

See merge request artica/pandorafms!2197

Former-commit-id: 486796c729a540e5ce75de80914a94dc3c1170ca
 2019-03-12 13:24:48 +01:00
Daniel Rodriguez e55d7f0042 Merge branch '3547-7561-al-pinchar-en-un-icono-enlazado-a-un-monitor-no-aparece-en-la-busqueda-por-defecto-hasta-que-no-le-damos-a-buscar' into 'develop' 
3547 7561 al pinchar en un icono enlazado a un monitor no aparece en la busqueda por defecto hasta que no le damos a buscar

See merge request artica/pandorafms!2192

Former-commit-id: 38c35e89b2af8f4c72b912afcbd77f4d08a3951d
 2019-03-12 13:18:10 +01:00
daniel 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
marcos.alconada 5227390c87 se elimina linea de autosearch = false 
Former-commit-id: aab03c4e38d41b098a8af818b45036f6524580de
 2019-03-12 13:06:27 +01:00
fbsanchez d7983bec4e WIP NetworkMap class 
Former-commit-id: ae987e5f6f3ec0997746093d20f7dbd5758c9ff1
 2019-03-12 12:05:54 +01:00
Alejandro Fraguas 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
Tatiana Llorente 29f00dd1da New login page 
Former-commit-id: ae1cc9368536c6a9fbcea12ec2aa1d6b7584268a
 2019-03-12 11:09:12 +01:00
fbsanchez c6fa365b90 minor fix force discovery console task 
Former-commit-id: be2a85079f51fca0222ac25f2f93ad5a14f3542d
 2019-03-12 10:47:28 +01:00
fbsanchez e5190a91ee WIP NetworkMap class 
Former-commit-id: 90763db5291c638e89216da48e1fc4fdba92bc82
 2019-03-12 10:29:35 +01:00
fbsanchez 0ad8a0383f WIP NetworkMap class 
Former-commit-id: f2594c8388e4cb235e39f08945ad064e999cfbcb
 2019-03-12 10:29:19 +01:00
artica 67080c72d9 Auto-updated build strings. 
Former-commit-id: d5c1d195e9648fa5b091c533b57a6e234275787c
 2019-03-12 00:01:23 +01:00
fbsanchez 1d660d259f WIP NetworkMap class 
Former-commit-id: 6694ee84fe5e9dc783010a3092753b4041370993
 2019-03-11 20:10:08 +01:00
fbsanchez e672456998 fixes satellite contact interval detector 
Former-commit-id: b3536e29fd7ae1330667eee7bf98a55ef3f65e4b
 2019-03-11 18:04:23 +01:00
samucarc 5b3dd6121b Fixed error in event filters when is only new events 
Former-commit-id: a1e0529b58e4a1c62c8c35cba7b133c218f59a93
 2019-03-11 17:14:26 +01:00
Daniel Rodriguez 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
Daniel Maya ccb41f1b68 Fixed z_dash(zoom) in networkmap 
Former-commit-id: 2d19cd9234717cd5066d2ddd7094d367262ed1c4
 2019-03-11 16:57:54 +01:00
fbsanchez 5f7680f4ee WIP NetworkMap class 
Former-commit-id: 0380bec0023a1c6a5eb3f902ed66738c1d297754
 2019-03-11 15:40:44 +01:00
fbsanchez 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
fbsanchez 2188caaec2 WIP NetworkMap class 
Former-commit-id: 5af817aef635798f1ebdfcf596f30939b327e2a7
 2019-03-11 15:37:08 +01:00
Daniel Maya 9db8078e72 Fixed first painted map 
Former-commit-id: 8f1098e312b4524568501a25642a533615e899f9
 2019-03-11 15:18:09 +01:00
fbsanchez 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
fbsanchez c8bad2b68a WIP NetworkMap class 
Former-commit-id: e6918056fa9d71d33cc3b06e3c265dc3856e45af
 2019-03-11 15:10:22 +01:00
fbsanchez fcab1ae612 WIP NetworkMap class 
Former-commit-id: da5ce8681313cdf5c5a7ec7a005c3ebd273fea43
 2019-03-11 15:09:31 +01:00
Daniel Rodriguez 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
Alejandro Fraguas 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
Luis Calvo 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
alejandro-campos 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
manuel 8f9beccf76 Fixed url 
Former-commit-id: 7bed92d53f59a0b01034d3630dcddce8a7bc5cfa
 2019-03-11 12:47:27 +01:00
Daniel Rodriguez 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