Commit Graph

942 Commits

Author SHA1 Message Date
Neale Pickett 91f765f598 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-05-25 12:27:05 -06:00
Neale Pickett 52e33de102 begin work on p2 scoreboard 2012-05-25 12:26:54 -06:00
Neale Pickett 376c1aaf7b begin work on p2 scoreboard 2012-05-25 12:26:54 -06:00
Neale Pickett 87afa1b75e Merge remote-tracking branch 'origin/master'
Conflicts:
	packages/mcp/www/credits.html
2012-05-24 20:35:19 -06:00
Neale Pickett c060311f11 Merge remote-tracking branch 'origin/master'
Conflicts:
	packages/mcp/www/credits.html
2012-05-24 20:35:19 -06:00
Neale Pickett ff2c8ac440 add people to credits 2012-05-24 20:34:31 -06:00
Neale Pickett 8fdfce3eb8 add people to credits 2012-05-24 20:34:31 -06:00
Neale Pickett 9d815cc10b add p2 static html 2012-05-24 16:27:24 -06:00
Neale Pickett 5cbbdd0a5f add p2 static html 2012-05-24 16:27:24 -06:00
Neale Pickett 46a0d03cc2 firm up p2 console, add new tank 2012-05-24 15:16:19 -06:00
Neale Pickett b6ec9faae3 firm up p2 console, add new tank 2012-05-24 15:16:19 -06:00
Neale Pickett 17e2c6261c make wopr work again 2012-05-22 12:54:51 -06:00
Neale Pickett c008649609 make wopr work again 2012-05-22 12:54:51 -06:00
Neale Pickett c11b07767e Make OpenWRT work, save nonce in addteam 2012-05-18 22:03:53 -06:00
Neale Pickett 0656034e8b Make OpenWRT work, save nonce in addteam 2012-05-18 22:03:53 -06:00
Neale Pickett 60d7281342 New OpenWRT configuration 2012-05-11 17:56:29 -06:00
Neale Pickett 3882487a11 New OpenWRT configuration 2012-05-11 17:56:29 -06:00
Neale Pickett 0b93d6bbc8 Fix root account creation race condition 2012-05-11 11:15:42 -06:00
Neale Pickett b42b916d89 Fix root account creation race condition 2012-05-11 11:15:42 -06:00
Neale Pickett 817ce5e278 Make octopus-redirect stop bringing down the address 2012-05-11 11:15:13 -06:00
Neale Pickett e4b4de790f Make octopus-redirect stop bringing down the address 2012-05-11 11:15:13 -06:00
Neale Pickett 098c0e171c fixes for ARM build 2012-05-10 12:32:09 -06:00
Neale Pickett cfa705519d fixes for ARM build 2012-05-10 12:32:09 -06:00
Neale Pickett baf540b085 add DC20 ideas file 2012-05-03 14:01:16 -06:00
Neale Pickett ef4dc84ae9 add DC20 ideas file 2012-05-03 14:01:16 -06:00
Neale Pickett 28e2c736d7 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-04-24 12:22:52 -06:00
Neale Pickett 23370ff10d Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-04-24 12:22:52 -06:00
Neale Pickett 1c31b98625 Project 2 console 2012-04-24 12:22:32 -06:00
Neale Pickett 3f47099713 Project 2 console 2012-04-24 12:22:32 -06:00
Neale Pickett cc6a937dd6 last-minute fixes for ipv4 2012-04-24 10:03:14 -06:00
Neale Pickett 80cf8843f3 last-minute fixes for ipv4 2012-04-24 10:03:14 -06:00
Neale Pickett bfb6449dbf fix v4 IRC link 2012-04-19 17:48:50 -06:00
Neale Pickett 392c8d5ad0 fix v4 IRC link 2012-04-19 17:48:50 -06:00
Neale Pickett d98ce9b5f3 Just call it FIRE 2012-04-19 17:46:52 -06:00
Neale Pickett 0280eb9481 Just call it FIRE 2012-04-19 17:46:52 -06:00
Neale Pickett 977bcc247f reintegrate ipv4, tanks 2012-04-19 17:40:30 -06:00
Neale Pickett 52e55d8720 reintegrate ipv4, tanks 2012-04-19 17:40:30 -06:00
Neale Pickett 42c290acda Merge branch 'master' of fozzie:projects/ctf 2012-04-07 22:13:42 -06:00
Neale Pickett 4fe524d3fe Merge branch 'master' of fozzie:projects/ctf 2012-04-07 22:13:42 -06:00
Neale Pickett e4331da76f add dirtbags.svg 2012-04-07 22:13:20 -06:00
Neale Pickett e7baa1dd55 add dirtbags.svg 2012-04-07 22:13:20 -06:00
Neale Pickett 633b629446 Merge branch 'master' of fozzie:projects/ctf 2012-02-13 15:22:10 -07:00
Neale Pickett 8a6d1926b6 Merge branch 'master' of fozzie:projects/ctf 2012-02-13 15:22:10 -07:00
Neale Pickett 340bc46ebe formate savethedate for letter, not a4 2012-02-13 15:21:57 -07:00
Neale Pickett ba4c180942 formate savethedate for letter, not a4 2012-02-13 15:21:57 -07:00
Neale Pickett 24cccd6379 Archive TF4 state 2012-02-13 12:42:08 -07:00
Neale Pickett 39e78e5549 Archive TF4 state 2012-02-13 12:42:08 -07:00
Neale Pickett 14a0af6246 Merge branch 'master' of fozzie:projects/ctf 2012-02-13 11:02:26 -07:00
Neale Pickett 9ffdd3458d Merge branch 'master' of fozzie:projects/ctf 2012-02-13 11:02:26 -07:00
Neale Pickett a6d7ab05fa Save the Date for TF5 2012-02-13 11:02:15 -07:00