expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-25 08:41:51 +00:00
Code Issues 19 Projects 3 Activity
2,819 Commits 7 Branches 0 Tags 34 MiB
d970942f04
Commit Graph

742 Commits

Author SHA1 Message Date
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
0bfdc62d70 [svn] changed import to work one level lower 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8185 by julian @ 1/18/2009 5:20 PM
 2009-05-13 05:37:08 +01:00
substantialnoninfringinguser
db523ed603 [svn] modified import to take it down a level 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8184 by julian @ 1/18/2009 5:18 PM
 2009-05-13 05:36:53 +01:00
substantialnoninfringinguser
91b68aef0d [svn] modified import settings to import troggle.settings as settings 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8183 by julian @ 1/18/2009 5:12 PM
 2009-05-13 05:36:33 +01:00
substantialnoninfringinguser
f229ff35f9 [svn] Julian playing with the logbooks and expoyears 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8180 by julian @ 1/18/2009 3:59 PM
 2009-05-13 05:35:59 +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
a366161a24 [svn] Converted screen output display to ASCII, so that I could run the script 
via SSH on a server

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8171 by julian @ 1/17/2009 8:36 PM
 2009-05-13 05:34:14 +01:00
substantialnoninfringinguser
8d13864181 [svn] julian's quick makework and index page 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8169 by julian @ 1/17/2009 7:46 PM
 2009-05-13 05:33:29 +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
substantialnoninfringinguser
95a08ffbd9 [svn] Undo some changes that were only meant for my local use. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8151 by aaron @ 1/7/2009 4:50 AM
 2009-05-13 05:26:51 +01:00
substantialnoninfringinguser
b7bf1b37ac [svn] Added new photo model. 
Logbook parser now looks for mugshots when adding people. If it finds an image, it adds a new photo model instance linked to that person. If it finds an html page, it adds the body text of that page as the person's "blurb" and then adds the mugshot.

My interface web design isn't working, sorry. Need a blank slate on that one.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8150 by aaron @ 1/4/2009 2:06 PM
 2009-05-13 05:26:14 +01:00
substantialnoninfringinguser
7aee3fb920 [svn] QM parser now parses Hauchhoehle QMs.py 
Photo model added.

Logbook parser now puts mugshots in as photo models, and descriptions from the old folk html pages in as "blurbs" on the person model.

Experimented with eye candy and a random logbook quote generator.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8094 by aaron @ 12/31/2008 2:59 AM
 2009-05-13 05:25:17 +01:00
substantialnoninfringinguser
8c818906b5 [svn] Added QM model and parser. Had to merge models_cave.py and models_logbooks.py into models.py. This is because logbook entries now have an optional foreign key to caves, and QMs have a required foreign key to a logbook entry of the trip that created them. So, the two files became circularly dependent. 
Also, the urls for the person model now allow lookups using their actual first and last name in the url instead of the primary key. We should do similar things for all models, maybe even using the url as a search which results in a page with multiple model instance results if the input is ambiguous (e.g. they only enter a first name).
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8093 by aaron @ 12/13/2008 11:17 PM
 2009-05-13 05:24:37 +01:00
substantialnoninfringinguser
29984ff15a [svn] Added cave and logbook search, collapsible footer navbar, useless statistics page. Also fixed broken css. Toying with forms but not committing those yet. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8081 by aaron @ 12/8/2008 4:28 AM
 2009-05-13 05:22:14 +01:00
substantialnoninfringinguser
f02b288e4b [svn] *teams and *date identified and scrapped 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8077 by julian @ 11/8/2008 11:23 PM
 2009-05-13 05:21:16 +01:00
substantialnoninfringinguser
fa6bf04522 [svn] Djangoed Julians code 
added underscores to field names
turned __str__ to __unicode__
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8076 by julian @ 11/8/2008 6:24 PM
 2009-05-13 05:21:05 +01:00
substantialnoninfringinguser
a21b61e2b6 [svn] convert unfound files to lower case and try again 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8071 by julian @ 11/7/2008 8:55 AM
 2009-05-13 05:20:08 +01:00
