Commit Graph

943 Commits

Author SHA1 Message Date
Neale Pickett 4c9ab27571 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-05-25 12:27:05 -06:00
Neale Pickett 11d139f50e Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-05-25 12:27:05 -06:00
Neale Pickett c4f38f453d begin work on p2 scoreboard 2012-05-25 12:26:54 -06:00
Neale Pickett fc04d831da begin work on p2 scoreboard 2012-05-25 12:26:54 -06:00
Neale Pickett c3ef7bb2e6 Merge remote-tracking branch 'origin/master'
Conflicts:
	packages/mcp/www/credits.html
2012-05-24 20:35:19 -06:00
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 a5b18317af add people to credits 2012-05-24 20:34:31 -06:00
Neale Pickett eb0c3bfe3a add people to credits 2012-05-24 20:34:31 -06:00
Neale Pickett a9ee3df1e2 add p2 static html 2012-05-24 16:27:24 -06:00
Neale Pickett e9fc1878e8 add p2 static html 2012-05-24 16:27:24 -06:00
Neale Pickett 8392fe441b firm up p2 console, add new tank 2012-05-24 15:16:19 -06:00
Neale Pickett b099999a86 firm up p2 console, add new tank 2012-05-24 15:16:19 -06:00
Neale Pickett 7f83cabdad make wopr work again 2012-05-22 12:54:51 -06:00
Neale Pickett 649d4cab94 make wopr work again 2012-05-22 12:54:51 -06:00
Neale Pickett fa8e03613a Make OpenWRT work, save nonce in addteam 2012-05-18 22:03:53 -06:00
Neale Pickett a85a9d5479 Make OpenWRT work, save nonce in addteam 2012-05-18 22:03:53 -06:00
Neale Pickett 8c71006a6f New OpenWRT configuration 2012-05-11 17:56:29 -06:00
Neale Pickett 291cbe93f1 New OpenWRT configuration 2012-05-11 17:56:29 -06:00
Neale Pickett 46147ee5df Fix root account creation race condition 2012-05-11 11:15:42 -06:00
Neale Pickett af1c79dcf6 Fix root account creation race condition 2012-05-11 11:15:42 -06:00
Neale Pickett 3bd320aa32 Make octopus-redirect stop bringing down the address 2012-05-11 11:15:13 -06:00
Neale Pickett 62c508aa07 Make octopus-redirect stop bringing down the address 2012-05-11 11:15:13 -06:00
Neale Pickett 9cc822c467 fixes for ARM build 2012-05-10 12:32:09 -06:00
Neale Pickett 5ba4875ebc fixes for ARM build 2012-05-10 12:32:09 -06:00
Neale Pickett bcae3cf2fb add DC20 ideas file 2012-05-03 14:01:16 -06:00
Neale Pickett 7ed8e7cf94 add DC20 ideas file 2012-05-03 14:01:16 -06:00
Neale Pickett 0237b387e1 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-04-24 12:22:52 -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 ca0f7cb1ba Project 2 console 2012-04-24 12:22:32 -06:00
Neale Pickett efb0fc55fa Project 2 console 2012-04-24 12:22:32 -06:00
Neale Pickett 00c5ad65c4 last-minute fixes for ipv4 2012-04-24 10:03:14 -06:00
Neale Pickett 5d860c9924 last-minute fixes for ipv4 2012-04-24 10:03:14 -06:00
Neale Pickett 1502fb56c5 fix v4 IRC link 2012-04-19 17:48:50 -06:00
Neale Pickett 051c0a3fd6 fix v4 IRC link 2012-04-19 17:48:50 -06:00
Neale Pickett c914035226 Just call it FIRE 2012-04-19 17:46:52 -06:00
Neale Pickett 6c39216422 Just call it FIRE 2012-04-19 17:46:52 -06:00
Neale Pickett 69218e13ba reintegrate ipv4, tanks 2012-04-19 17:40:30 -06:00
Neale Pickett 656ee81c2d reintegrate ipv4, tanks 2012-04-19 17:40:30 -06:00
Neale Pickett 469dc03572 Merge branch 'master' of fozzie:projects/ctf 2012-04-07 22:13:42 -06:00
Neale Pickett fc8afa87d8 Merge branch 'master' of fozzie:projects/ctf 2012-04-07 22:13:42 -06:00
Neale Pickett 03d021ad3b add dirtbags.svg 2012-04-07 22:13:20 -06:00
Neale Pickett f1e7c41443 add dirtbags.svg 2012-04-07 22:13:20 -06:00
Neale Pickett 01265654be Merge branch 'master' of fozzie:projects/ctf 2012-02-13 15:22:10 -07:00
Neale Pickett b31b5977a7 Merge branch 'master' of fozzie:projects/ctf 2012-02-13 15:22:10 -07:00
Neale Pickett bd5d469628 formate savethedate for letter, not a4 2012-02-13 15:21:57 -07:00
Neale Pickett 39ca5814ec formate savethedate for letter, not a4 2012-02-13 15:21:57 -07:00
Neale Pickett e2cc914da4 Archive TF4 state 2012-02-13 12:42:08 -07:00
Neale Pickett 3b425f85cf Archive TF4 state 2012-02-13 12:42:08 -07:00
Neale Pickett 2bfc69e986 Merge branch 'master' of fozzie:projects/ctf 2012-02-13 11:02:26 -07:00
Neale Pickett 7a173631ed Merge branch 'master' of fozzie:projects/ctf 2012-02-13 11:02:26 -07:00