Commits

Branch selector

dev

User selector

All users

All time

Commit history

Commits on May 6, 2015

• Merge branch 'dev' into sooshie-master

  Show description for 545d560
  krmaxwell

  committed
  545d560View commit details

  Copy full SHA for 545d560

  Browse repository at this point

Commits on May 5, 2015

• Merge branch 'master' of https://github.com/ivanlei/combine into ivanlei-pkg

  krmaxwell

  committed
  d70ae7aView commit details

  Copy full SHA for d70ae7a

  Browse repository at this point

Commits on May 3, 2015

• Working version of --output-dir

  

  Ivan Leichtling

  committed
  398b25fView commit details

  Copy full SHA for 398b25f

  Browse repository at this point

• Allow docker to properly map output... maybe

  

  Ivan Leichtling

  committed
  9d8dbc6View commit details

  Copy full SHA for 9d8dbc6

  Browse repository at this point

• Use virtualenv in docker

  

  Ivan Leichtling

  committed
  0fc11b6View commit details

  Copy full SHA for 0fc11b6

  Browse repository at this point

• Build combine as a package with tox and setup.py

  

  Ivan Leichtling

  committed
  e7f1346View commit details

  Copy full SHA for e7f1346

  Browse repository at this point

Commits on Apr 27, 2015

• Merge branch 'master' into dev

  alexcpsec

  committed
  aafa136View commit details

  Copy full SHA for aafa136

  Browse repository at this point

• Merge pull request #137 from mlsecproject/release-0.1.3

  Show description for b8794f2
  alexcpsec

  committed
  b8794f2View commit details

  Copy full SHA for b8794f2

  Browse repository at this point

• Merging Changelog

  alexcpsec

  committed
  a2dcb7eView commit details

  Copy full SHA for a2dcb7e

  Browse repository at this point

• Typo in changelog

  alexcpsec

  committed
  0197f89View commit details

  Copy full SHA for 0197f89

  Browse repository at this point

• Updating MaxMind database to April 2015

  alexcpsec

  committed
  28af497View commit details

  Copy full SHA for 28af497

  Browse repository at this point

• Updating changelog and bumping the version to 0.1.3

  alexcpsec

  committed
  e784a81View commit details

  Copy full SHA for e784a81

  Browse repository at this point

• Merge pull request #136 from mlsecproject/feeds

  Show description for 9bc3648
  alexcpsec

  committed
  9bc3648View commit details

  Copy full SHA for 9bc3648

  Browse repository at this point

• Adjusting feeds to the wiki listings (#71)

  alexcpsec

  committed
  f0818a0View commit details

  Copy full SHA for f0818a0

  Browse repository at this point

• Merge branch 'master' into dev

  krmaxwell

  committed
  c095588View commit details

  Copy full SHA for c095588

  Browse repository at this point

• Merge pull request #127 from mlsecproject/contributing

  Show description for e8d9ba5
  krmaxwell

  committed
  e8d9ba5View commit details

  Copy full SHA for e8d9ba5

  Browse repository at this point

• Add code of conduct

  krmaxwell

  committed
  2d80c07View commit details

  Copy full SHA for 2d80c07

  Browse repository at this point

Commits on Apr 26, 2015

• Adding CLA section and keeping the security process simple (#127)

  alexcpsec

  committed
  56a1541View commit details

  Copy full SHA for 56a1541

  Browse repository at this point

• Merge pull request #112 from mlsecproject/i36_enrich_DNS_indicators

  Show description for 4f41484
  alexcpsec

  committed
  4f41484View commit details

  Copy full SHA for 4f41484

  Browse repository at this point

• Updating CHANGELOG (#36)

  alexcpsec

  committed
  239f0c3View commit details

  Copy full SHA for 239f0c3

  Browse repository at this point

• Fixing rhost query so it returns the rdata, not the rrset (#36)

  alexcpsec

  committed
  94feb29View commit details

  Copy full SHA for 94feb29

  Browse repository at this point

Commits on Apr 10, 2015

• Return correct DNS enrichments

  krmaxwell

  committed
  3a89648View commit details

  Copy full SHA for 3a89648

  Browse repository at this point

Commits on Apr 3, 2015

• Look up PTR for in-addr.arpa record instead

  

  Kyle Maxwell

  committed
  ed398a6View commit details

  Copy full SHA for ed398a6

  Browse repository at this point

• Some bugfixes on DNS enrichment code in winnower (#36)

  alexcpsec

  committed
  ba6a6c8View commit details

  Copy full SHA for ba6a6c8

  Browse repository at this point

• Merge branch 'master' into i36_enrich_DNS_indicators

  alexcpsec

  committed
  9cd54f1View commit details

  Copy full SHA for 9cd54f1

  Browse repository at this point

Commits on Apr 2, 2015

• Merge pull request #134 from mlsecproject/changelog

  Show description for c52ba11
  alexcpsec

  committed
  c52ba11View commit details

  Copy full SHA for c52ba11

  Browse repository at this point

• More light formatting on ChangeLog

  alexcpsec

  committed
  1c9ab39View commit details

  Copy full SHA for 1c9ab39

  Browse repository at this point

• Preparing changelog for impending v0.1.3

  alexcpsec

  committed
  357f500View commit details

  Copy full SHA for 357f500

  Browse repository at this point

• Merge pull request #132 from mlsecproject/i131-tld-regex

  Show description for 576734f
  alexcpsec

  committed
  576734fView commit details

  Copy full SHA for 576734f

  Browse repository at this point

• Merge pull request #133 from mlsecproject/update_maxmind

  Show description for 84ce49b
  alexcpsec

  committed
  84ce49bView commit details

  Copy full SHA for 84ce49b

  Browse repository at this point

• Updated MaxMind files to Mar2015

  alexcpsec

  committed
  ce59354View commit details

  Copy full SHA for ce59354

  Browse repository at this point

• A few more linter cleanups

  

  Kyle Maxwell

  committed
  c7c09e5View commit details

  Copy full SHA for c7c09e5

  Browse repository at this point

• Clean up linter warnings

  

  Kyle Maxwell

  committed
  28830e0View commit details

  Copy full SHA for 28830e0

  Browse repository at this point

• Fix domain regex for updated TLDs

  

  Kyle Maxwell

  committed
  1628f48View commit details

  Copy full SHA for 1628f48

  Browse repository at this point

Commits on Mar 18, 2015

• Explain branching model

  

  Kyle Maxwell

  committed
  2742b07View commit details

  Copy full SHA for 2742b07

  Browse repository at this point