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

56 Commits

Author SHA1 Message Date
Tatiana Llorente af62bb1ae3 Fixed visual bug in discovery vmware - #4199 2019-06-12 16:47:53 +02:00
Tatiana Llorente 7d54a37e13 Fixed visual bug in discovery vmware - #4199 2019-06-12 16:44:09 +02:00
fbsanchez f0fb6d7fd9 wip styles 2019-05-27 18:03:56 +02:00
fbsanchez 7347324601 Minor fixes - discovery styles 2019-05-27 13:19:08 +02:00
alejandro-campos 0046e209fe lint changes 2019-05-17 14:46:19 +02:00
alejandro-campos a0b7164d9f lint changes 2019-05-17 14:20:01 +02:00
alejandro-campos 13b32003b3 save changes ticket 3937 
Former-commit-id: 264c0fed3ddcf7c34796af0a3c2bd4d48a6763bb
 2019-05-16 11:37:48 +02:00
marcos.alconada e543b64833 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 
Former-commit-id: dcf81c584d7d2dc8ee8def3e8786d7e67f92da46
 2019-04-24 16:20:42 +02:00
Daniel Rodriguez 50e994e065 Merge branch 'ent-bug-conflicto-con-simple-selects-con-atributo-size' into 'develop' 
change way to print discovery simple multiple inputs

See merge request artica/pandorafms!2378

Former-commit-id: a4de7318635a68d1c9c1343b3674a93581d5ce23
 2019-04-24 13:55:02 +02:00
alejandro-campos 7433d52130 change way to print discovery simple multiple inputs 
Former-commit-id: 845171053b2002d036f0f8992a2aacad4ec0a561
 2019-04-24 12:32:33 +02:00
Alejandro Fraguas 194f4400f7 Merge branch 'ent-3647-Revision-estilos-discovery-con-la-nueva-linea-de-estilos' into 'develop' 
Ent 3647 revision estilos discovery con la nueva linea de estilos

See merge request artica/pandorafms!2370

Former-commit-id: 0f46544f8b05ee464c4dd85301f7a23a4067267a
 2019-04-23 17:48:00 +02:00
alejandro-campos 4f6a81dc5b visual changes to discovery 
Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
 2019-04-22 17:46:04 +02:00
fbsanchez ca05867e55 Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3 
Former-commit-id: 3b243ec4bd93ba4cb494f0ea1a53043cc8e890c6
 2019-04-22 13:23:58 +02:00
fbsanchez e9af2b6a1e Breadcrum fix do not rollback... 
Former-commit-id: af2a9520e71da6a3287dc8c462a3dea5c72ba602
 2019-04-22 10:45:07 +02:00
fbsanchez e59ce5412c WIP Discovery RDS 
Former-commit-id: fba3f7dbd44ca131404aa2d3986d3925b9754382
 2019-04-09 18:33:02 +02:00
fbsanchez 11b2fbc245 WIP db 
Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9
 2019-04-02 16:25:29 +02: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
alejandro-campos ec999341ba change discovery headers and add breadcrumbs to them 
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
 2019-03-26 15:42:33 +01:00
fbsanchez 8c8f368993 WIP: NetworkMaps rebuild 
Former-commit-id: d3ca9d0de1b718a35bbc4aae80982b2c4705a454
 2019-03-14 18:51:48 +01:00
daniel d722c39393 add custom net scan 
Former-commit-id: 61df342754f17b2ecfe3ad06055e9c5b73617d03
 2019-03-06 17:14:32 +01:00
fbsanchez 5382f07ae2 Comment updates in wizard class 
Former-commit-id: 9fbb1d0c6499dd1ad71c472970b3993193b581da
 2019-02-26 17:42:12 +01:00
fbsanchez 5b3ce09515 Comment updates in wizard class 
Former-commit-id: 0b820729a631d906fe4816ba74f84f700b500c01
 2019-02-26 17:41:42 +01:00
fbsanchez 8b5f50f883 Discovery minor fixes 
Former-commit-id: 3914d7a99fb70d88c1a1f95d3c2aeb100f277266
 2019-02-22 19:18:07 +01:00
fermin831 9e9d915609 Modified redirection 
Former-commit-id: 77dd6fee3a71064e790bd020afbcc91edbdfe20c
 2019-02-21 15:35:44 +01:00
fermin831 0ed6c6d620 Merge branch 'ent-3430-discovery' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3430-discovery 
Conflicts:
	pandora_console/godmode/wizards/Wizard.main.php

Former-commit-id: 570168ca638ea3403de5768b08c640a909aa27d2
 2019-02-20 16:54:52 +01:00
fermin831 f49b26692e Fixes on wizards 
Former-commit-id: 98804bde49e19a7ecb3e2749a8955ac656da54a8
 2019-02-20 16:47:29 +01:00
