Commit Graph

594 Commits

Author SHA1 Message Date
Neale Pickett 1935190e26 Merge remote-tracking branch 'origin/master'
Conflicts:
	packages/mcp/www/credits.html
2012-05-24 20:35:19 -06:00
Neale Pickett eb0c3bfe3a add people to credits 2012-05-24 20:34:31 -06:00
Neale Pickett e9fc1878e8 add p2 static html 2012-05-24 16:27:24 -06:00
Neale Pickett b099999a86 firm up p2 console, add new tank 2012-05-24 15:16:19 -06:00
Neale Pickett 649d4cab94 make wopr work again 2012-05-22 12:54:51 -06:00
Neale Pickett a85a9d5479 Make OpenWRT work, save nonce in addteam 2012-05-18 22:03:53 -06:00
Neale Pickett 291cbe93f1 New OpenWRT configuration 2012-05-11 17:56:29 -06:00
Neale Pickett af1c79dcf6 Fix root account creation race condition 2012-05-11 11:15:42 -06:00
Neale Pickett 62c508aa07 Make octopus-redirect stop bringing down the address 2012-05-11 11:15:13 -06:00
Neale Pickett 5ba4875ebc fixes for ARM build 2012-05-10 12:32:09 -06:00
Neale Pickett 7ed8e7cf94 add DC20 ideas file 2012-05-03 14:01:16 -06:00
Neale Pickett c8a6aa9ce4 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-04-24 12:22:52 -06:00
Neale Pickett efb0fc55fa Project 2 console 2012-04-24 12:22:32 -06:00
Neale Pickett 5d860c9924 last-minute fixes for ipv4 2012-04-24 10:03:14 -06:00
Neale Pickett 051c0a3fd6 fix v4 IRC link 2012-04-19 17:48:50 -06:00
Neale Pickett 6c39216422 Just call it FIRE 2012-04-19 17:46:52 -06:00
Neale Pickett 656ee81c2d reintegrate ipv4, tanks 2012-04-19 17:40:30 -06:00
Neale Pickett fc8afa87d8 Merge branch 'master' of fozzie:projects/ctf 2012-04-07 22:13:42 -06:00
Neale Pickett f1e7c41443 add dirtbags.svg 2012-04-07 22:13:20 -06:00
Neale Pickett b31b5977a7 Merge branch 'master' of fozzie:projects/ctf 2012-02-13 15:22:10 -07:00
Neale Pickett 39ca5814ec formate savethedate for letter, not a4 2012-02-13 15:21:57 -07:00
Neale Pickett 3b425f85cf Archive TF4 state 2012-02-13 12:42:08 -07:00
Neale Pickett 7a173631ed Merge branch 'master' of fozzie:projects/ctf 2012-02-13 11:02:26 -07:00
Neale Pickett a732d66a1a Save the Date for TF5 2012-02-13 11:02:15 -07:00
Neale Pickett a0bf7e9762 fix ircd configuration 2012-02-08 19:30:57 -07:00
Neale Pickett 0068bcda3d more tf vendor tokens, cow mods, router mods 2012-02-08 10:15:01 -07:00
Neale Pickett ea033954ef Merge branch 'master' of fozzie:projects/ctf 2012-02-03 15:21:25 -07:00
Neale Pickett 5b87e51543 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-02-02 17:15:41 -07:00
Neale Pickett 8ab7448cea Archive 2011 NMT state 2012-02-02 17:15:34 -07:00
Neale Pickett 6349ad725e install fixes, tweak playfair 2012-02-02 17:14:41 -07:00
Neale Pickett c35cb622a6 tweak scoreboard 2012-02-02 16:51:19 -07:00
Neale Pickett c939cd0255 New forensic tokens, course assignments, new table diagram 2012-02-01 17:11:46 -07:00
Neale Pickett b22a420810 get cowbull working 2012-01-31 17:23:55 -07:00
Neale Pickett fe6b1e3b52 Merge branch 'master' of fozzie.woozle.org:projects/ctf 2012-01-31 16:51:44 -07:00
Neale Pickett 62f59f67ad Merge branch 'master' of fozzie:projects/ctf 2012-01-31 16:51:38 -07:00
Neale Pickett e60d1c851d Merge branch 'master' of fozzie.woozle.org:projects/ctf 2012-01-31 16:48:31 -07:00
Neale Pickett 43dc478605 clean up cowbull, some docs 2012-01-31 16:45:53 -07:00
Aaron McPhall dd175841e5 Changed scoring.html to reflect multi-point tokens 2012-01-31 17:39:01 -05:00
Neale Pickett e7f7007af8 Merge remote branch 'origin/master' 2012-01-31 10:50:49 -07:00
Neale Pickett 816b7cd94d add static route for kevin, bump radvd version 2012-01-31 10:50:42 -07:00
Neale Pickett c61d81a658 course assignment program, add forensic tokens 2012-01-30 17:08:41 -07:00
Neale Pickett 6e1cf0e66b Fix typo in v6 docs 2012-01-30 09:59:42 -07:00
Neale Pickett 1d1e62cf6a some TF4 tokens 2012-01-25 12:45:25 -07:00
Neale Pickett 2520cc6b46 nope, didn\'t want logger 2012-01-20 17:02:37 -07:00
Neale Pickett 80bb33edd2 work on cowcli 2012-01-20 17:02:07 -07:00
Neale Pickett 9aa18abe20 Bind cowcli to low port 2012-01-19 22:13:44 -07:00
Neale Pickett 15a5fc93c7 Add nascent cowcli 2012-01-19 22:06:14 -07:00
Neale Pickett f08766c478 cowd which runs 2012-01-19 16:30:04 -07:00
Neale Pickett 92de8ca025 Merge branch 'master' of fozzie:projects/ctf 2012-01-18 21:41:21 -07:00
Neale Pickett 71947a7ada Start at cows and bulls game 2012-01-18 21:40:56 -07:00