expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-27 01:31:57 +00:00
Code Issues 19 Projects 3 Activity
1,685 Commits 7 Branches 0 Tags 34 MiB
84e165b8fc
Commit Graph

1685 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
substantialnoninfringinguser
06487e5534 [svn] localsettings should override settings, so the import should be at the bottom of the file, unless someone has a better way of doing this 2009-05-14 06:39:36 +01:00
substantialnoninfringinguser
b1cc5ce6b5 [svn] 2009-05-14 06:32:58 +01:00
substantialnoninfringinguser
c0b73d4777 [svn] 2009-05-14 06:32:58 +01:00
substantialnoninfringinguser
57a972fae7 [svn] Fixed broken buttons on controlpanel, added CAVETAB2.CSV export and 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.
 2009-05-14 06:19:46 +01:00
substantialnoninfringinguser
e9e755b517 [svn] Fixed broken buttons on controlpanel, added CAVETAB2.CSV export and 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.
 2009-05-14 06:19:46 +01:00
substantialnoninfringinguser
c454fecfc1 [svn] Add link to google code issue tracker 2009-05-13 07:01:45 +01:00
substantialnoninfringinguser
191619e6d8 [svn] Add link to google code issue tracker 2009-05-13 07:01:45 +01:00
substantialnoninfringinguser
268d69214d [svn] Made the subcaves work! Now we just have to figure out how to parse them... 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8343 by cucc @ 5/11/2009 6:36 AM
 2009-05-13 06:28:36 +01:00
substantialnoninfringinguser
0f64e786b5 [svn] Made the subcaves work! Now we just have to figure out how to parse them... 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8343 by cucc @ 5/11/2009 6:36 AM
 2009-05-13 06:28:36 +01:00