substantialnoninfringinguser
0b9afdd0e7 [svn] going back now works 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8069 by julian @ 11/7/2008 2:31 AM
 2009-05-13 05:19:57 +01:00
substantialnoninfringinguser
9c75c35ed4 [svn] going back now works 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8068 by julian @ 11/7/2008 2:30 AM
 2009-05-13 05:19:44 +01:00
substantialnoninfringinguser
a9161e791a [svn] remove nonasc 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8067 by julian @ 11/7/2008 2:25 AM
 2009-05-13 05:19:31 +01:00
substantialnoninfringinguser
1f8f972b13 [svn] quick 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8066 by julian @ 11/7/2008 2:09 AM
 2009-05-13 05:19:18 +01:00
substantialnoninfringinguser
a8ad3a3b1e [svn] long putting in 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8065 by julian @ 11/7/2008 2:08 AM
 2009-05-13 05:19:07 +01:00
substantialnoninfringinguser
b33061a3ce [svn] Converted <p> tags to wiki style "\n\n" 
Tidied header
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8063 by julian @ 11/6/2008 11:29 PM
 2009-05-13 05:18:49 +01:00
substantialnoninfringinguser
13d44fe647 [svn] forgotten 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8059 by julian @ 11/6/2008 9:29 PM
 2009-05-13 05:18:07 +01:00
substantialnoninfringinguser
3caae604b3 [svn] Moved up a directory 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8056 by julian @ 11/2/2008 11:19 PM
 2009-05-13 05:17:37 +01:00
substantialnoninfringinguser
936eab2844 [svn] Removed last of the sqlite save hack 
Started to add reading of dates
Changed character encoding code so it works
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8054 by julian @ 11/2/2008 11:17 PM
 2009-05-13 05:17:16 +01:00
substantialnoninfringinguser
33fad37eb0 [svn] Removed last of the sqlite save hack 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8051 by julian @ 11/2/2008 11:13 PM
 2009-05-13 05:16:44 +01:00
substantialnoninfringinguser
cbf6be7990 [svn] more parsing back to 2002 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8047 by julian @ 10/31/2008 2:43 PM
 2009-05-13 05:16:11 +01:00
substantialnoninfringinguser
32e1e6b9ab [svn] make the person logbooks work 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8044 by julian @ 10/30/2008 1:13 PM
 2009-05-13 05:15:49 +01:00
substantialnoninfringinguser
01073863f3 [svn] Add Martin's reset script 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8043 by aaron @ 10/29/2008 7:35 AM
 2009-05-13 05:15:31 +01:00
substantialnoninfringinguser
01cd961229 [svn] Add QM model. Note that I had to put models_logbook into models cave because it referred to models from both. Will try to split them back up, should be possible. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8042 by aaron @ 10/28/2008 10:21 PM
 2009-05-13 05:15:20 +01:00
substantialnoninfringinguser
f5d3c9d281 [svn] Fix edit conflict screwup 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8041 by aaron @ 10/27/2008 6:12 PM
 2009-05-13 05:15:05 +01:00
substantialnoninfringinguser
0e8c7af706 [svn] parsing of 2007 logbook. still problems 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8039 by julian @ 10/27/2008 2:03 AM
 2009-05-13 05:14:41 +01:00
substantialnoninfringinguser
18f6731b5b [svn] add personindex templates 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8038 by julian @ 10/27/2008 12:36 AM
 2009-05-13 05:14:28 +01:00
substantialnoninfringinguser
281e897a38 [svn] Commented out sqlite reference for use on other databases 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8037 by aaron @ 10/27/2008 12:01 AM
 2009-05-13 05:14:13 +01:00
substantialnoninfringinguser
a33700ca1e [svn] we can parse one 2004 logbook in here. corrections made to folk.csv 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8036 by julian @ 10/26/2008 11:27 PM
 2009-05-13 05:14:03 +01:00
substantialnoninfringinguser
302f4a1a0f [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8035 by julian @ 10/26/2008 9:46 PM
 2009-05-13 05:13:51 +01:00
substantialnoninfringinguser
b503d3d588 [svn] Initial troggle checkin 
This is a development site using Django 1.0
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8034 by julian @ 10/26/2008 9:04 PM
 2009-05-13 05:13:38 +01:00