summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
* [svn] My crusade to make our project more Djangoic.substantialnoninfringinguser2009-05-1321-176/+220
| | | | | | | | | Got rid of the url tags in template, replaced them with get_absolute_url method calls where possible. Adding get_absolute_url in models enables direct link to the public model views in admin. The use of get_absolute_url, which is the correct Django way of doing things, eliminates any need for the redundant "href" fields we were using. Those fields now need to be deleted from the models and from the parsers. Made the context processor to pass settings to all templates actually work, although this was a little uglier than expected. I had to put in a new render_response to replace render_to_response. This is because Django uses Context, not RequestContext by default. I wish they would change this, it's annoying. Anyway, I deleted all the manual settings passing in the views. I also eliminated a couple of unnecessary methods and stuff like that. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8244 by aaron @ 2/16/2009 8:31 AM
* [svn] Draft of paper for ICS.substantialnoninfringinguser2009-05-131-0/+0
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8242 by aaron @ 2/6/2009 6:20 AM
* [svn] Now that I've put the new css up, let's use it. Should have only stuff ↵substantialnoninfringinguser2009-05-131-1/+1
| | | | | | we actually use. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8238 by aaron @ 1/31/2009 9:20 PM
* [svn] Had forgotten to add these.substantialnoninfringinguser2009-05-132-0/+372
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8237 by aaron @ 1/31/2009 9:19 PM
* [svn] make worksubstantialnoninfringinguser2009-05-132-3/+4
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8236 by julian @ 1/30/2009 5:40 PM
* [svn] modify context so it does not pass unneeded and sensitive info in ↵substantialnoninfringinguser2009-05-131-1/+4
| | | | | | settings to templates Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8235 by aaron @ 1/30/2009 6:57 AM
* [svn] Fix "if logged in" tag.substantialnoninfringinguser2009-05-132-9/+9
| | | | | Changed logbook template; no longer uses the redundant _next and _prev fields. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8234 by aaron @ 1/30/2009 4:53 AM
* [svn] yorkshire work with tunnel integrationsubstantialnoninfringinguser2009-05-1315-168/+345
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8232 by julian @ 1/29/2009 11:40 PM
* [svn] Add user registration and user profiles.substantialnoninfringinguser2009-05-1373-11/+3173
| | | | | | | | | Used modified versions of django-registration and django-profiles , both on bitbucket. The Person model is now set up as the profile for auth.User s. I set up a requestcontext so that settings is automatically passed to every template, no need to repeat ourselves in views. However, this needs to be refined: I will soon change it to only pass a subset of settings. E.G. we do not need to be passing the DB login and password! Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8231 by aaron @ 1/29/2009 11:02 PM
* [svn] cave maps to all logbook entry trips done theresubstantialnoninfringinguser2009-05-1313-158/+224
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8228 by julian @ 1/24/2009 11:59 PM
* [svn] Template update to use wiki_to_html_shortsubstantialnoninfringinguser2009-05-132-5/+5
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8227 by julian @ 1/24/2009 7:40 PM
* [svn] I initial work at adding caveareas. (Descirprion of parts of caves)substantialnoninfringinguser2009-05-137-27/+56
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8226 by julian @ 1/24/2009 6:49 PM
* [svn] fix martins front page linkssubstantialnoninfringinguser2009-05-133-4/+5
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8225 by julian @ 1/24/2009 6:36 PM
* [svn] made index of peoplesubstantialnoninfringinguser2009-05-1310-53/+61
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8224 by julian @ 1/24/2009 6:26 PM
* [svn] Added links to front pagesubstantialnoninfringinguser2009-05-132-7/+12
| | | | | Add names for views in order to link from the main page Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8223 by julian @ 1/24/2009 3:11 PM
* [svn] move qm to ;latersubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8222 by julian @ 1/24/2009 2:07 PM
* [svn] merge the trip table to have surveys by datesubstantialnoninfringinguser2009-05-138-40/+140
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8221 by julian @ 1/24/2009 2:01 PM
* [svn] calendar.html used django 1.1 {% empty %} syntax, but older version on ↵substantialnoninfringinguser2009-05-132-5/+5
| | | | | | server so I had to change it Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8210 by aaron @ 1/20/2009 5:36 AM
* [svn] fix linkssubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8209 by aaron @ 1/20/2009 5:16 AM
* [svn] wrong comment syntaxsubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8208 by aaron @ 1/19/2009 10:08 PM