substantialnoninfringinguser
987bd56edd [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8342 by cucc @ 5/11/2009 3:23 AM
 2009-05-13 06:27:45 +01:00
substantialnoninfringinguser
7164296c9d [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8342 by cucc @ 5/11/2009 3:23 AM
 2009-05-13 06:27:45 +01:00
substantialnoninfringinguser
736d13310a [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8341 by cucc @ 5/11/2009 3:21 AM
 2009-05-13 06:27:00 +01:00
substantialnoninfringinguser
787445c071 [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8341 by cucc @ 5/11/2009 3:21 AM
 2009-05-13 06:27:00 +01:00
substantialnoninfringinguser
ee1d4d8501 [svn] django-evolution is optional so shouldn't be in main settings 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8340 by cucc @ 5/11/2009 3:18 AM
 2009-05-13 06:26:17 +01:00
substantialnoninfringinguser
d9d119c0c9 [svn] django-evolution is optional so shouldn't be in main settings 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8340 by cucc @ 5/11/2009 3:18 AM
 2009-05-13 06:26:17 +01:00
substantialnoninfringinguser
b509390575 [svn] Switch from photologue to imagekit. Less bloat. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8338 by cucc @ 5/11/2009 3:08 AM
 2009-05-13 06:24:52 +01:00
substantialnoninfringinguser
c45eb31e8f [svn] Switch from photologue to imagekit. Less bloat. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8338 by cucc @ 5/11/2009 3:08 AM
 2009-05-13 06:24:52 +01:00
substantialnoninfringinguser
8c68a8a0d7 [svn] Dynamic thumbnail generation for photos and survey scans using 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
 2009-05-13 06:23:57 +01:00
substantialnoninfringinguser
b31d022c1a [svn] Dynamic thumbnail generation for photos and survey scans using 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
 2009-05-13 06:23:57 +01:00
substantialnoninfringinguser
21204f1bc8 [svn] Fixes to deal with reorganization of expo surveys repository. Now that 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
 2009-05-13 06:22:53 +01:00
substantialnoninfringinguser
919c7e932a [svn] Fixes to deal with reorganization of expo surveys repository. Now that 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
 2009-05-13 06:22:53 +01:00
substantialnoninfringinguser
1b06243dab [svn] Improve registration system. 
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
 2009-05-13 06:22:07 +01:00
substantialnoninfringinguser
9489fe56d9 [svn] Improve registration system. 
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
 2009-05-13 06:22:07 +01:00
substantialnoninfringinguser
9972e28a91 [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8333 by cucc @ 5/8/2009 8:20 PM
 2009-05-13 06:21:10 +01:00
substantialnoninfringinguser
6006eebb57 [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8332 by cucc @ 5/8/2009 8:17 PM
 2009-05-13 06:20:26 +01:00
substantialnoninfringinguser
09a1539aef [svn] Interface improvements. Code will need some cleaning up. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8331 by cucc @ 5/8/2009 8:16 PM
 2009-05-13 06:19:45 +01:00
substantialnoninfringinguser
84d92115f3 [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8328 by cucc @ 5/3/2009 6:33 AM
 2009-05-13 06:18:54 +01:00
substantialnoninfringinguser
e2e47e5876 [svn] fix it for real this time 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8327 by cucc @ 5/3/2009 6:18 AM
 2009-05-13 06:18:09 +01:00
substantialnoninfringinguser
a19781d7dd [svn] fix import naming mistake 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8326 by cucc @ 5/3/2009 6:17 AM
 2009-05-13 06:17:09 +01:00
substantialnoninfringinguser
8ae5232d87 [svn] django_evolution is a nice thing to have for development (allows 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
 2009-05-13 06:16:27 +01:00
substantialnoninfringinguser
625b2156e3 [svn] Weeks of local changes. 
- 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
 2009-05-13 06:15:48 +01:00
substantialnoninfringinguser
1a36856b40 [svn] Persontrip wikilinks not ready yet 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8316 by aaron @ 3/30/2009 5:26 PM
 2009-05-13 06:14:42 +01:00
substantialnoninfringinguser
2314373756 [svn] I worked on the trip_report view for a while before realizing it would 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
 2009-05-13 06:14:08 +01:00
substantialnoninfringinguser
3dca118e4a [svn] Added wikilink hints to logbook admin page. Also added some inlines in 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
 2009-05-13 06:13:31 +01:00
substantialnoninfringinguser
dab8dcea70 [svn] Decoupled get_absolute_url methods from urlconf by using reverse() 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8313 by aaron @ 3/30/2009 6:12 AM
 2009-05-13 06:12:54 +01:00
substantialnoninfringinguser
7ff0753b13 [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8312 by aaron @ 3/27/2009 7:32 PM
 2009-05-13 06:12:13 +01:00
substantialnoninfringinguser
558a005836 [svn] Smart url joining 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8311 by aaron @ 3/27/2009 4:11 PM
 2009-05-13 06:11:40 +01:00
substantialnoninfringinguser
72bd959b2a [svn] Temporary fix for double slash problem 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8310 by aaron @ 3/27/2009 3:58 PM
 2009-05-13 06:11:05 +01:00
substantialnoninfringinguser
85bfd6010b [svn] Mistake in get_absolute_url for LogbookEntry 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8309 by aaron @ 3/16/2009 8:22 PM
 2009-05-13 06:10:29 +01:00
substantialnoninfringinguser
6137f8baaa [svn] Logbook entries are now at /YYYY-MM-DD/slug . 
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
 2009-05-13 06:09:55 +01:00
substantialnoninfringinguser
d6244e1ef3 [svn] Up to late programming last night and forgot that not all 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
 2009-05-13 06:09:14 +01:00
substantialnoninfringinguser
4eb1215018 [svn] Revert change that won't work until we upgrade to django 1.1 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8306 by aaron @ 3/16/2009 9:00 AM
 2009-05-13 06:08:40 +01:00
substantialnoninfringinguser
157f11b659 [svn] Added QM wiki markup. The format is [[cave:204 QM:2005-04A]] with the 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
 2009-05-13 06:08:04 +01:00
substantialnoninfringinguser
256de6e083 [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8304 by aaron @ 3/15/2009 11:12 PM
 2009-05-13 06:07:19 +01:00
substantialnoninfringinguser
5811124d9d [svn] fix year links 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8303 by julian @ 3/15/2009 10:44 PM
 2009-05-13 06:06:46 +01:00
substantialnoninfringinguser
82a35878a2 [svn] Revert part of my revert of Julian's revert! This was a harmless change. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8302 by aaron @ 3/14/2009 9:47 PM
 2009-05-13 06:06:11 +01:00
substantialnoninfringinguser
5654e7c3b3 [svn] Although I find the notability thing strange and a little offensive, I 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
 2009-05-13 06:05:37 +01:00
substantialnoninfringinguser
78f5aa652f [svn] typo dammit 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8278 by aaron @ 3/14/2009 4:20 PM
 2009-05-13 06:05:02 +01:00
substantialnoninfringinguser
575fa986ae [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8277 by aaron @ 3/14/2009 4:09 PM
 2009-05-13 06:04:28 +01:00
substantialnoninfringinguser
b552537354 [svn] No go... maybe this will help? At a loss here... 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8276 by aaron @ 3/14/2009 8:59 AM
 2009-05-13 06:03:54 +01:00