summaryrefslogtreecommitdiffstats
path: root/expo
Commit message (Collapse)AuthorAgeFilesLines
* [svn] * Fix bugs that were causing broken wikilinks. *Add edit link to ↵substantialnoninfringinguser2009-06-124-11/+20
| | | | mugshots. *make admin url trailing-slash tolerant
* [svn] Just realized it makes no sense to have qms ticked off by a logbook ↵substantialnoninfringinguser2009-06-111-6/+2
| | | | entry as an inline. Instead, we need some kind of drop down list where ticked off qms can be searched for and selected. Should be doable.
* [svn] * Added non-public field for protecting copyright info etc. Field is ↵substantialnoninfringinguser2009-06-103-4/+11
| | | | | | on all models but needs to be checked for in views. So far, only the cave view checks. * Added the Person wiki syntax which looks like [[person:John Doe]]
* [svn] Fixed a bug with QMs with numbers between 1 and 10, and fixed the ↵substantialnoninfringinguser2009-06-105-44/+54
| | | | links in the recent changes box.
* [svn] * Added admin inlines for QMs in LogbookEntry modelsubstantialnoninfringinguser2009-06-104-17/+36
| | | | | * Added QM list edit view * Fixed "recent changes" box on front page
* [svn] codemirrorgoatchurch2009-06-091-9/+132
|
* [svn] Removed redundant fields "date" and "place" from Persontrip model. A ↵substantialnoninfringinguser2009-06-092-9/+17
| | | | PersonTrip's date and place are stored in its parent LogbookEntry. PersonTrips are the people who participate in the trip in a LogbookEntry, so it would make no sense to have different dates and places from the LogbookEntry they are foreignkeyed to.
* [svn] Rewrote get_absolute_url methods of models to use urlparse.urljoin ↵substantialnoninfringinguser2009-06-081-7/+13
| | | | instead of just +ing the urls together. This fixes problems with double slashes.
* [svn] Have control panel display an error for logged in, non-superuser users.substantialnoninfringinguser2009-05-241-2/+5
|
* [svn] Fix mistakes in export admin actions. The python serializer only works ↵substantialnoninfringinguser2009-05-231-9/+2
| | | | on simple objects (lists, dicts etc) and not model instances so nix that part.
* [svn] Re-enable JSON and XML export actions in admin pages now that troggle ↵substantialnoninfringinguser2009-05-231-4/+3
| | | | is using latest SVN version of Django.
* [svn] switched from dodgy manually writing to logfile to using python's ↵substantialnoninfringinguser2009-05-221-1/+5
| | | | logging module, which seems great
* [svn] - Remove feature (admin JSON / XML downloads) which won't work until ↵substantialnoninfringinguser2009-05-221-4/+4
| | | | | | we have django 1.1 installed (works on my SVN version, but not on seagrass debian package version). - Copy feincms media to project so that we don't have to serve it separately. Also useful because we may want to customize it.
* [svn] * Make subcave urls work.substantialnoninfringinguser2009-05-223-6/+42
| | | | * Add json and xml download to admin.
* [svn] allow the recreate tables thing on control panel to worksubstantialnoninfringinguser2009-05-211-1/+4
|
* [svn] Updates to allow subcave tree with nice admin.substantialnoninfringinguser2009-05-212-27/+39
|
* [svn] forgot to add earliersubstantialnoninfringinguser2009-05-201-0/+8
|
* [svn]substantialnoninfringinguser2009-05-194-9/+17
|
* [svn] - Make control panel downloads (qm.csv for each cave, CAVETAB2.CSV) work.substantialnoninfringinguser2009-05-171-3/+24
| | | | - Fix problems in QM parsing script
* [svn] Add: new generic object list template object_list.html, and ↵substantialnoninfringinguser2009-05-152-9/+14
| | | | convenience filter named "link" for making links from objects, and make expeditions list page using those two. Also, fixed survey parsing in databaseReset.py
* [svn] Fixed broken buttons on controlpanel, added CAVETAB2.CSV export and ↵substantialnoninfringinguser2009-05-142-8/+19
| | | | | | download buttons and made them work too. Changed ordering on PersonExpeditions so that it is based on their expedition. That way, even if we don't have date info on when a user was on expo exactly, pages like personindex work correctly.
* [svn] Made the subcaves work! Now we just have to figure out how to parse ↵substantialnoninfringinguser2009-05-132-16/+17
| | | | | | them... Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8343 by cucc @ 5/11/2009 6:36 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] Dynamic thumbnail generation for photos and survey scans using ↵substantialnoninfringinguser2009-05-132-4/+46
| | | | | | 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-132-1/+2
| | | | | | | 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-131-2/+2
| | | | | 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] Interface improvements. Code will need some cleaning up.substantialnoninfringinguser2009-05-131-1/+17
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8331 by cucc @ 5/8/2009 8:16 PM
* [svn] Weeks of local changes.substantialnoninfringinguser2009-05-135-37/+84
| | | | | | | | | | | - 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] 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] 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-133-3/+6
| | | | | 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] Added QM wiki markup. The format is [[cave:204 QM:2005-04A]] with the ↵substantialnoninfringinguser2009-05-137-15/+79
| | | | | | | 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] 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] 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-133-4/+15
| | | | | | | | 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-131-1/+8
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8273 by aaron @ 3/14/2009 4:16 AM
* [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-131-5/+13
| | | | | 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-134-23/+62
| | | | 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-131-1/+1
| | | | | | | | | | | 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-132-22/+26
| | | | | | | 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] Fixing what I broke.substantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8256 by aaron @ 2/23/2009 1:05 PM
* [svn]substantialnoninfringinguser2009-05-134-15/+33
| | | | 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-131-20/+20
| | | | | | | 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-131-2/+3
| | | | | 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-133-9/+32
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8245 by aaron @ 2/17/2009 1:09 AM
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-10 14:52:04 +0000