Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: LeonardoNve/dns2proxy
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: singe/dns2proxy
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 8 commits
  • 4 files changed
  • 2 contributors

Commits on Dec 24, 2015

  1. Placed global code within include guard, added __init__.py so that dn… 

    …s2proxy can be imported within other Python scripts.
    s0lst1c3 committed Dec 24, 2015
    Configuration menu
    Copy the full SHA
    9858dde View commit details
    Browse the repository at this point in the history

  2. Added run function, run() function so that dns2proxy can be imported … 

    …within other Python scripts.
    s0lst1c3 committed Dec 24, 2015
    Configuration menu
    Copy the full SHA
    523b0e7 View commit details
    Browse the repository at this point in the history

  3. Added run function, run() function so that dns2proxy can be imported … 

    …within other Python scripts.
    s0lst1c3 committed Dec 24, 2015
    Configuration menu
    Copy the full SHA
    72252b1 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2015

  1. Modified module import

    s0lst1c3 committed Dec 26, 2015
    Configuration menu
    Copy the full SHA
    aec1feb View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2016

  1. Fixed NameError in dns2proxy.py, modified domains.cfg for compatibili… 

    …ty with Mana Toolkit
    s0lst1c3 committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    aa40700 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:s0lst1c3/dns2proxy

    s0lst1c3 committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    8c15dc5 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2016

  1. Added content to README

    s0lst1c3 committed Jan 10, 2016
    Configuration menu
    Copy the full SHA
    209d639 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2016

  1. Merge pull request #1 from s0lst1c3/master 

    Converted into Python module
    @singe
    singe committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    6e85444 View commit details
    Browse the repository at this point in the history
Loading