julian
c4c1520b64
[svn r8224] made index of people
2009-01-24 19:26:49 +01:00
julian
c5e59200b3
[svn r8223] Added links to front page
...
Add names for views in order to link from the main page
2009-01-24 16:11:44 +01:00
julian
a38de9b7eb
[svn r8222] move qm to ;later
2009-01-24 15:07:36 +01:00
julian
7d9ec8009a
[svn r8221] merge the trip table to have surveys by date
2009-01-24 15:01:59 +01:00
aaron
841944d564
[svn r8210] calendar.html used django 1.1 {% empty %} syntax, but older version on server so I had to change it
2009-01-20 06:36:45 +01:00
aaron
a8d5cecac9
[svn r8209] fix links
2009-01-20 06:16:27 +01:00
aaron
1df7532d79
[svn r8208] wrong comment syntax
2009-01-19 23:08:35 +01:00
aaron
b49acc3fcc
[svn r8207] Allow viewing of more than one survey stage at once. Also, make images float nicely but not escape content div.
2009-01-19 20:30:23 +01:00
aaron
83543ee301
[svn r8206] another import statement that caused errors on framos.lawoftheland. does work find on my machine though. Wonder what the difference is.
2009-01-19 18:59:30 +01:00
aaron
49647e5bcc
[svn r8205] fixed broken import statement
2009-01-19 18:51:10 +01:00
aaron
2b4dac2ff2
[svn r8202] Fixed up calendar with estimated dates from logbook.
2009-01-19 09:28:59 +01:00
aaron
a708accb80
[svn r8201] Survey table improvements, added calendar to urls
2009-01-19 08:19:07 +01:00
aaron
76469fdd42
[svn r8200] CSS for use when using lefthand navigation menu. Not sure if this will be used by all templates eventually.
2009-01-19 07:56:28 +01:00
julian
9b63d62368
[svn r8199] survey block object
2009-01-19 01:22:54 +01:00
julian
b4cd4097a6
[svn r8191] Added os.path.isDir prior to os.listdir. Otherwise Julians server
...
through lots of errors. No idea why
2009-01-18 22:08:40 +01:00
julian
7d1c2b6615
[svn r8190] MOre work on abstracting the file locations on scanned survey notes
2009-01-18 22:04:00 +01:00
julian
2f0eb4f25f
[svn r8189] new person expedition
2009-01-18 20:50:30 +01:00
julian
0701ce3ee2
[svn r8187] Got rid of data relating to specific machines
2009-01-18 19:15:06 +01:00
julian
3dbd762944
[svn r8186] Made the url file lookup work
2009-01-18 19:14:15 +01:00
julian
dfbdb46a1b
[svn r8185] changed import to work one level lower
2009-01-18 18:20:45 +01:00
julian
b19fb42427
[svn r8184] modified import to take it down a level
2009-01-18 18:18:34 +01:00
julian
8663062bad
[svn r8183] modified import settings to import troggle.settings as settings
2009-01-18 18:12:41 +01:00
julian
ffe7d51c40
[svn r8182] Changes to file abstraction, that seemed to make it work by magic
2009-01-18 18:07:01 +01:00
julian
918dbf3250
[svn r8180] Julian playing with the logbooks and expoyears
2009-01-18 16:59:37 +01:00
aaron
0fe420d711
[svn r8175]
2009-01-18 05:42:54 +01:00
aaron
c72fa16090
[svn r8174] Beginnings of expo calendar
2009-01-18 02:15:34 +01:00
julian
8f817b424e
[svn r8173] Continued file abstracted work, to get survey files from either hard disk or the web.
2009-01-18 01:45:56 +01:00
julian
cbb1acd1b4
[svn r8172] 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
2009-01-18 00:25:59 +01:00
julian
22b7620253
[svn r8171] Converted screen output display to ASCII, so that I could run the script
...
via SSH on a server
2009-01-17 21:36:14 +01:00
julian
820564de79
[svn r8170] Changed admin media prefix and enabled smart slash adding
2009-01-17 21:35:13 +01:00
julian
309d706bd7
[svn r8169] julian's quick makework and index page
2009-01-17 20:46:05 +01:00
julian
c538cc7e95
[svn r8168] aaron changes
2009-01-17 18:49:29 +01:00
aaron
93197231cf
[svn r8167] Fix double / error
2009-01-17 09:11:45 +01:00
aaron
47060929b5
[svn r8166]
2009-01-17 08:52:51 +01:00
aaron
82598eacd6
[svn r8165]
2009-01-17 08:44:39 +01:00
aaron
1316f7657f
[svn r8164] Got rid of ugly old design; brought in ugly new design. This one works a little better, still needs a lot of work.
2009-01-17 08:11:01 +01:00
aaron
014f390100
[svn r8163] More work on survey images parser and virtual survey binder. Renamed expedition_year field of Survey model to expedition because this makes more sense.
2009-01-16 20:50:23 +01:00
aaron
246bb42545
[svn r8162]
2009-01-16 03:47:39 +01:00
aaron
03f4046e61
[svn r8161] randSent is unnecessary and causing problems
2009-01-16 03:44:39 +01:00
aaron
f3bd6169ab
[svn r8160]
2009-01-16 03:41:47 +01:00
aaron
8edaff3045
[svn r8159] randomLogbookSentance.py renamed to randSent.py, and expanded
2009-01-16 03:40:58 +01:00
aaron
e543df8b83
[svn r8158] same mistake
2009-01-16 03:21:46 +01:00
aaron
73d73a8a41
[svn r8157]
2009-01-16 03:19:09 +01:00
aaron
7ef80e36a3
[svn r8156] Added a line to call the parser for surveys.csv and the scanned images.
2009-01-16 00:25:36 +01:00
aaron
0404030f87
[svn r8155] Added some actual funtionality to virtual survey binder.
2009-01-16 00:21:55 +01:00
aaron
95d6ae7011
[svn r8154] Whoops, commented out lines with were just for my local debugging.
2009-01-15 20:32:41 +01:00
aaron
db1eab0c25
[svn r8153] Forgot this in the last checkout. It's the template for the virtual survey binder.
2009-01-15 07:25:09 +01:00
aaron
083b5a3f1d
[svn r8152] 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.
2009-01-15 07:22:54 +01:00
aaron
96288429f3
[svn r8151] Undo some changes that were only meant for my local use.
2009-01-07 05:50:55 +01:00
aaron
785a130d0c
[svn r8150] 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.
2009-01-04 15:06:01 +01:00
