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

2482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
ecc4e1dc13 [svn] Changed admin media prefix and enabled smart slash adding 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8170 by julian @ 1/17/2009 8:35 PM
 2009-05-13 05:33:57 +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
4fe4f8e578 [svn] aaron changes 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8168 by julian @ 1/17/2009 5:49 PM
 2009-05-13 05:33:09 +01:00
substantialnoninfringinguser
aa0b14de5f [svn] Fix double / error 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8167 by aaron @ 1/17/2009 8:11 AM
 2009-05-13 05:32:45 +01:00
substantialnoninfringinguser
4c660b423e [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8166 by aaron @ 1/17/2009 7:52 AM
 2009-05-13 05:32:19 +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
67f24d76ae [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8162 by aaron @ 1/16/2009 2:47 AM
 2009-05-13 05:30:59 +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
93cd18e40d [svn] Added a line to call the parser for surveys.csv and the scanned images. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8156 by aaron @ 1/15/2009 11:25 PM
 2009-05-13 05:29:13 +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
14b00d2382 [svn] Forgot this in the last checkout. It's the template for the virtual survey binder. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8153 by aaron @ 1/15/2009 6:25 AM
 2009-05-13 05:28:14 +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
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
1d8f647699 [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8092 by aaron @ 12/9/2008 6:58 PM
 2009-05-13 05:24:21 +01:00
substantialnoninfringinguser
3d7a5b15ad [svn] undo stupid change 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8091 by aaron @ 12/9/2008 6:51 PM
 2009-05-13 05:24:10 +01:00
substantialnoninfringinguser
17ae38f109 [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8090 by aaron @ 12/9/2008 5:45 PM
 2009-05-13 05:23:59 +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
35100c906a [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8088 by aaron @ 12/9/2008 8:02 AM
 2009-05-13 05:23:37 +01:00
substantialnoninfringinguser
89ea3a5106 [svn] Try and sort out settings mess. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8087 by aaron @ 12/9/2008 4:48 AM
 2009-05-13 05:23:25 +01:00
substantialnoninfringinguser
2aeabf14c1 [svn] whoops, no slash 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8086 by aaron @ 12/9/2008 2:05 AM
 2009-05-13 05:23:13 +01:00
substantialnoninfringinguser
5867432965 [svn] Trying to fix framos troggle 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8085 by aaron @ 12/9/2008 2:01 AM
 2009-05-13 05:23:02 +01:00
substantialnoninfringinguser
ac097cb2d0 [svn] Forgot to add cave and logbook search templates in earlier commit. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8084 by aaron @ 12/9/2008 1:31 AM
 2009-05-13 05:22:51 +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
c06585b3e8 [svn] Remove MEDIA_ROOT from settings.py because it belongs in local settings, and comment out urlconf line for unfinished edit form which I haven't checked in. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8082 by aaron @ 12/8/2008 5:10 AM
 2009-05-13 05:22:26 +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
47604b1db2 [svn] Replace "django" with "troggle" in admin 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8080 by aaron @ 12/7/2008 10:18 PM
 2009-05-13 05:21:51 +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
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
5e6bf2436d [svn] Removed troggle from urls 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8075 by julian @ 11/8/2008 3:37 PM
 2009-05-13 05:20:53 +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
683534393f [svn] Added URL_ROOT to local settings 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8073 by julian @ 11/7/2008 9:10 AM
 2009-05-13 05:20:31 +01:00
substantialnoninfringinguser
730e88dc0e [svn] add local settings files 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8072 by julian @ 11/7/2008 9:09 AM
 2009-05-13 05:20:20 +01:00