5 Commits

Author	SHA1	Message	Date
james	14308b5991	Start of adding 'conferences' and ability to switch between running conferences	2010-06-03 19:21:27 +00:00
james	1e4b1d4e2a	i18n() all the info on the login page	2010-03-18 15:16:45 +00:00
james	e20ff584cb	Volunteer links should go to type=volunteer not type=sponsor!	2010-01-20 20:30:59 +00:00
james	37bbcf312b	- Name the science fair login "Science Fair" not "Other Fair" ... - Since science fairs are attached to users now, it doesn't make sense to allow the user to choose from a list of fairs, since there could be more than one with access to a fair (and we don't want to start putting names in there), so fairs can login with a user/pass like everyone else.	2009-11-06 02:07:52 +00:00
james	f963dbf276	Merge all changes from branch r1284:1498 into trunk	2009-09-09 00:26:12 +00:00