xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity
292 Commits 8 Branches 0 Tags 18 MiB
24d90bae75
Commit Graph

24 Commits

Author SHA1 Message Date
goatchurch
24d90bae75 make 2008 logbook correctly parse 2009-09-14 22:52:46 +01:00
goatchurch
517d291636 able to save sketches up from tunnel 2009-09-13 17:27:46 +01:00
goatchurch
12cf3a6d53 tunnelfiles scheme added 2009-09-11 23:56:47 +01:00
goatchurch
ece3b79e5d survey scans features added 2009-09-10 22:07:31 +01:00
expo
65cebce198 get rid of photo 2009-08-29 18:08:55 +01:00
substantialnoninfringinguser
83fa1ea9ac [svn] Brief code cleanup. 2009-07-03 05:31:49 +01:00
substantialnoninfringinguser
e565a6b73b [svn] Renaming troggle.expo to troggle.core. To do this, used: 
perl -p -i -e "s/expo(?=[\s\.']+)/core/g" `find -name \*.py`

and then manually checked each change (had to remove a couple)
 2009-07-02 20:43:18 +01:00
substantialnoninfringinguser
b774c42333 [svn] switched from dodgy manually writing to logfile to using python's logging module, which seems great 2009-05-22 06:17:24 +01:00
substantialnoninfringinguser
54a62999c0 [svn] Updates to allow subcave tree with nice admin. 2009-05-21 19:47:19 +01:00
substantialnoninfringinguser
9c1e978da2 [svn] 2009-05-19 06:32:42 +01:00
substantialnoninfringinguser
a4212632b2 [svn] Make the workaround to avoid parsing interlaced pngs actually work (see issue # 14) 2009-05-15 03:56:11 +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
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
e8da6b9b8b [svn] Further attempts to make troggle work on windows using surveys stored 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
 2009-05-13 05:58:18 +01:00
substantialnoninfringinguser
25b695e53d [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8245 by aaron @ 2/17/2009 1:09 AM
 2009-05-13 05:52:59 +01:00
substantialnoninfringinguser
d25fd97864 [svn] My crusade to make our project more Djangoic. 
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
 2009-05-13 05:52:15 +01:00
substantialnoninfringinguser
99ab1e22e9 [svn] MOre work on abstracting the file locations on scanned survey notes 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8190 by julian @ 1/18/2009 9:04 PM
 2009-05-13 05:38:37 +01:00
substantialnoninfringinguser
da154a736b [svn] Got rid of data relating to specific machines 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8187 by julian @ 1/18/2009 6:15 PM
 2009-05-13 05:37:41 +01:00
substantialnoninfringinguser
b66189bc9e [svn] Continued file abstracted work, to get survey files from either hard 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
 2009-05-13 05:34:52 +01:00
substantialnoninfringinguser
832f1f53c6 [svn] Modifications to allow survey files to be pulled from another server. 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
 2009-05-13 05:34:33 +01:00
substantialnoninfringinguser
f02c91901c [svn] More work on survey images parser and virtual survey binder. Renamed 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
 2009-05-13 05:31:21 +01:00
substantialnoninfringinguser
7c0791973b [svn] Added some actual funtionality to virtual survey binder. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8155 by aaron @ 1/15/2009 11:21 PM
 2009-05-13 05:28:57 +01:00
substantialnoninfringinguser
0ec2b1c4f2 [svn] Whoops, commented out lines with were just for my local debugging. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8154 by aaron @ 1/15/2009 7:32 PM
 2009-05-13 05:28:35 +01:00
substantialnoninfringinguser
c6cce8d2fe [svn] Add beginnings of virtual survey binder: new Survey and ScannedImage 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
 2009-05-13 05:27:43 +01:00