Commit Graph

924 Commits

Author SHA1 Message Date
Neale Pickett 737b4c4317 Map of participation 2013-01-11 09:33:04 -07:00
Neale Pickett 72e8d79736 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf
Conflicts:
	packages/p2/bin/p2console
2012-12-18 10:16:42 -07:00
Neale Pickett ffc7850b01 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf
Conflicts:
	packages/p2/bin/p2console
2012-12-18 10:16:42 -07:00
Neale Pickett 1f674c269b Some p2 changes 2012-12-18 10:15:08 -07:00
Neale Pickett a79c87648d Some p2 changes 2012-12-18 10:15:08 -07:00
Neale Pickett 05bf3df977 Make a poster 2012-12-17 16:27:35 -07:00
Neale Pickett 92ee658289 Make a poster 2012-12-17 16:27:35 -07:00
Neale Pickett 2d6f6ecaaa Document netarch category 2012-11-14 17:56:06 -07:00
Neale Pickett 2906954c56 Document netarch category 2012-11-14 17:56:06 -07:00
Neale Pickett fcb12e53e2 Possibly working directory auto-detection 2012-11-07 19:44:27 -07:00
Neale Pickett 8d999c678f Possibly working directory auto-detection 2012-11-07 19:44:27 -07:00
Neale Pickett 1c5a3a8b53 make a stab at detecting fs layout 2012-10-31 16:01:36 -06:00
Neale Pickett 472ddcdfea make a stab at detecting fs layout 2012-10-31 16:01:36 -06:00
Neale Pickett 91dce4e90c Merge branch 'novar'
Conflicts:
	packages/p2/www/index.html
2012-08-16 19:48:06 -06:00
Neale Pickett b7796dc10c Merge branch 'novar'
Conflicts:
	packages/p2/www/index.html
2012-08-16 19:48:06 -06:00
Neale Pickett e12fdcd027 Fail startup of points if packages are not online yet 2012-08-16 19:47:19 -06:00
Neale Pickett 72c5f802bd Fail startup of points if packages are not online yet 2012-08-16 19:47:19 -06:00
Neale Pickett c7252bebe3 puzzles.cgi from novar branch 2012-07-26 19:28:29 -06:00
Neale Pickett d5d7fc8691 puzzles.cgi from novar branch 2012-07-26 19:28:29 -06:00
Neale Pickett 19e46c9b34 add bus. card puzzle, mention radio on index 2012-07-26 19:25:36 -06:00
Neale Pickett d0ff2c2156 add bus. card puzzle, mention radio on index 2012-07-26 19:25:36 -06:00
Neale Pickett d29a0a058f Merge answers from novar for p2@dc20 2012-07-26 17:57:33 -06:00
Neale Pickett 84fe59d47a Merge answers from novar for p2@dc20 2012-07-26 17:57:33 -06:00
Neale Pickett db98d384ec make radio answers 2012-07-26 17:54:53 -06:00
Neale Pickett 8b85524ab6 make radio answers 2012-07-26 17:54:53 -06:00
Neale Pickett e9ea181fd0 Merge remote-tracking branch 'fozzie/master' into novar 2012-07-26 17:38:48 -06:00
Neale Pickett c5a7f97f0d Merge remote-tracking branch 'fozzie/master' into novar 2012-07-26 17:38:48 -06:00
Neale Pickett 595810f444 nyancat part of DJ puzzle 2012-07-23 23:03:26 -06:00
Neale Pickett 29f0f0c805 nyancat part of DJ puzzle 2012-07-23 23:03:26 -06:00
Neale Pickett ffb3d728a5 Merge branch 'master' of fozzie:projects/ctf 2012-07-23 20:35:02 -06:00
Neale Pickett dc8f9ed513 Merge branch 'master' of fozzie:projects/ctf 2012-07-23 20:35:02 -06:00
Neale Pickett 688cadfe5c add answers for radio 2012-07-23 20:34:48 -06:00
Neale Pickett 6a7ada8382 add answers for radio 2012-07-23 20:34:48 -06:00
Neale Pickett 16be290a20 better tanx 2012-07-23 16:33:40 -06:00
Neale Pickett 639e587f8e better tanx 2012-07-23 16:33:40 -06:00
Neale Pickett 3d9fda6114 Move away from /var 2012-07-22 17:14:06 -06:00
Neale Pickett 97dbaf73f3 Move away from /var 2012-07-22 17:14:06 -06:00
Neale Pickett 46d5f98b67 add network disclaimer to p2 page 2012-07-20 15:35:20 -06:00
Neale Pickett 07060e937c add network disclaimer to p2 page 2012-07-20 15:35:20 -06:00
Neale Pickett 78641dc57b a few changes for HACK 2012-07-16 17:46:27 -06:00
Neale Pickett 93084076fa a few changes for HACK 2012-07-16 17:46:27 -06:00
Neale Pickett 9df8ae9ca5 lots of little fixups, caught up with todo after trail run in ACS 2012-07-12 17:15:43 -06:00
Neale Pickett 4ffb76b661 lots of little fixups, caught up with todo after trail run in ACS 2012-07-12 17:15:43 -06:00
Neale Pickett 97f08e76d2 fix routing for p2 2012-07-12 16:55:36 -06:00
Neale Pickett d9e4ba9e41 fix routing for p2 2012-07-12 16:55:36 -06:00
Neale Pickett 22fd1e84d6 add gs service, use new eris command-line option 2012-07-02 18:21:00 -06:00
Neale Pickett b1d0ba94e5 add gs service, use new eris command-line option 2012-07-02 18:21:00 -06:00
Neale Pickett 7a6b36c810 add p2.xcf 2012-06-27 14:41:52 -06:00
Neale Pickett 182b4ac23f add p2.xcf 2012-06-27 14:41:52 -06:00
Neale Pickett 524a8d1c94 Add generalstatics category 2012-06-27 14:40:51 -06:00