Merge pull request #77 from Geczy/master

Updates to license, .gitignore, markdown files, & general cleanup.

.gitignore

@@ -2,5 +2,76 @@
 *.swp
 *.swo
 *.cap
-log
+*.log
 BullyOutput.txt
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+# Cache files for Sublime Text
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
+
+# Workspace files are user-specific
+*.sublime-workspace
+
+# Project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using Sublime Text
+# *.sublime-project
+
+# SFTP configuration file
+sftp-config.json
+
+# Package control specific files
+Package Control.last-run
+Package Control.ca-list
+Package Control.ca-bundle
+Package Control.system-ca-bundle
+Package Control.cache/
+Package Control.ca-certs/
+Package Control.merged-ca-bundle
+Package Control.user-ca-bundle
+oscrypto-ca-bundle.crt
+bh_unicode_properties.cache
+
+# Sublime-github package stores a github token in this file
+# https://packagecontrol.io/packages/sublime-github
+GitHub.sublime-settings
+
+# General
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk

README.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="https://github.com/FluxionNetwork/fluxion/blob/master/logos/logo1.jpg?raw=true" /></p>
+![Fuxion logo](https://github.com/FluxionNetwork/fluxion/blob/master/logos/logo1.jpg?raw=true)
 
 # Fluxion is the future of MITM WPA attacks
 Fluxion is a remake of linset by vk496 with (hopefully) less bugs and more functionality. It's compatible with the latest release of Kali (rolling). The attack is mostly manual, but experimental versions will automatically handle most functionality from the stable releases.
@@ -13,10 +13,11 @@ sudo sh router.sh
 [FAQ](https://github.com/FluxionNetwork/fluxion/wiki/FAQ)
 
 ## Installation
-``` git clone https://github.com/FluxionNetwork/fluxion.git```
+```
-
+git clone https://github.com/FluxionNetwork/fluxion.git # Download the latest revision
-## Updates
+cd fluxion # Switch to tool's directory
-If you want to submit a feature, do so by labeling your issue as an "enhancement" or submit a PR. I don't have enough time to make daily changes to fluxion, sorry.
+./install/install.sh # Install any dependencies
+```
 
 ## :white_check_mark: Included dependency versions
 1. Aircrack : 1:1.2-0~rc4-0parrot0
@@ -60,5 +61,8 @@ For development I use vim and tmux. Here are my [dotfiles](https://github.com/de
 9. MPX4132 - Fluxion V3
 
 ## Disclaimer
+* Authors do not own the logos under the `/attacks/Captive Portal/sites/` directory. Copyright Disclaimer Under Section 107 of the Copyright Act 1976, allowance is made for "fair use" for purposes such as criticism, comment, news reporting, teaching, scholarship, and research.
 
-***Fluxion is intended to be used for legal security purposes only, and should only be used on protected networks/hosts you own, or on networks/hosts you have permission to test on. Any other use is not the responsibility of the developer(s).  Be sure that you understand and are complying with the Fluxion licenses and laws in your area.  In other words, don't be stupid, don't be an asshole, and use this tool responsibly and legally.***
+* Usage of Fluxion for attacking infrastructures without prior mutual consistency can be considered as an illegal activity. It is the final user's responsibility to obey all applicable local, state and federal laws. Authors assume no liability and are not responsible for any misuse or damage caused by this program.
+
+**Note**: Be aware of sites pretending to be related with the Fluxion Project. They may be delivering malware.

docs/changelog

@@ -1,20 +0,0 @@
------------------------ General ----------------------- 
-revision=1
-
-
----------------------- Changelog ---------------------- 
-
-[Version: 2 , Revision 1]
-
-- rewrite code
-- move files
-	- exitmode to lib/
-	- source files to language
-
-- improve handeling 
-- remove disclaimer
-- remove git support
-- add checkupdate function
-- fix airmon file 
-
----------------------- Changelog ----------------------