fbsanchez 414ff282e2 Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications 
Former-commit-id: 2d10f49e4eb2078eebd2f6164866fe2a8412d6a3
 2019-02-20 14:38:14 +01:00
fbsanchez 4834561e87 Wiz. minor fixes 
Former-commit-id: b3963bf5994a8f9829922e0a1b0be3a20fc54fba
 2019-02-20 14:38:00 +01:00
fermin831 73a5e691ef Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon 
Conflicts:
	pandora_console/godmode/wizards/Wizard.main.php

Former-commit-id: dead86a654f8b2873721387233a9c9797b0cd8b1
 2019-02-20 13:57:54 +01:00
fbsanchez 331b09c520 Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications 
Former-commit-id: 7220701d8016a2963cd80cb807bf037af37c2730
 2019-02-20 12:32:27 +01:00
fbsanchez f19bdf956e Wiz. minor fix default value url in goback button 
Former-commit-id: 434b2acb09290f11c8804024adb8834b86eeda73
 2019-02-20 12:32:12 +01:00
fbsanchez 8872968600 Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications 
Former-commit-id: c3eed02e448a213a65159897355dc44d844b9741
 2019-02-20 11:11:37 +01:00
fbsanchez a63e497497 Wiz. Added textarea input 
Former-commit-id: 319ab37377e6649c1cd6c6adea1e956e934f2e23
 2019-02-20 11:11:26 +01:00
fbsanchez 8ec5cda8bf Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications 
Former-commit-id: 057a5915c8397b3798dcbe97f6ac3f1302879c8c
 2019-02-20 10:59:05 +01:00
fbsanchez 65db8482c1 Wiz. Added option url to printGoBackButton 
Former-commit-id: fd0c76ce5efef9902cbda2817b13e59e6672c972
 2019-02-20 10:58:56 +01:00
fbsanchez e2bb9e9a15 Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications 
Former-commit-id: 4d47587e87964b25e4d5bc2a16551846507c266c
 2019-02-20 10:54:09 +01:00
fbsanchez e9d97e8010 Wiz. Added option url to printGoBackButton 
Former-commit-id: 31c9c56da3475f9b1510904ad7237f993c0a6ccf
 2019-02-20 10:53:54 +01:00
fbsanchez 69abba260a Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications 
Former-commit-id: eec0a9614d1dee466d5adb59c9f39d2599360e27
 2019-02-19 20:27:34 +01:00
fbsanchez fa3f548cdd Several changes for Wiz.App support 
Former-commit-id: 7c86d2e601771686a69d3f1b846638a427a25d6e
 2019-02-19 20:27:05 +01:00
fermin831 55af128cd5 Modified snmp browser to work with wizard 
Former-commit-id: c8d37e06967ed43867320ae89fd3dc2bede7b0ce
 2019-02-19 20:14:14 +01:00
fermin831 819910923f Added callback to print forms 
Former-commit-id: 8e95ba3ae518a750d421fcce41238ca7f47b46c2
 2019-02-19 18:29:59 +01:00
fermin831 86d57f2654 Added callback to print forms 
Former-commit-id: e8f113710158278cb61f494a6c0111e1615ab877
 2019-02-19 18:23:20 +01:00
fermin831 2c3357ac64 Added interval input to Wizards 
Former-commit-id: ad64615eed06f025654d7875a3b572b865364d37
 2019-02-19 16:06:41 +01:00
fbsanchez 1b82a970b1 WIP: App wiz 
Former-commit-id: aa969dc2fead693977959374c747f046676c5fed
 2019-02-19 14:36:16 +01:00
fermin831 c9cc744e07 Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon 
Former-commit-id: d609bc3171cb75d89b641f6dd100e593ae5d1ebd
 2019-02-19 11:01:11 +01:00
manuel 938408ada9 Added wizard 
Former-commit-id: d47389f000b9295c21d9a56ed0138913d0045b76
 2019-02-19 08:58:30 +01:00
fermin831 cb94692491 Added function addBreadcrum in Wizard main 
Former-commit-id: ac40c2fd49ff02a84dc6752c4ea99309a3d4440f
 2019-02-18 14:30:03 +01:00
fermin831 a9caebbbf4 Put the list into a function 
Former-commit-id: 11e4d0faa3512e46582530f48bab2cfa1031e89f
 2019-02-18 10:24:19 +01:00
fbsanchez 5093094d7d H&D tasklist and some visual changes 
Former-commit-id: d9130ec520b0c23a9cf42ce62aae6c3d2432649b
 2019-02-15 18:05:59 +01:00
fbsanchez 96fccc578c WIP: H&D 
Former-commit-id: 82a6c84a2c896a08f420a89dc3fe6cd79d8ff3bb
 2019-02-14 17:56:10 +01:00