2016-11-29 |
marshmellow42 | Merge remote-tracking branch 'upstream/master' |
blob | commitdiff | raw |
2016-10-08 |
Iceman | Merge pull request #119 from marshmellow42/pm3+reveng |
blob | commitdiff | raw |
2016-09-25 |
Iceman | Merge pull request #197 from menshiyun/test-pr |
blob | commitdiff | raw | diff to current |
2016-09-25 |
menshiyun | fix client/Makefile 197/head |
blob | commitdiff | raw | diff to current |
2016-09-25 |
menshiyun | fix client/Makefile |
blob | commitdiff | raw | diff to current |
2016-09-24 |
menshiyun | test-pr |
blob | commitdiff | raw | diff to current |
2016-09-12 |
Iceman | Merge pull request #193 from k02a/patch-2 |
blob | commitdiff | raw | diff to current |
2016-09-12 |
Johnny Bengtsson | Better Linux compilation compability 193/head |
blob | commitdiff | raw | diff to current |
2016-08-12 |
Iceman | Merge pull request #184 from koalazak/patch-1 |
blob | commitdiff | raw | diff to current |
2016-08-12 |
Iceman | Merge pull request #185 from marshmellow42/master |
blob | commitdiff | raw | diff to current |
2016-06-06 |
marshmellow42 | Merge remote-tracking branch 'upstream/master' |
blob | commitdiff | raw | diff to current |
2016-04-03 |
Martin Holst Swende | Merge pull request #168 from zhovner/master |
blob | commitdiff | raw | diff to current |
2016-03-06 |
marshmellow42 | Add @iceman1001 s presco and pyramid functions + |
blob | commitdiff | raw | diff to current |
2016-02-15 |
marshmellow42 | Merge remote-tracking branch 'upstream/master' into... 119/head |
blob | commitdiff | raw | diff to current |
2015-12-10 |
Martin Holst Swende | Merge pull request #149 from marshmellow42/T55xx_tests |
blob | commitdiff | raw | diff to current |
2015-11-27 |
marshmellow42 | include cmdlfviking.c in makefile and cmdlf |
blob | commitdiff | raw | diff to current |
2015-11-04 |
marshmellow42 | Merge remote-tracking branch 'upstream/master' |
blob | commitdiff | raw | diff to current |
2015-11-03 |
pwpiwi | Merge branch 'topaz' |
blob | commitdiff | raw | diff to current |
2015-10-27 |
pwpiwi | Merge branch 'master' into topaz. Update Changelog. 142/head |
blob | commitdiff | raw | diff to current |
2015-08-25 |
pwpiwi | Merge branch 'master' into topaz |
blob | commitdiff | raw | diff to current |
2015-07-21 |
marshmellow42 | Merge remote-tracking branch 'upstream/master' into... |
blob | commitdiff | raw | diff to current |
2015-07-20 |
marshmellow42 | Merge remote-tracking branch 'upstream/master' 133/head |
blob | commitdiff | raw | diff to current |
2015-07-16 |
Martin Holst Swende | Merge pull request #129 from VERTCraig/master |
blob | commitdiff | raw | diff to current |
2015-07-13 |
Craig Young | Adding support for AWID26 realtime demodulation as... |
blob | commitdiff | raw | diff to current |
2015-07-01 |
pwpiwi | Merge branch 'master' into topaz |
blob | commitdiff | raw | diff to current |
2015-06-29 |
marshmellow42 | Merge remote-tracking branch 'upstream/master' into... |
blob | commitdiff | raw | diff to current |
2015-06-24 |
marshmellow42 | Merge remote-tracking branch 'upstream/master' 122/head |
blob | commitdiff | raw | diff to current |
2015-06-24 |
pwpiwi | Merge pull request #109 from pwpiwi/image_shrink |
blob | commitdiff | raw | diff to current |
2015-06-06 |
marshmellow42 | add reveng-1.30 |
blob | commitdiff | raw | diff to current |
2015-06-01 |
Martin Holst Swende | Merge pull request #108 from p-l-/fix-hf-mf-csave |
blob | commitdiff | raw | diff to current |
2015-06-01 |
Martin Holst Swende | Merge pull request #111 from zhovner/master |
blob | commitdiff | raw | diff to current |
2015-05-31 |
Martin Holst Swende | Merge pull request #112 from marshmellow42/master |
blob | commitdiff | raw | diff to current |
2015-05-31 |
marshmellow42 | add @Iceman1001 s sha1 scripting changes. 112/head |
blob | commitdiff | raw | diff to current |
2015-05-29 |
pwpiwi | Fix linking under linux. liblua requires libld on linux. |
blob | commitdiff | raw | diff to current |
2015-05-26 |
pwpiwi | also delete *.bin and fpga_compressor when "make clean". |
blob | commitdiff | raw | diff to current |
2015-05-26 |
pwpiwi | Add option -d (decompress) to fpga_compress. Allows... |
blob | commitdiff | raw | diff to current |
2015-05-26 |
pwpiwi | Compress the .data section as well (saves another 4KByt... |
blob | commitdiff | raw | diff to current |
2015-05-26 |
pwpiwi | replaced gzip with an own compressor tool (fpga_compres... |
blob | commitdiff | raw | diff to current |
2015-05-26 |
pwpiwi | add: hw ver: show FPGA versions for both HF and LF... |
blob | commitdiff | raw | diff to current |
2015-05-22 |
Martin Holst Swende | Merge pull request #101 from marshmellow42/master |
blob | commitdiff | raw | diff to current |
2015-05-14 |
marshmellow42 | scripting updates from @iceman1001 |
blob | commitdiff | raw | diff to current |
2015-04-05 |
pwpiwi | Merge branch 'master' into topaz |
blob | commitdiff | raw | diff to current |
2015-03-18 |
pwpiwi | fix: introduced a stupid error when refactoring the... |
blob | commitdiff | raw | diff to current |
2015-03-16 |
Martin Holst Swende | Merge pull request #78 from marshmellow42/master |
blob | commitdiff | raw | diff to current |
2015-03-13 |
marshmellow42 | data autocorr additions |
blob | commitdiff | raw | diff to current |
2015-03-13 |
marshmellow42 | Merge remote-tracking branch 'upstream/master' |
blob | commitdiff | raw | diff to current |
2015-03-13 |
pwpiwi | Merge pull request #75 from pwpiwi/qtmakefile |
blob | commitdiff | raw | diff to current |
2015-03-10 |
pwpiwi | (issue #47) use Qt5 includes and libraries, if present 75/head |
blob | commitdiff | raw | diff to current |
2015-02-20 |
marshmellow42 | Merge remote-tracking branch 'upstream/master' |
blob | commitdiff | raw | diff to current |
2015-02-19 |
Martin Holst Swende | Merge pull request #68 from iceman1001/feature |
blob | commitdiff | raw | diff to current |
2015-02-19 |
Martin Holst Swende | Merge pull request #67 from marshmellow42/master |
blob | commitdiff | raw | diff to current |
2015-02-19 |
Martin Holst Swende | More work on iclass full simulation, and some work... |
blob | commitdiff | raw | diff to current |
2015-02-06 |
marshmellow42 | Merge remote-tracking branch 'upstream/master' |
blob | commitdiff | raw | diff to current |
2015-02-06 |
Martin Holst Swende | Merge branch 'master' into GenericTracing |
blob | commitdiff | raw | diff to current |
2015-02-05 |
Martin Holst Swende | Merge pull request #55 from jessegit/master |
blob | commitdiff | raw | diff to current |
2015-02-03 |
Jesse Hallio | Add flasher from SVN r623 for HID bootprom and current... 55/head |
blob | commitdiff | raw | diff to current |
2015-01-31 |
Martin Holst Swende | Merged with master 54/head |
blob | commitdiff | raw | diff to current |
2015-01-26 |
marshmellow42 | Merge remote-tracking branch 'upstream/master' |
blob | commitdiff | raw | diff to current |
2015-01-26 |
Martin Holst Swende | Merge pull request #46 from holiman/master |
blob | commitdiff | raw | diff to current |
2015-01-26 |
Martin Holst Swende | Removed last trace of crypto from makefile 46/head |
blob | commitdiff | raw | diff to current |
2015-01-22 |
Martin Holst Swende | Removed openssl from the mfu-stuff |
blob | commitdiff | raw | diff to current |
2015-01-20 |
iceman1001 | Step 2 - Ultralight / Ultralight-C |
blob | commitdiff | raw | diff to current |
2015-01-20 |
iceman1001 | Merge branch 'master' of https://github.com/holiman... |
blob | commitdiff | raw | diff to current |
2015-01-20 |
iceman1001 | Merge branch 'master' of https://github.com/Proxmark... |
blob | commitdiff | raw | diff to current |
2015-01-15 |
Martin Holst Swende | Merge branch 'master' of https://github.com/iceman1001... |
blob | commitdiff | raw | diff to current |
2015-01-15 |
Martin Holst Swende | Merge branch 'master' of github.com:Proxmark/proxmark3 |
blob | commitdiff | raw | diff to current |
2015-01-13 |
marshmellow42 | Merge remote-tracking branch 'upstream/master' |
blob | commitdiff | raw | diff to current |
2015-01-13 |
Martin Holst Swende | Merge pull request #40 from holiman/master |
blob | commitdiff | raw | diff to current |
2015-01-12 |
Martin Holst Swende | Removed dependency on openssl, added AES implementation... |
blob | commitdiff | raw | diff to current |
2015-01-07 |
marshmellow42 | Merge branch 'master' of https://github.com/marshmellow... |
blob | commitdiff | raw | diff to current |
2015-01-07 |
iceman1001 | CHG: removed leftover debugging statements proxmark3.c |
blob | commitdiff | raw | diff to current |
2015-01-07 |
iceman1001 | Merge branch 'master' of https://github.com/Proxmark... |
blob | commitdiff | raw | diff to current |
2015-01-06 |
iceman1001 | ADD: tnp3xxx identification in luascripts. |
blob | commitdiff | raw | diff to current |
2015-01-01 |
Martin Holst Swende | Merge pull request #34 from marshmellow42/master |
blob | commitdiff | raw | diff to current |
2014-12-29 |
marshmellow42 | Merge pull request #1 from Proxmark/master |
blob | commitdiff | raw | diff to current |
2014-12-29 |
marshmellow42 | LF Demod streamlining |
blob | commitdiff | raw | diff to current |
2014-10-24 |
Martin Holst Swende | First try att merging with head |
blob | commitdiff | raw | diff to current |
2014-09-19 |
Martin Holst Swende | Merge pull request #22 from Proxmark/PenturaLabs-iclass... |
blob | commitdiff | raw | diff to current |
2014-09-19 |
Martin Holst Swende | Merge remote-tracking branch 'origin/master' into Pentu... 22/head |
blob | commitdiff | raw | diff to current |
2014-07-01 |
pwpiwi | Merge branch 'master' of https://github.com/Proxmark... |
blob | commitdiff | raw | diff to current |
2014-06-28 |
Martin Holst Swende | Merge branch 'iclass-research' of https://github.com... |
blob | commitdiff | raw | diff to current |
2014-06-27 |
Martin Holst Swende | Merged with master |
blob | commitdiff | raw | diff to current |
2014-06-19 |
iZsh | THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area... |
blob | commitdiff | raw | diff to current |
2014-05-02 |
Andrew Davies | Updated proxmark research with Holiman's loclass framework |
blob | commitdiff | raw | diff to current |
2014-03-18 |
W8M2Hg9lLmWqXSGC | Merge pull request #2 from PenturaLabs/master |
blob | commitdiff | raw | diff to current |
2014-03-18 |
penturalabs | Added Kantech ioProx Support 2/head |
blob | commitdiff | raw | diff to current |
2013-11-06 |
martin.holst@gmail.com | Added a lua bit manipulation library, added Lua-api... |
blob | commitdiff | raw | diff to current |
2013-10-09 |
roel@libnfc.org | removed unused compiler directives, cleaned up some... |
blob | commitdiff | raw | diff to current |
2013-09-29 |
douniwan5788@gmail.com | Add support in 'hf mf mifare' for some unlicensed/compa... |
blob | commitdiff | raw | diff to current |
2013-09-20 |
martin.holst@gmail.com | Fixed error from r769 where I added -ldl switch for... |
blob | commitdiff | raw | diff to current |
2013-09-19 |
martin.holst@gmail.com | Reintegrated scripting-branch into trunk. yay |
blob | commitdiff | raw | diff to current |
2013-09-19 |
martin.holst@gmail.com | Removed the -ldl switch from r763, so it only is added... |
blob | commitdiff | raw | diff to current |
2013-09-16 |
martin.holst@gmail.com | merged trunk changes into branch |
blob | commitdiff | raw | diff to current |
2013-09-01 |
martin.holst@gmail.com | Fixed some kind of of linking error |
blob | commitdiff | raw | diff to current |
2013-09-01 |
martin.holst@gmail.com | Merged latest trunk changes into scripting-branch |
blob | commitdiff | raw | diff to current |
2013-09-01 |
martin.holst@gmail.com | Added a comment |
blob | commitdiff | raw | diff to current |
2013-06-26 |
martin.holst@gmail.com | Added lua-mac building, added cleaning of lua files |
blob | commitdiff | raw | diff to current |
2013-06-25 |
martin.holst@gmail.com | Attempt to make the makefile generic, so lua compilatio... |
blob | commitdiff | raw | diff to current |
2013-05-26 |
martin.holst@gmail.com | Added binlib, to handle binary data from lua, based... |
blob | commitdiff | raw | diff to current |
2013-05-24 |
martin.holst@gmail.com | Added 'core'-api, also added some error handling in... |
blob | commitdiff | raw | diff to current |
next |