summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Document 'cavesnew' option in databasereset.py - which just reads inwookey2013-10-073-32/+14
| | | | caves datafiles.
* mergeolly2013-08-081-7/+5
|\
| * Put correct user for mysql on seagrass back into config (It was accidentally ↵wookey2013-07-061-7/+5
| | | | | | | | overwritten in recent changes)
* | Prospecting guide and images and few minor other things.expo2013-08-0111-50/+354
|/
* merge support for django 1.2 location for auth moduleWookey2013-07-021-1/+6
|\
| * Add support for old and new (1.4 on) location for auth module.wookey2013-07-021-1/+6
| |
* | 3rd attempt at getting the right syntax for the CSRF protection inWookey2013-07-022-9/+7
| |
* | update location of auth module for django 1.4Wookey2013-07-021-1/+1
| |
* | merged in proper CSRF changes from serverWookey2013-07-028-70/+58
|\ \ | |/ |/|
| * Change database syntax to modern format as old style no longerWookey2013-07-024-30/+42
| | | | | | | | supported in django 1.4
| * Remove support for django 1.0 CSRF as we only care about 1.2 or laterWookey2013-07-021-6/+1
| |
| * Add CSRF protection to registration form (and remove annoying secondWookey2013-07-023-22/+19
| | | | | | | | password)
| * parsing_log should not be saved in the vcsWookey2013-07-021-0/+1
| |
| * Don't explode if a master survex file is not found for a directory -Wookey2013-07-021-1/+1
| | | | | | | | that shouldn't cause total failure to read the database in.
* | Add csrf token to registration formswookey2013-07-023-10/+16
| |
* | Add 'people' option to DatabaseReset.py, to read in just the folk list after ↵wookey2013-07-021-0/+2
| | | | | | | | | | | | update. Not sure that it actually works mind...
* | Set title to show 1976-2013wookey2013-07-021-1/+2
| | | | | | | | Put quick link to 2011 back as that one works
* | Add a function for running people parserwookey2013-06-251-0/+4
| | | | | | | | And comments on how logbooks can't be read in until 'year' exists in database
* | Add note on how to create a new year in troggle.wookey2013-06-251-0/+5
| |
* | Removed asserts which meant that if any 'odd' .svx files, or directorieswookey2013-06-241-4/+14
| | | | | | | | | | | | | | | | 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.
* | Add parsing_log.txt to the files ignored by the VCS.wookey2013-06-241-0/+1
|/
* Add help command and usage info to databaseReset.pywookey2013-06-241-2/+21
|
* Add comment to identifycavedir functionwookey2013-06-241-1/+3
| | | | and remove now-disused special-case filename
* Change template headers to show 2012/2013 as shortcutswookey2013-06-232-8/+6
|
* Add checking for compass tooWookey2013-05-221-5/+13
| | | | Only print filenames on error by default
* Add error check in place where parser diedWookey2013-05-221-1/+7
|
* Add some exception checking to parsers/caves.py so that missing entrancewookey2012-09-241-11/+19
| | | | | slugs don't blow up the import. Also reduce the noise, so you just get a warning about missing slugs printed out
* Add debug for which entrance file was being read so we get a clue where to ↵wookey2012-09-241-1/+1
| | | | look when 'databasereset newcaves' falls over
* Add some debug to cave parser as it's easy to make it failWookey2012-09-241-0/+2
| | | | e.g. by referring to slugs that don't exist.
* Remove jgtfile URLs (presumably no longer needed)expoonserver2012-09-081-2/+2
|
* MergeMartin2012-08-148-24/+63
|\
| * Bug fixing of cave and entrance forms removal of slugsMartin2012-08-148-24/+63
| |
* | ignore files ending in ~Martin2012-08-141-0/+1
| |
* | added entrance locationsMartin2012-08-142-2/+8
| |
* | fixed spellingMartin2012-08-141-1/+1
| |
* | allow extensions to be capatalisedMartin2012-08-141-14/+14
|/
* Started removing foreignkeys to caves, to achieve greater flexability. Some ↵expo2012-08-1210-21/+79
| | | | log book entries stuff may be broken. Add ability to make new caves and entrances via website.
* Prospecting templateMartin Green2012-08-102-0/+82
|
* Made a prospecting guide and fixed survex station description. Removed ↵Martin Green2012-08-109-70/+85
| | | | parsing of underground descriptions to wikis.
* Fixed directory names for the survey scans such that surveys could be found. ↵expo2012-08-081-13/+13
| | | | It did not seem possible to simply change the localsettings.py file to get it to work.
* Prevent modification of auto generated filesexpo2012-08-061-0/+3
|
* Editing no longer changes files more than nesecary. Removed TinyMCE editing. ↵expo2012-08-068-37/+45
| | | | /Sumbit/Submit
* Fix broken markupexpo2012-08-051-2/+2
|
* Fixed cave orderexpo2012-08-051-2/+2
|
* Fixed cave orderexpo2012-08-051-2/+14
|
* FIx base template so admin link, expoweb link work and use consistent base URLexpo2012-08-052-8/+8
|
* Note that the instructions for adding a survey are all wrong.expo2012-08-051-1/+17
|
* Fix up parser paths so everything is foundexpo2012-08-052-2/+3
|
* MergeMartin Green2012-06-101-49/+0
|\
| * mergeExpoOnServer2012-06-101-49/+0
| |\