summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [svn]substantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8342 by cucc @ 5/11/2009 3:23 AM
* [svn]substantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8341 by cucc @ 5/11/2009 3:21 AM
* [svn] django-evolution is optional so shouldn't be in main settingssubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8340 by cucc @ 5/11/2009 3:18 AM
* [svn] Switch from photologue to imagekit. Less bloat.substantialnoninfringinguser2009-05-1312-0/+604
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8338 by cucc @ 5/11/2009 3:08 AM
* [svn] Dynamic thumbnail generation for photos and survey scans using ↵substantialnoninfringinguser2009-05-1311-39/+134
| | | | | | imagekit, further improving registration system, other misc. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8336 by cucc @ 5/10/2009 11:05 PM
* [svn] Fixes to deal with reorganization of expo surveys repository. Now that ↵substantialnoninfringinguser2009-05-134-46/+54
| | | | | | | survey scans and Surveys.csv are in different directories, we have two settings variables, settings.SURVEYS for the root of the survey repo, and settings.SURVEY_SCANS for the surveyscans directory. Fixed tab / indent muck in surveys parser. Commented out some "file abstraction" stuff for the time being. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8335 by cucc @ 5/10/2009 7:26 AM
* [svn] Improve registration system.substantialnoninfringinguser2009-05-1317-142/+4846
| | | | | Add jquery fade effects and quick search. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8334 by cucc @ 5/10/2009 5:23 AM
* [svn]substantialnoninfringinguser2009-05-131-0/+40
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8333 by cucc @ 5/8/2009 8:20 PM
* [svn]substantialnoninfringinguser2009-05-131-0/+0
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8332 by cucc @ 5/8/2009 8:17 PM
* [svn] Interface improvements. Code will need some cleaning up.substantialnoninfringinguser2009-05-138-61/+145
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8331 by cucc @ 5/8/2009 8:16 PM
* [svn]substantialnoninfringinguser2009-05-131-0/+0
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8328 by cucc @ 5/3/2009 6:33 AM
* [svn] fix it for real this timesubstantialnoninfringinguser2009-05-134-4/+4
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8327 by cucc @ 5/3/2009 6:18 AM
* [svn] fix import naming mistakesubstantialnoninfringinguser2009-05-135-6/+27
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8326 by cucc @ 5/3/2009 6:17 AM
* [svn] django_evolution is a nice thing to have for development (allows ↵substantialnoninfringinguser2009-05-131-1/+1
| | | | | | updating db with changes to models without wiping whole tables) but for development and not deployment. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8325 by cucc @ 5/3/2009 6:11 AM
* [svn] Weeks of local changes.substantialnoninfringinguser2009-05-1325-271/+545
| | | | | | | | | | | - Import is now non-destructive - Parsers write output to a log file (path be specified in settings) - databaseReset.py content been divided into separate functions which can be called for varying levels of deletion and importing - control panel (view, template, urlpattern) added for deleting and importing - Logins and signup fixed - CaveArea model updated, view, hierarchical url patterns, and beginning of template added - New site style Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8324 by cucc @ 5/3/2009 5:56 AM
* [svn] Persontrip wikilinks not ready yetsubstantialnoninfringinguser2009-05-131-4/+4
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8316 by aaron @ 3/30/2009 5:26 PM
* [svn] I worked on the trip_report view for a while before realizing it would ↵substantialnoninfringinguser2009-05-131-1/+1
| | | | | | be easier to just customize the LogbookEntry admin view to achieve the same effect. I never meant to commit it, but it snuck in to the urls.py Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8315 by aaron @ 3/30/2009 7:50 AM
* [svn] Added wikilink hints to logbook admin page. Also added some inlines in ↵substantialnoninfringinguser2009-05-134-10/+67
| | | | | | | admin Change get_absolute_url methods to use reverse() to decouple from urlconf. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8314 by aaron @ 3/30/2009 7:24 AM
* [svn] Decoupled get_absolute_url methods from urlconf by using reverse()substantialnoninfringinguser2009-05-131-2/+5
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8313 by aaron @ 3/30/2009 6:12 AM
* [svn]substantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8312 by aaron @ 3/27/2009 7:32 PM
* [svn] Smart url joiningsubstantialnoninfringinguser2009-05-131-5/+5
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8311 by aaron @ 3/27/2009 4:11 PM
* [svn] Temporary fix for double slash problemsubstantialnoninfringinguser2009-05-131-1/+2
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8310 by aaron @ 3/27/2009 3:58 PM
* [svn] Mistake in get_absolute_url for LogbookEntrysubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8309 by aaron @ 3/16/2009 8:22 PM
* [svn] Logbook entries are now at /YYYY-MM-DD/slug .substantialnoninfringinguser2009-05-136-5/+15
| | | | | Try editing a logbook entry title in the admin now. The django built in auto slug field is fun and javascripty. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8308 by aaron @ 3/16/2009 7:27 PM
* [svn] Up to late programming last night and forgot that not all ↵substantialnoninfringinguser2009-05-131-7/+15
| | | | | | | logbookentries will have caves attached. The function I wrote for making the "add a qm link" was breaking stuff. Fixed now. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8307 by aaron @ 3/16/2009 6:09 PM
* [svn] Revert change that won't work until we upgrade to django 1.1substantialnoninfringinguser2009-05-131-2/+2
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8306 by aaron @ 3/16/2009 9:00 AM
* [svn] Added QM wiki markup. The format is [[cave:204 QM:2005-04A]] with the ↵substantialnoninfringinguser2009-05-1314-61/+118
| | | | | | | grade (A) being optional. The links color red if the QM does not exist, and in that case clicking on them goes to an admin add page with fields prepopulated. Various other little things, e.g. filled in the footer with links. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8305 by aaron @ 3/16/2009 8:53 AM
* [svn]substantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8304 by aaron @ 3/15/2009 11:12 PM
* [svn] fix year linkssubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8303 by julian @ 3/15/2009 10:44 PM
* [svn] Revert part of my revert of Julian's revert! This was a harmless change.substantialnoninfringinguser2009-05-131-1/+2
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8302 by aaron @ 3/14/2009 9:47 PM
* [svn] Although I find the notability thing strange and a little offensive, I ↵substantialnoninfringinguser2009-05-131-22/+15
| | | | | | | didn't mean to break it. Fixed now. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8279 by aaron @ 3/14/2009 5:36 PM
* [svn] typo dammitsubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8278 by aaron @ 3/14/2009 4:20 PM
* [svn]substantialnoninfringinguser2009-05-131-2/+2
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8277 by aaron @ 3/14/2009 4:09 PM
* [svn] No go... maybe this will help? At a loss here...substantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8276 by aaron @ 3/14/2009 8:59 AM
* [svn] Framos version is giving syntax error at line 1 of view_surveys.pysubstantialnoninfringinguser2009-05-131-1/+1
| | | | | I don't see why it is a syntax error, but might as well change that line to the correct import statement and see if that helps. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8275 by aaron @ 3/14/2009 8:56 AM
* [svn] Reverted the reverts from 8267. Fixed the next / previous trip in ↵substantialnoninfringinguser2009-05-137-36/+42
| | | | | | | | personexpedition on the LogbookEntry template -- I had misunderstood what this was supposed to do last time I messed with it. This involved adding the methods PersonTrip.get_persons_next_trip and persons_previous_trip. Couldn't find any other broken things. Kept the productive changes in 8267: extending the logbook parsing back to 1993, changing index page, changes to view_surveys.py Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8274 by aaron @ 3/14/2009 8:38 AM
* [svn] Make qm table export script worksubstantialnoninfringinguser2009-05-132-1/+45
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8273 by aaron @ 3/14/2009 4:16 AM
* [svn] Make cavetab output actually work.substantialnoninfringinguser2009-05-131-63/+36
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8272 by aaron @ 3/13/2009 7:31 PM
* [svn] fix my typosubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8271 by aaron @ 3/13/2009 5:35 PM
* [svn] Got QM pages working.substantialnoninfringinguser2009-05-131-2/+13
| | | | | Started scripts for exporting to old expo format. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8270 by aaron @ 3/12/2009 2:47 PM
* [svn] Got QM pages working.substantialnoninfringinguser2009-05-139-10/+163
| | | | | Started scripts for exporting to old expo format. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8269 by aaron @ 3/12/2009 2:22 PM
* [svn] revert some of the changes (href element) so that the links worksubstantialnoninfringinguser2009-05-139-51/+102
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8267 by julian @ 3/11/2009 10:44 AM
* [svn] Further attempts to make troggle work on windows using surveys stored ↵substantialnoninfringinguser2009-05-135-10/+26
| | | | | | | | | | | on an external server settings.PHOTOS changed to setting.PHOTO_ROOT Made databaseReset.py get info from external server if appropriate (hope this did not break linus disk based scripts) Still needs more work, to get everything working Auto create photos directory if it does not already exist Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8262 by julian @ 3/2/2009 1:30 AM
* [svn] Added new abstract base class TroggleModel. Any fields or methods that ↵substantialnoninfringinguser2009-05-139-30/+34
| | | | | | | need to be added to multiple models should be added here. Added edit links to caves, people, logbook entries, and people. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8260 by aaron @ 2/26/2009 5:28 AM
* [svn] Not ready for these yet.substantialnoninfringinguser2009-05-131-2/+2
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8257 by aaron @ 2/23/2009 1:11 PM
* [svn] Fixing what I broke.substantialnoninfringinguser2009-05-133-3/+5
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8256 by aaron @ 2/23/2009 1:05 PM
* [svn]substantialnoninfringinguser2009-05-138-19/+41
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8255 by aaron @ 2/23/2009 4:16 AM
* [svn] Enable profile setup forms.substantialnoninfringinguser2009-05-138-25/+87
| | | | | | | Profiles are Person model instances, and are linked to django's built in User model by a one to one foreign key. We are using the django-registration and django-profiles pluggables. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8247 by aaron @ 2/18/2009 9:35 PM
* [svn] Photo file handling and mugshots parsing sorted.substantialnoninfringinguser2009-05-135-59/+86
| | | | | Made URL settings more relative, less redundant. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8246 by aaron @ 2/18/2009 6:45 AM
* [svn]substantialnoninfringinguser2009-05-1312-78/+122
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8245 by aaron @ 2/17/2009 1:09 AM