Commit Graph

923 Commits

Author SHA1 Message Date
Neale Pickett dab2d8c8e6 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 5203a2c45d 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 564b84c640 Some p2 changes 2012-12-18 10:15:08 -07:00
Neale Pickett 6d21e999b2 Some p2 changes 2012-12-18 10:15:08 -07:00
Neale Pickett 72c0b6caf6 Make a poster 2012-12-17 16:27:35 -07:00
Neale Pickett f2f8ccb895 Make a poster 2012-12-17 16:27:35 -07:00
Neale Pickett 4689376e1c Document netarch category 2012-11-14 17:56:06 -07:00
Neale Pickett c3efbbb0e5 Document netarch category 2012-11-14 17:56:06 -07:00
Neale Pickett 6f3170ebfa Possibly working directory auto-detection 2012-11-07 19:44:27 -07:00
Neale Pickett 91e946bc05 Possibly working directory auto-detection 2012-11-07 19:44:27 -07:00
Neale Pickett 4c2931aec6 make a stab at detecting fs layout 2012-10-31 16:01:36 -06:00
Neale Pickett 44e41c48e5 make a stab at detecting fs layout 2012-10-31 16:01:36 -06:00
Neale Pickett 7e3c68f835 Merge branch 'novar'
Conflicts:
	packages/p2/www/index.html
2012-08-16 19:48:06 -06:00
Neale Pickett 16a4a0b4d8 Merge branch 'novar'
Conflicts:
	packages/p2/www/index.html
2012-08-16 19:48:06 -06:00
Neale Pickett d14c77f070 Fail startup of points if packages are not online yet 2012-08-16 19:47:19 -06:00
Neale Pickett f95605f3e6 Fail startup of points if packages are not online yet 2012-08-16 19:47:19 -06:00
Neale Pickett c5c7307c5c puzzles.cgi from novar branch 2012-07-26 19:28:29 -06:00
Neale Pickett 151648c6f2 puzzles.cgi from novar branch 2012-07-26 19:28:29 -06:00
Neale Pickett 1603b791a8 add bus. card puzzle, mention radio on index 2012-07-26 19:25:36 -06:00
Neale Pickett 8785008932 add bus. card puzzle, mention radio on index 2012-07-26 19:25:36 -06:00
Neale Pickett 729df67be4 Merge answers from novar for p2@dc20 2012-07-26 17:57:33 -06:00
Neale Pickett c703ab3aa2 Merge answers from novar for p2@dc20 2012-07-26 17:57:33 -06:00
Neale Pickett 04c37d19f1 make radio answers 2012-07-26 17:54:53 -06:00
Neale Pickett a73127840d make radio answers 2012-07-26 17:54:53 -06:00
Neale Pickett cd6216d4a8 Merge remote-tracking branch 'fozzie/master' into novar 2012-07-26 17:38:48 -06:00
Neale Pickett adb68f0b46 Merge remote-tracking branch 'fozzie/master' into novar 2012-07-26 17:38:48 -06:00
Neale Pickett 77f646297c nyancat part of DJ puzzle 2012-07-23 23:03:26 -06:00
Neale Pickett dd838168fa nyancat part of DJ puzzle 2012-07-23 23:03:26 -06:00
Neale Pickett 836337193a Merge branch 'master' of fozzie:projects/ctf 2012-07-23 20:35:02 -06:00
Neale Pickett 31342d615c Merge branch 'master' of fozzie:projects/ctf 2012-07-23 20:35:02 -06:00
Neale Pickett 1557ddafc3 add answers for radio 2012-07-23 20:34:48 -06:00
Neale Pickett 8df8797bb6 add answers for radio 2012-07-23 20:34:48 -06:00
Neale Pickett a4cf1beaa9 better tanx 2012-07-23 16:33:40 -06:00
Neale Pickett f51d21bd67 better tanx 2012-07-23 16:33:40 -06:00
Neale Pickett be280490d3 Move away from /var 2012-07-22 17:14:06 -06:00
Neale Pickett 2824aad4ec Move away from /var 2012-07-22 17:14:06 -06:00
Neale Pickett 83bfc85b8d add network disclaimer to p2 page 2012-07-20 15:35:20 -06:00
Neale Pickett 783a07d234 add network disclaimer to p2 page 2012-07-20 15:35:20 -06:00
Neale Pickett a2f50998d1 a few changes for HACK 2012-07-16 17:46:27 -06:00
Neale Pickett 1ee6beda0b a few changes for HACK 2012-07-16 17:46:27 -06:00
Neale Pickett f99c87b01e lots of little fixups, caught up with todo after trail run in ACS 2012-07-12 17:15:43 -06:00
Neale Pickett bba4851995 lots of little fixups, caught up with todo after trail run in ACS 2012-07-12 17:15:43 -06:00
Neale Pickett b63dbd12aa fix routing for p2 2012-07-12 16:55:36 -06:00
Neale Pickett d401cdee45 fix routing for p2 2012-07-12 16:55:36 -06:00
Neale Pickett ce189614b7 add gs service, use new eris command-line option 2012-07-02 18:21:00 -06:00
Neale Pickett 642e1df68e add gs service, use new eris command-line option 2012-07-02 18:21:00 -06:00
Neale Pickett 9b5bd34a47 add p2.xcf 2012-06-27 14:41:52 -06:00
Neale Pickett a4b24249fe add p2.xcf 2012-06-27 14:41:52 -06:00
Neale Pickett 1bbd111367 Add generalstatics category 2012-06-27 14:40:51 -06:00
Neale Pickett 18fc122c8e Add generalstatics category 2012-06-27 14:40:51 -06:00