olly
6b4ea7b83e
merge
2013-08-08 15:48:10 +02:00
expo
da71cca22f
Prospecting guide and images and few minor other things.
2013-08-01 17:00:01 +02:00
wookey
5c945e3431
Put correct user for mysql on seagrass back into config (It was accidentally overwritten in recent changes)
2013-07-06 09:28:39 +01:00
Wookey
ba5bc365c1
merge support for django 1.2 location for auth module
2013-07-02 21:12:59 +01:00
Wookey
c362b1b529
3rd attempt at getting the right syntax for the CSRF protection in
2013-07-02 21:11:07 +01:00
Wookey
f90b6dc7ab
update location of auth module for django 1.4
2013-07-02 21:10:30 +01:00
wookey
a6a9016548
Add support for old and new (1.4 on) location for auth module.
2013-07-02 21:05:48 +01:00
Wookey
5351108ec1
merged in proper CSRF changes from server
2013-07-02 20:23:55 +01:00
Wookey
7759e481d4
Change database syntax to modern format as old style no longer
...
supported in django 1.4
2013-07-02 18:13:27 +01:00
Wookey
69c3a06c98
Remove support for django 1.0 CSRF as we only care about 1.2 or later
2013-07-02 18:12:18 +01:00
Wookey
d1ad8730d7
Add CSRF protection to registration form (and remove annoying second
...
password)
2013-07-02 18:10:45 +01:00
wookey
f3a570a21d
Add csrf token to registration forms
2013-07-02 17:26:35 +01:00
Wookey
f626d3304d
parsing_log should not be saved in the vcs
2013-07-02 00:49:07 +01:00
Wookey
7eb4c89bf0
Don't explode if a master survex file is not found for a directory -
...
that shouldn't cause total failure to read the database in.
2013-07-02 00:47:42 +01:00
wookey
9435be0f19
Add 'people' option to DatabaseReset.py, to read in just the folk list after update.
...
Not sure that it actually works mind...
2013-07-02 00:34:58 +01:00
wookey
7f108f6d9a
Set title to show 1976-2013
...
Put quick link to 2011 back as that one works
2013-07-02 00:33:53 +01:00
wookey
3f98470af8
Add a function for running people parser
...
And comments on how logbooks can't be read in until 'year' exists in database
2013-06-25 15:59:19 +01:00
wookey
e58b69782c
Add note on how to create a new year in troggle.
2013-06-25 15:56:19 +01:00
wookey
e49e22b37c
Removed asserts which meant that if any 'odd' .svx files, or directories
...
with no obvious 'controlling' svx file, were added to the dataset then the
survex viewer code exploded and the website didn't work.
It's wrong that adding a new cave with an oddly-named .svx file can break
the website in this way, so these asserts are wrong.
2013-06-24 23:32:12 +01:00
wookey
82e69b4f05
Add parsing_log.txt to the files ignored by the VCS.
2013-06-24 23:29:14 +01:00
wookey
ea9266ecf9
Add help command and usage info to databaseReset.py
2013-06-24 01:31:14 +01:00
wookey
99ea6778ad
Add comment to identifycavedir function
...
and remove now-disused special-case filename
2013-06-24 01:30:17 +01:00
wookey
ccd80e74f8
Change template headers to show 2012/2013 as shortcuts
2013-06-23 03:19:41 +01:00
Wookey
3057d2a232
Add checking for compass too
...
Only print filenames on error by default
2013-05-22 02:33:47 +01:00
Wookey
d1ac659d4f
Add error check in place where parser died
2013-05-22 02:10:58 +01:00
wookey
bb1989d0f0
Add some exception checking to parsers/caves.py so that missing entrance
...
slugs don't blow up the import. Also reduce the noise, so
you just get a warning about missing slugs printed out
2012-09-24 23:23:38 +01:00
wookey
418e5e1d3f
Add debug for which entrance file was being read so we get a clue where to look when 'databasereset newcaves' falls over
2012-09-24 22:38:35 +01:00
Wookey
3b12e6d975
Add some debug to cave parser as it's easy to make it fail
...
e.g. by referring to slugs that don't exist.
2012-09-24 22:29:18 +01:00
expoonserver
54d7f1d097
Remove jgtfile URLs (presumably no longer needed)
2012-09-08 01:12:17 +01:00
Martin
cfc90deb83
Merge
2012-08-14 23:49:26 +02:00
Martin
1a0e577606
Bug fixing of cave and entrance forms removal of slugs
2012-08-14 22:51:15 +02:00
Martin
a05fe94d90
ignore files ending in ~
2012-08-14 15:31:34 +02:00
Martin
8e64062214
added entrance locations
2012-08-14 15:08:08 +02:00
Martin
8c1882eec8
fixed spelling
2012-08-14 15:06:18 +02:00
Martin
8dd51096cf
allow extensions to be capatalised
2012-08-14 15:05:15 +02:00
expo
ecd5bbcb1d
Started removing foreignkeys to caves, to achieve greater flexability. Some log book entries stuff may be broken. Add ability to make new caves and entrances via website.
2012-08-12 19:10:23 +02:00
Martin Green
6d5babd331
Prospecting template
2012-08-10 19:34:44 +02:00
Martin Green
79b7d32664
Made a prospecting guide and fixed survex station description. Removed parsing of underground descriptions to wikis.
2012-08-10 19:02:13 +02:00
expo
dd66ad835a
Fixed directory names for the survey scans such that surveys could be found. It did not seem possible to simply change the localsettings.py file to get it to work.
2012-08-08 11:29:15 +02:00
expo
a29fd964bd
Prevent modification of auto generated files
2012-08-06 12:56:20 +02:00
expo
1ef274ec1d
Editing no longer changes files more than nesecary. Removed TinyMCE editing. /Sumbit/Submit
2012-08-06 12:19:48 +02:00
expo
0f5627505f
Fix broken markup
2012-08-05 21:37:46 +02:00
expo
c0782e1cca
Fixed cave order
2012-08-05 19:28:34 +02:00
expo
ed1d273e03
Fixed cave order
2012-08-05 19:26:24 +02:00
expo
9654e5da1c
FIx base template so admin link, expoweb link work and use consistent base URL
2012-08-05 02:33:48 +02:00
expo
8040b746b4
Note that the instructions for adding a survey are all wrong.
2012-08-05 00:35:02 +02:00
expo
05004aa874
Fix up parser paths so everything is found
2012-08-05 00:26:05 +02:00
Martin Green
4a21720745
Merge
2012-06-10 17:24:10 +01:00
Martin Green
13cb2e9b0f
no need to export to cavetab2 anymore
2012-06-10 17:22:50 +01:00
ExpoOnServer
0259947cda
merge
2012-06-10 17:21:26 +01:00
