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

312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
substantialnoninfringinguser
cb52c47aa9 [svn] yorkshire work with tunnel integration 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8232 by julian @ 1/29/2009 11:40 PM
 2009-05-13 05:48:47 +01:00
substantialnoninfringinguser
ed345f2576 [svn] Add user registration and user profiles. 
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
 2009-05-13 05:48:10 +01:00
substantialnoninfringinguser
cdd4e685ee [svn] cave maps to all logbook entry trips done there 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8228 by julian @ 1/24/2009 11:59 PM
 2009-05-13 05:46:12 +01:00
substantialnoninfringinguser
84e9cc3396 [svn] Template update to use wiki_to_html_short 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8227 by julian @ 1/24/2009 7:40 PM
 2009-05-13 05:45:44 +01:00
substantialnoninfringinguser
efd4708526 [svn] I initial work at adding caveareas. (Descirprion of parts of caves) 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8226 by julian @ 1/24/2009 6:49 PM
 2009-05-13 05:45:26 +01:00
substantialnoninfringinguser
98a3d44eed [svn] fix martins front page links 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8225 by julian @ 1/24/2009 6:36 PM
 2009-05-13 05:45:01 +01:00
substantialnoninfringinguser
264594ed05 [svn] made index of people 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8224 by julian @ 1/24/2009 6:26 PM
 2009-05-13 05:44:35 +01:00
substantialnoninfringinguser
1e1453f443 [svn] Added links to front page 
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
 2009-05-13 05:44:01 +01:00
substantialnoninfringinguser
b6f1f182f5 [svn] move qm to ;later 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8222 by julian @ 1/24/2009 2:07 PM
 2009-05-13 05:43:43 +01:00
substantialnoninfringinguser
60735a9b3a [svn] merge the trip table to have surveys by date 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8221 by julian @ 1/24/2009 2:01 PM
 2009-05-13 05:43:20 +01:00
substantialnoninfringinguser
6598dd5105 [svn] calendar.html used django 1.1 {% empty %} syntax, but older version on 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
 2009-05-13 05:42:57 +01:00
substantialnoninfringinguser
6947e43caf [svn] fix links 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8209 by aaron @ 1/20/2009 5:16 AM
 2009-05-13 05:42:40 +01:00
substantialnoninfringinguser
f7a8e95634 [svn] wrong comment syntax 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8208 by aaron @ 1/19/2009 10:08 PM
 2009-05-13 05:42:18 +01:00
substantialnoninfringinguser
82e50d5199 [svn] Allow viewing of more than one survey stage at once. Also, make images 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
 2009-05-13 05:42:01 +01:00
substantialnoninfringinguser
dcc7825547 [svn] another import statement that caused errors on framos.lawoftheland. 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
 2009-05-13 05:41:42 +01:00
substantialnoninfringinguser
b707c31e28 [svn] fixed broken import statement 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8205 by aaron @ 1/19/2009 5:51 PM
 2009-05-13 05:41:17 +01:00
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
aeef470c6d [svn] Survey table improvements, added calendar to urls 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8201 by aaron @ 1/19/2009 7:19 AM
 2009-05-13 05:40:35 +01:00
substantialnoninfringinguser
8de2573385 [svn] CSS for use when using lefthand navigation menu. Not sure if this will 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
 2009-05-13 05:40:13 +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
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
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
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
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
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