summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [svn] Add user registration and user profiles.substantialnoninfringinguser2009-05-1373-11/+3173
| | | | | | | | | Used modified versions of django-registration and django-profiles , both on bitbucket. The Person model is now set up as the profile for auth.User s. I set up a requestcontext so that settings is automatically passed to every template, no need to repeat ourselves in views. However, this needs to be refined: I will soon change it to only pass a subset of settings. E.G. we do not need to be passing the DB login and password! Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8231 by aaron @ 1/29/2009 11:02 PM
* [svn] cave maps to all logbook entry trips done theresubstantialnoninfringinguser2009-05-1313-158/+224
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8228 by julian @ 1/24/2009 11:59 PM
* [svn] Template update to use wiki_to_html_shortsubstantialnoninfringinguser2009-05-132-5/+5
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8227 by julian @ 1/24/2009 7:40 PM
* [svn] I initial work at adding caveareas. (Descirprion of parts of caves)substantialnoninfringinguser2009-05-137-27/+56
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8226 by julian @ 1/24/2009 6:49 PM
* [svn] fix martins front page linkssubstantialnoninfringinguser2009-05-133-4/+5
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8225 by julian @ 1/24/2009 6:36 PM
* [svn] made index of peoplesubstantialnoninfringinguser2009-05-1310-53/+61
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8224 by julian @ 1/24/2009 6:26 PM
* [svn] Added links to front pagesubstantialnoninfringinguser2009-05-132-7/+12
| | | | | Add names for views in order to link from the main page Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8223 by julian @ 1/24/2009 3:11 PM
* [svn] move qm to ;latersubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8222 by julian @ 1/24/2009 2:07 PM
* [svn] merge the trip table to have surveys by datesubstantialnoninfringinguser2009-05-138-40/+140
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8221 by julian @ 1/24/2009 2:01 PM
* [svn] calendar.html used django 1.1 {% empty %} syntax, but older version on ↵substantialnoninfringinguser2009-05-132-5/+5
| | | | | | server so I had to change it Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8210 by aaron @ 1/20/2009 5:36 AM
* [svn] fix linkssubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8209 by aaron @ 1/20/2009 5:16 AM
* [svn] wrong comment syntaxsubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8208 by aaron @ 1/19/2009 10:08 PM
* [svn] Allow viewing of more than one survey stage at once. Also, make images ↵substantialnoninfringinguser2009-05-133-23/+52
| | | | | | float nicely but not escape content div. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8207 by aaron @ 1/19/2009 7:30 PM
* [svn] another import statement that caused errors on framos.lawoftheland. ↵substantialnoninfringinguser2009-05-131-1/+1
| | | | | | does work find on my machine though. Wonder what the difference is. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8206 by aaron @ 1/19/2009 5:59 PM
* [svn] fixed broken import statementsubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8205 by aaron @ 1/19/2009 5:51 PM
* [svn] Fixed up calendar with estimated dates from logbook.substantialnoninfringinguser2009-05-133-19/+38
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8202 by aaron @ 1/19/2009 8:28 AM
* [svn] Survey table improvements, added calendar to urlssubstantialnoninfringinguser2009-05-135-108/+73
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8201 by aaron @ 1/19/2009 7:19 AM
* [svn] CSS for use when using lefthand navigation menu. Not sure if this will ↵substantialnoninfringinguser2009-05-131-0/+10
| | | | | | be used by all templates eventually. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8200 by aaron @ 1/19/2009 6:56 AM
* [svn] survey block objectsubstantialnoninfringinguser2009-05-1320-31/+201
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8199 by julian @ 1/19/2009 12:22 AM
* [svn] Added os.path.isDir prior to os.listdir. Otherwise Julians serversubstantialnoninfringinguser2009-05-131-1/+1
| | | | | | 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
* [svn] MOre work on abstracting the file locations on scanned survey notessubstantialnoninfringinguser2009-05-133-7/+17
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8190 by julian @ 1/18/2009 9:04 PM
* [svn] new person expeditionsubstantialnoninfringinguser2009-05-1310-25/+122
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8189 by julian @ 1/18/2009 7:50 PM
* [svn] Got rid of data relating to specific machinessubstantialnoninfringinguser2009-05-131-13/+5
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8187 by julian @ 1/18/2009 6:15 PM
* [svn] Made the url file lookup worksubstantialnoninfringinguser2009-05-131-1/+6
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8186 by julian @ 1/18/2009 6:14 PM
* [svn] changed import to work one level lowersubstantialnoninfringinguser2009-05-131-2/+2
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8185 by julian @ 1/18/2009 5:20 PM
* [svn] modified import to take it down a levelsubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8184 by julian @ 1/18/2009 5:18 PM
* [svn] modified import settings to import troggle.settings as settingssubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8183 by julian @ 1/18/2009 5:12 PM
* [svn] Changes to file abstraction, that seemed to make it work by magicsubstantialnoninfringinguser2009-05-131-24/+31
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8182 by julian @ 1/18/2009 5:07 PM
* [svn] Julian playing with the logbooks and expoyearssubstantialnoninfringinguser2009-05-1314-220/+507
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8180 by julian @ 1/18/2009 3:59 PM
* [svn]substantialnoninfringinguser2009-05-133-32/+56
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8175 by aaron @ 1/18/2009 4:42 AM
* [svn] Beginnings of expo calendarsubstantialnoninfringinguser2009-05-133-2/+83
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8174 by aaron @ 1/18/2009 1:15 AM
* [svn] Continued file abstracted work, to get survey files from either hard ↵substantialnoninfringinguser2009-05-133-33/+43
| | | | | | 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
* [svn] Modifications to allow survey files to be pulled from another server. ↵substantialnoninfringinguser2009-05-133-6/+66
| | | | | | 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
* [svn] Converted screen output display to ASCII, so that I could run the scriptsubstantialnoninfringinguser2009-05-131-3/+5
| | | | | | 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
* [svn] Changed admin media prefix and enabled smart slash addingsubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8170 by julian @ 1/17/2009 8:35 PM
* [svn] julian's quick makework and index pagesubstantialnoninfringinguser2009-05-136-29/+56
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8169 by julian @ 1/17/2009 7:46 PM
* [svn] aaron changessubstantialnoninfringinguser2009-05-131-3/+6
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8168 by julian @ 1/17/2009 5:49 PM
* [svn] Fix double / errorsubstantialnoninfringinguser2009-05-131-2/+2
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8167 by aaron @ 1/17/2009 8:11 AM
* [svn]substantialnoninfringinguser2009-05-131-0/+12
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8166 by aaron @ 1/17/2009 7:52 AM
* [svn]substantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8165 by aaron @ 1/17/2009 7:44 AM
* [svn] Got rid of ugly old design; brought in ugly new design. This one works ↵substantialnoninfringinguser2009-05-136-348/+301
| | | | | | 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
* [svn] More work on survey images parser and virtual survey binder. Renamed ↵substantialnoninfringinguser2009-05-135-31/+146
| | | | | | 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
* [svn]substantialnoninfringinguser2009-05-131-2/+2
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8162 by aaron @ 1/16/2009 2:47 AM
* [svn] randSent is unnecessary and causing problemssubstantialnoninfringinguser2009-05-131-3/+3
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8161 by aaron @ 1/16/2009 2:44 AM
* [svn]substantialnoninfringinguser2009-05-131-24/+0
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8160 by aaron @ 1/16/2009 2:41 AM
* [svn] randomLogbookSentance.py renamed to randSent.py, and expandedsubstantialnoninfringinguser2009-05-131-0/+30
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8159 by aaron @ 1/16/2009 2:40 AM
* [svn] same mistakesubstantialnoninfringinguser2009-05-131-3/+0
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8158 by aaron @ 1/16/2009 2:21 AM
* [svn]substantialnoninfringinguser2009-05-132-12/+11
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8157 by aaron @ 1/16/2009 2:19 AM
* [svn] Added a line to call the parser for surveys.csv and the scanned images.substantialnoninfringinguser2009-05-131-1/+2
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8156 by aaron @ 1/15/2009 11:25 PM
* [svn] Added some actual funtionality to virtual survey binder.substantialnoninfringinguser2009-05-133-95/+138
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8155 by aaron @ 1/15/2009 11:21 PM