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

44 Commits

Author SHA1 Message Date
substantialnoninfringinguser
eb431eb5c9 [svn] Fixed up calendar with estimated dates from logbook. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8202 by aaron @ 1/19/2009 8:28 AM
 2009-05-13 05:40:56 +01:00
substantialnoninfringinguser
0ba4dd4ef4 [svn] survey block object 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8199 by julian @ 1/19/2009 12:22 AM
 2009-05-13 05:39:52 +01:00
substantialnoninfringinguser
39ab4d2514 [svn] Added os.path.isDir prior to os.listdir. Otherwise Julians server 
through lots of errors.  No idea why

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8191 by julian @ 1/18/2009 9:08 PM
 2009-05-13 05:39:05 +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
0f5109cb09 [svn] new person expedition 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8189 by julian @ 1/18/2009 7:50 PM
 2009-05-13 05:38:18 +01:00
substantialnoninfringinguser
0f15fd2012 [svn] Made the url file lookup work 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8186 by julian @ 1/18/2009 6:14 PM
 2009-05-13 05:37:24 +01:00
substantialnoninfringinguser
7f159a283a [svn] Changes to file abstraction, that seemed to make it work by magic 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8182 by julian @ 1/18/2009 5:07 PM
 2009-05-13 05:36:17 +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
b950ee70f7 [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8175 by aaron @ 1/18/2009 4:42 AM
 2009-05-13 05:35:29 +01:00
substantialnoninfringinguser
cda0a7a5e1 [svn] Beginnings of expo calendar 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8174 by aaron @ 1/18/2009 1:15 AM
 2009-05-13 05:35:11 +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
e46c8d098b [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8165 by aaron @ 1/17/2009 7:44 AM
 2009-05-13 05:32:01 +01:00
substantialnoninfringinguser
b2366cfe11 [svn] Got rid of ugly old design; brought in ugly new design. This one works a little better, still needs a lot of work. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8164 by aaron @ 1/17/2009 7:11 AM
 2009-05-13 05:31:44 +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
ba5ed9fd42 [svn] randSent is unnecessary and causing problems 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8161 by aaron @ 1/16/2009 2:44 AM
 2009-05-13 05:30:41 +01:00
substantialnoninfringinguser
7a9dc007be [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8160 by aaron @ 1/16/2009 2:41 AM
 2009-05-13 05:30:20 +01:00
substantialnoninfringinguser
5e5985376a [svn] randomLogbookSentance.py renamed to randSent.py, and expanded 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8159 by aaron @ 1/16/2009 2:40 AM
 2009-05-13 05:30:04 +01:00
substantialnoninfringinguser
1190c54e13 [svn] same mistake 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8158 by aaron @ 1/16/2009 2:21 AM
 2009-05-13 05:29:47 +01:00
substantialnoninfringinguser
f3db37711f [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8157 by aaron @ 1/16/2009 2:19 AM
 2009-05-13 05:29:31 +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
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
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
f525235e94 [svn] Fix plurals because they're starting to get on my nerves! 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8095 by aaron @ 12/31/2008 5:07 PM
 2009-05-13 05:25:39 +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
ebbebfd81d [svn] Fix settings reference. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8089 by aaron @ 12/9/2008 8:49 AM
 2009-05-13 05:23:48 +01:00
substantialnoninfringinguser
315a4ce2c7 [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8083 by aaron @ 12/8/2008 5:17 AM
 2009-05-13 05:22:38 +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
469a520e5c [svn] Generalised the way dates are stored, and added a personRole and Role field 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8079 by julian @ 11/8/2008 11:27 PM
 2009-05-13 05:21:39 +01:00
substantialnoninfringinguser
5757df28a1 [svn] Added survex persons to admin site 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8078 by julian @ 11/8/2008 11:24 PM
 2009-05-13 05:21:27 +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
71b9468677 [svn] Use URL_ROOT for links 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8074 by julian @ 11/7/2008 9:12 AM
 2009-05-13 05:20:43 +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
f5ddbafcb0 [svn] Wiki_markup imporved to include paragraphs 
wiki_to_html should be used when the field will include paragraphs
wiki_to_html_short should be used when the field will not include paragraphs
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8061 by julian @ 11/6/2008 11:24 PM
 2009-05-13 05:18:26 +01:00
substantialnoninfringinguser
64f0b54275 [svn] Added date field 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8053 by julian @ 11/2/2008 11:15 PM
 2009-05-13 05:17:06 +01:00
substantialnoninfringinguser
7ddc730ad0 [svn] Increased maximum length of some of the fields to fit with the cavetab data 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8050 by julian @ 11/2/2008 11:10 PM
 2009-05-13 05:16:33 +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
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
dde16108dd [svn] This file was created on Seagrass, but it looks like someone forgot to add it to the repo so I SCP'd it to my laptop and added it. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8040 by aaron @ 10/27/2008 6:04 PM
 2009-05-13 05:14:51 +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
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