summaryrefslogtreecommitdiffstats
path: root/expo
Commit message (Collapse)AuthorAgeFilesLines
* [svn] Changes to file abstraction, that seemed to make it work by magicsubstantialnoninfringinguser2009-05-131-24/+31
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8182 by julian @ 1/18/2009 5:07 PM
* [svn] Julian playing with the logbooks and expoyearssubstantialnoninfringinguser2009-05-134-17/+66
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8180 by julian @ 1/18/2009 3:59 PM
* [svn]substantialnoninfringinguser2009-05-132-8/+31
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8175 by aaron @ 1/18/2009 4:42 AM
* [svn] Beginnings of expo calendarsubstantialnoninfringinguser2009-05-132-2/+22
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8174 by aaron @ 1/18/2009 1:15 AM
* [svn] Continued file abstracted work, to get survey files from either hard ↵substantialnoninfringinguser2009-05-132-27/+36
| | | | | | disk or the web. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8173 by julian @ 1/18/2009 12:45 AM
* [svn] Modifications to allow survey files to be pulled from another server. ↵substantialnoninfringinguser2009-05-131-0/+44
| | | | | | By providing directory listing and download functions,. which could also be used by tunnel Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8172 by julian @ 1/17/2009 11:25 PM
* [svn]substantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8165 by aaron @ 1/17/2009 7:44 AM
* [svn] Got rid of ugly old design; brought in ugly new design. This one works ↵substantialnoninfringinguser2009-05-132-6/+9
| | | | | | a little better, still needs a lot of work. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8164 by aaron @ 1/17/2009 7:11 AM
* [svn] More work on survey images parser and virtual survey binder. Renamed ↵substantialnoninfringinguser2009-05-132-12/+28
| | | | | | expedition_year field of Survey model to expedition because this makes more sense. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8163 by aaron @ 1/16/2009 7:50 PM
* [svn] randSent is unnecessary and causing problemssubstantialnoninfringinguser2009-05-131-3/+3
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8161 by aaron @ 1/16/2009 2:44 AM
* [svn]substantialnoninfringinguser2009-05-131-24/+0
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8160 by aaron @ 1/16/2009 2:41 AM
* [svn] randomLogbookSentance.py renamed to randSent.py, and expandedsubstantialnoninfringinguser2009-05-131-0/+30
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8159 by aaron @ 1/16/2009 2:40 AM
* [svn] same mistakesubstantialnoninfringinguser2009-05-131-3/+0
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8158 by aaron @ 1/16/2009 2:21 AM
* [svn]substantialnoninfringinguser2009-05-131-5/+2
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8157 by aaron @ 1/16/2009 2:19 AM
* [svn] Added some actual funtionality to virtual survey binder.substantialnoninfringinguser2009-05-131-1/+3
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8155 by aaron @ 1/15/2009 11:21 PM
* [svn] Add beginnings of virtual survey binder: new Survey and ScannedImage ↵substantialnoninfringinguser2009-05-133-4/+79
| | | | | | models, survey parser. Still has lots of problems, but I need some help with the file upload aspect so am committing now. Biggest problem is trying to call save() on the images from the API. It needs arguments that I don't understand. Also, the # in our survey paths was causing trouble. I worked around this with a correctURL method which urlencodes the actual URL, but admin still tries to use a URL with a # in it. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8152 by aaron @ 1/15/2009 6:22 AM
* [svn] Added new photo model.substantialnoninfringinguser2009-05-131-1/+1
| | | | | | | Logbook parser now looks for mugshots when adding people. If it finds an image, it adds a new photo model instance linked to that person. If it finds an html page, it adds the body text of that page as the person's "blurb" and then adds the mugshot. My interface web design isn't working, sorry. Need a blank slate on that one. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8150 by aaron @ 1/4/2009 2:06 PM
* [svn] Fix plurals because they're starting to get on my nerves!substantialnoninfringinguser2009-05-131-1/+5
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8095 by aaron @ 12/31/2008 5:07 PM
* [svn] QM parser now parses Hauchhoehle QMs.pysubstantialnoninfringinguser2009-05-134-8/+57
| | | | | | | | | Photo model added. Logbook parser now puts mugshots in as photo models, and descriptions from the old folk html pages in as "blurbs" on the person model. Experimented with eye candy and a random logbook quote generator. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8094 by aaron @ 12/31/2008 2:59 AM
* [svn] Added QM model and parser. Had to merge models_cave.py and ↵substantialnoninfringinguser2009-05-134-341/+282
| | | | | | | models_logbooks.py into models.py. This is because logbook entries now have an optional foreign key to caves, and QMs have a required foreign key to a logbook entry of the trip that created them. So, the two files became circularly dependent. Also, the urls for the person model now allow lookups using their actual first and last name in the url instead of the primary key. We should do similar things for all models, maybe even using the url as a search which results in a page with multiple model instance results if the input is ambiguous (e.g. they only enter a first name). Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8093 by aaron @ 12/13/2008 11:17 PM
* [svn] Fix settings reference.substantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8089 by aaron @ 12/9/2008 8:49 AM
* [svn]substantialnoninfringinguser2009-05-131-0/+6
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8083 by aaron @ 12/8/2008 5:17 AM
* [svn] Added cave and logbook search, collapsible footer navbar, useless ↵substantialnoninfringinguser2009-05-136-7/+84
| | | | | | statistics page. Also fixed broken css. Toying with forms but not committing those yet. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8081 by aaron @ 12/8/2008 4:28 AM
* [svn] Generalised the way dates are stored, and added a personRole and Role ↵substantialnoninfringinguser2009-05-131-5/+20
| | | | | | field Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8079 by julian @ 11/8/2008 11:27 PM
* [svn] Added survex persons to admin sitesubstantialnoninfringinguser2009-05-131-1/+11
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8078 by julian @ 11/8/2008 11:24 PM
* [svn] Djangoed Julians codesubstantialnoninfringinguser2009-05-131-16/+16
| | | | | | added underscores to field names turned __str__ to __unicode__ Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8076 by julian @ 11/8/2008 6:24 PM
* [svn] Use URL_ROOT for linkssubstantialnoninfringinguser2009-05-131-1/+2
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8074 by julian @ 11/7/2008 9:12 AM
* [svn] long putting insubstantialnoninfringinguser2009-05-131-1/+2
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8065 by julian @ 11/7/2008 2:08 AM
* [svn] Wiki_markup imporved to include paragraphssubstantialnoninfringinguser2009-05-131-1/+14
| | | | | | wiki_to_html should be used when the field will include paragraphs wiki_to_html_short should be used when the field will not include paragraphs Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8061 by julian @ 11/6/2008 11:24 PM
* [svn] Added date fieldsubstantialnoninfringinguser2009-05-131-0/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8053 by julian @ 11/2/2008 11:15 PM
* [svn] Increased maximum length of some of the fields to fit with the cavetab ↵substantialnoninfringinguser2009-05-131-5/+5
| | | | | | data Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8050 by julian @ 11/2/2008 11:10 PM
* [svn] make the person logbooks worksubstantialnoninfringinguser2009-05-131-0/+5
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8044 by julian @ 10/30/2008 1:13 PM
* [svn] Add QM model. Note that I had to put models_logbook into models cave ↵substantialnoninfringinguser2009-05-132-2/+104
| | | | | | because it referred to models from both. Will try to split them back up, should be possible. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8042 by aaron @ 10/28/2008 10:21 PM
* [svn] This file was created on Seagrass, but it looks like someone forgot to ↵substantialnoninfringinguser2009-05-131-0/+12
| | | | | | add it to the repo so I SCP'd it to my laptop and added it. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8040 by aaron @ 10/27/2008 6:04 PM
* [svn] add personindex templatessubstantialnoninfringinguser2009-05-131-1/+2
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8038 by julian @ 10/27/2008 12:36 AM
* [svn] we can parse one 2004 logbook in here. corrections made to folk.csvsubstantialnoninfringinguser2009-05-131-21/+28
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8036 by julian @ 10/26/2008 11:27 PM
* [svn]substantialnoninfringinguser2009-05-131-8/+9
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8035 by julian @ 10/26/2008 9:46 PM
* [svn] Initial troggle checkinsubstantialnoninfringinguser2009-05-1312-0/+439
This is a development site using Django 1.0 Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8034 by julian @ 10/26/2008 9:04 PM