Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Document 'cavesnew' option in databasereset.py - which just reads in | wookey | 2013-10-07 | 3 | -32/+14 |
| | | | | caves datafiles. | ||||
* | merge | olly | 2013-08-08 | 1 | -7/+5 |
|\ | |||||
| * | Put correct user for mysql on seagrass back into config (It was accidentally ↵ | wookey | 2013-07-06 | 1 | -7/+5 |
| | | | | | | | | overwritten in recent changes) | ||||
* | | Prospecting guide and images and few minor other things. | expo | 2013-08-01 | 11 | -50/+354 |
|/ | |||||
* | merge support for django 1.2 location for auth module | Wookey | 2013-07-02 | 1 | -1/+6 |
|\ | |||||
| * | Add support for old and new (1.4 on) location for auth module. | wookey | 2013-07-02 | 1 | -1/+6 |
| | | |||||
* | | 3rd attempt at getting the right syntax for the CSRF protection in | Wookey | 2013-07-02 | 2 | -9/+7 |
| | | |||||
* | | update location of auth module for django 1.4 | Wookey | 2013-07-02 | 1 | -1/+1 |
| | | |||||
* | | merged in proper CSRF changes from server | Wookey | 2013-07-02 | 8 | -70/+58 |
|\ \ | |/ |/| | |||||
| * | Change database syntax to modern format as old style no longer | Wookey | 2013-07-02 | 4 | -30/+42 |
| | | | | | | | | supported in django 1.4 | ||||
| * | Remove support for django 1.0 CSRF as we only care about 1.2 or later | Wookey | 2013-07-02 | 1 | -6/+1 |
| | | |||||
| * | Add CSRF protection to registration form (and remove annoying second | Wookey | 2013-07-02 | 3 | -22/+19 |
| | | | | | | | | password) | ||||
| * | parsing_log should not be saved in the vcs | Wookey | 2013-07-02 | 1 | -0/+1 |
| | | |||||
| * | Don't explode if a master survex file is not found for a directory - | Wookey | 2013-07-02 | 1 | -1/+1 |
| | | | | | | | | that shouldn't cause total failure to read the database in. | ||||
* | | Add csrf token to registration forms | wookey | 2013-07-02 | 3 | -10/+16 |
| | | |||||
* | | Add 'people' option to DatabaseReset.py, to read in just the folk list after ↵ | wookey | 2013-07-02 | 1 | -0/+2 |
| | | | | | | | | | | | | update. Not sure that it actually works mind... | ||||
* | | Set title to show 1976-2013 | wookey | 2013-07-02 | 1 | -1/+2 |
| | | | | | | | | Put quick link to 2011 back as that one works | ||||
* | | Add a function for running people parser | wookey | 2013-06-25 | 1 | -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. | wookey | 2013-06-25 | 1 | -0/+5 |
| | | |||||
* | | Removed asserts which meant that if any 'odd' .svx files, or directories | wookey | 2013-06-24 | 1 | -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. | wookey | 2013-06-24 | 1 | -0/+1 |
|/ | |||||
* | Add help command and usage info to databaseReset.py | wookey | 2013-06-24 | 1 | -2/+21 |
| | |||||
* | Add comment to identifycavedir function | wookey | 2013-06-24 | 1 | -1/+3 |
| | | | | and remove now-disused special-case filename | ||||
* | Change template headers to show 2012/2013 as shortcuts | wookey | 2013-06-23 | 2 | -8/+6 |
| | |||||
* | Add checking for compass too | Wookey | 2013-05-22 | 1 | -5/+13 |
| | | | | Only print filenames on error by default | ||||
* | Add error check in place where parser died | Wookey | 2013-05-22 | 1 | -1/+7 |
| | |||||
* | Add some exception checking to parsers/caves.py so that missing entrance | wookey | 2012-09-24 | 1 | -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 ↵ | wookey | 2012-09-24 | 1 | -1/+1 |
| | | | | look when 'databasereset newcaves' falls over | ||||
* | Add some debug to cave parser as it's easy to make it fail | Wookey | 2012-09-24 | 1 | -0/+2 |
| | | | | e.g. by referring to slugs that don't exist. | ||||
* | Remove jgtfile URLs (presumably no longer needed) | expoonserver | 2012-09-08 | 1 | -2/+2 |
| | |||||
* | Merge | Martin | 2012-08-14 | 8 | -24/+63 |
|\ | |||||
| * | Bug fixing of cave and entrance forms removal of slugs | Martin | 2012-08-14 | 8 | -24/+63 |
| | | |||||
* | | ignore files ending in ~ | Martin | 2012-08-14 | 1 | -0/+1 |
| | | |||||
* | | added entrance locations | Martin | 2012-08-14 | 2 | -2/+8 |
| | | |||||
* | | fixed spelling | Martin | 2012-08-14 | 1 | -1/+1 |
| | | |||||
* | | allow extensions to be capatalised | Martin | 2012-08-14 | 1 | -14/+14 |
|/ | |||||
* | Started removing foreignkeys to caves, to achieve greater flexability. Some ↵ | expo | 2012-08-12 | 10 | -21/+79 |
| | | | | log book entries stuff may be broken. Add ability to make new caves and entrances via website. | ||||
* | Prospecting template | Martin Green | 2012-08-10 | 2 | -0/+82 |
| | |||||
* | Made a prospecting guide and fixed survex station description. Removed ↵ | Martin Green | 2012-08-10 | 9 | -70/+85 |
| | | | | parsing of underground descriptions to wikis. | ||||
* | Fixed directory names for the survey scans such that surveys could be found. ↵ | expo | 2012-08-08 | 1 | -13/+13 |
| | | | | It did not seem possible to simply change the localsettings.py file to get it to work. | ||||
* | Prevent modification of auto generated files | expo | 2012-08-06 | 1 | -0/+3 |
| | |||||
* | Editing no longer changes files more than nesecary. Removed TinyMCE editing. ↵ | expo | 2012-08-06 | 8 | -37/+45 |
| | | | | /Sumbit/Submit | ||||
* | Fix broken markup | expo | 2012-08-05 | 1 | -2/+2 |
| | |||||
* | Fixed cave order | expo | 2012-08-05 | 1 | -2/+2 |
| | |||||
* | Fixed cave order | expo | 2012-08-05 | 1 | -2/+14 |
| | |||||
* | FIx base template so admin link, expoweb link work and use consistent base URL | expo | 2012-08-05 | 2 | -8/+8 |
| | |||||
* | Note that the instructions for adding a survey are all wrong. | expo | 2012-08-05 | 1 | -1/+17 |
| | |||||
* | Fix up parser paths so everything is found | expo | 2012-08-05 | 2 | -2/+3 |
| | |||||
* | Merge | Martin Green | 2012-06-10 | 1 | -49/+0 |
|\ | |||||
| * | merge | ExpoOnServer | 2012-06-10 | 1 | -49/+0 |
| |\ |