Commit Graph

544 Commits

Author SHA1 Message Date
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 a5b18317af 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 8392fe441b 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 fa8e03613a 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 46147ee5df 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 9cc822c467 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 0237b387e1 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 00c5ad65c4 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 c914035226 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 469dc03572 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 01265654be 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 e2cc914da4 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 b49d931e81 Save the Date for TF5 2012-02-13 11:02:15 -07:00
Neale Pickett 28ef7ae2ca fix ircd configuration 2012-02-08 19:30:57 -07:00
Neale Pickett 812ee9ba9a more tf vendor tokens, cow mods, router mods 2012-02-08 10:15:01 -07:00
Neale Pickett fbcb48a738 Merge branch 'master' of fozzie:projects/ctf 2012-02-03 15:21:25 -07:00
Neale Pickett 0c9c1a9aca Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-02-02 17:15:41 -07:00
Neale Pickett 59020d831c Archive 2011 NMT state 2012-02-02 17:15:34 -07:00
Neale Pickett 2b6c3005f7 install fixes, tweak playfair 2012-02-02 17:14:41 -07:00
Neale Pickett 6c74cc1f83 tweak scoreboard 2012-02-02 16:51:19 -07:00
Neale Pickett d356e18e97 New forensic tokens, course assignments, new table diagram 2012-02-01 17:11:46 -07:00
Neale Pickett 81ac3baeac get cowbull working 2012-01-31 17:23:55 -07:00
Neale Pickett aee131d2b2 Merge branch 'master' of fozzie.woozle.org:projects/ctf 2012-01-31 16:51:44 -07:00
Neale Pickett 9451b858c5 Merge branch 'master' of fozzie:projects/ctf 2012-01-31 16:51:38 -07:00
Neale Pickett 84afee3e42 Merge branch 'master' of fozzie.woozle.org:projects/ctf 2012-01-31 16:48:31 -07:00
Neale Pickett 4c92b67a2b clean up cowbull, some docs 2012-01-31 16:45:53 -07:00
Aaron McPhall cd4797405f Changed scoring.html to reflect multi-point tokens 2012-01-31 17:39:01 -05:00
Neale Pickett eb02ce835e Merge remote branch 'origin/master' 2012-01-31 10:50:49 -07:00
Neale Pickett 8bbc2d5593 add static route for kevin, bump radvd version 2012-01-31 10:50:42 -07:00
Neale Pickett 6ff2767310 course assignment program, add forensic tokens 2012-01-30 17:08:41 -07:00
Neale Pickett 88fd522c00 Fix typo in v6 docs 2012-01-30 09:59:42 -07:00
Neale Pickett 07090c9d0e some TF4 tokens 2012-01-25 12:45:25 -07:00
Neale Pickett d07546d5ab nope, didn\'t want logger 2012-01-20 17:02:37 -07:00
Neale Pickett 20c6cfe3d1 work on cowcli 2012-01-20 17:02:07 -07:00
Neale Pickett 99a5ea1017 Bind cowcli to low port 2012-01-19 22:13:44 -07:00
Neale Pickett e6c4a218df Add nascent cowcli 2012-01-19 22:06:14 -07:00
Neale Pickett 02f21d3964 cowd which runs 2012-01-19 16:30:04 -07:00
Neale Pickett 1d6b8f6971 Merge branch 'master' of fozzie:projects/ctf 2012-01-18 21:41:21 -07:00
Neale Pickett d785404d8d Start at cows and bulls game 2012-01-18 21:40:56 -07:00