Commit Graph

938 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 6d8bb1a926 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 0ff46ee25e 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 b5d12437eb 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 56a9f8a0ce 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 4052dae78b 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 efc97585b6 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 e4dec65417 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 39320e149e 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 d54c713723 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 56f5548e79 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 24d55befb6 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 1945d8c2cf 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 f432eee020 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 eea456a15e 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 1e6b71b0fa 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 663568e2d6 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 10064abb5d 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 9131796e9e 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 b77662de0e 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 497bdc1e8d 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 e5e0fe0d14 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 c79d5c265b 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
Neale Pickett dfd1eb97db Save the Date for TF5 2012-02-13 11:02:15 -07:00
Neale Pickett a732d66a1a Save the Date for TF5 2012-02-13 11:02:15 -07:00
Neale Pickett 84e0446cb7 fix ircd configuration 2012-02-08 19:30:57 -07:00
Neale Pickett a0bf7e9762 fix ircd configuration 2012-02-08 19:30:57 -07:00
Neale Pickett 487292cd61 more tf vendor tokens, cow mods, router mods 2012-02-08 10:15:01 -07:00