summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Change password of 'expo' user created by databasereset script to match that ↵Wookey2015-05-251-1/+1
| | | | used elsewhere
* Fix up obvious URLs containing subarea names (smkridge)Wookey2015-04-082-4/+4
|
* Merge in Sam's parser debuggingWookey2015-04-084-2/+12
|\
| * Revert all of this the date is needed and is a not null in the dbSam Wenham2015-01-261-1/+2
| |
| * One more trySam Wenham2015-01-261-1/+0
| |
| * Ooops that wasn't rightSam Wenham2015-01-261-1/+0
| |
| * Don't assert an error on bad date formatsSam Wenham2015-01-261-1/+2
| |
| * A little more verbositySam Wenham2015-01-192-2/+8
| |
| * Add a little verbositySam Wenham2015-01-191-0/+3
| |
| * Try and ignore files that don't end .html (We really need to change to .xml) ↵Sam Wenham2015-01-192-2/+3
| | | | | | | | | | | | eg .html.orig!! Change the index on troggle to move on with the year
* | rename troggle paper.odt to troggle_paper.odt as space in repo are aWookey2015-04-081-0/+0
| | | | | | | | pain
* | Rename troggle paper to not have a space in it.Wookey2015-04-061-0/+0
| |
* | remove two files accidentally included in last commitWookey2014-09-111-30/+0
| |
* | remove internal copies of jquery, jquiery-forms, jquery-ui+themes,Wookey2014-09-1165-3565/+30
| | | | | | | | django-feincms and codemirror
* | Fix templates to use system javascript for jquery, jquery-ui andWookey2014-09-1110-18/+19
| | | | | | | | jquery-ui themes
* | Use REPOS_ROOT_PATH so there is just one place to change pathsWookey2014-09-113-41/+35
| |
* | Update the README file a bit - still needs work.Wookey2014-09-101-5/+7
|/
* Merge change of 'cavesnew'->'caves' in databasereset.Wookey2014-07-281-1/+1
|\
| * Add 107 to notable caves (noting that this is hard-coded intoWookey2014-07-281-1/+1
| | | | | | | | core/views_caves.py which is just shoddy)
* | Change databasereset to use 'caves' instead of 'cavesnew' for reloading the ↵expo2014-07-281-2/+2
|/ | | | cave database
* Set potato hut localsettingsfile to have correct URLsexpo2014-07-231-2/+2
|
* Fix media url to allow for working in the hutSam2014-07-231-1/+1
|
* Add a new config file for the potato hut setup.expo2014-07-231-0/+72
|
* Allow comma in starcommands (*,fix) (comma is default valid *set blank)Wookey2014-07-011-1/+1
|
* Fix survex parser to allow whitespace between * and command (as survexWookey2014-07-011-1/+1
| | | | does).
* merge in survex parsing changes from server.Wookey2014-06-261-3/+3
|\
| * Merge with server versionWookey2014-06-091-1/+1
| |\
| * | Tidy up urls file a littleWookey2014-05-141-3/+3
| | |
* | | Remove spurious real password from example localsettingserver.py file.expoonserver2014-06-261-2/+6
| | | | | | | | | | | | Add comment on how to use it.
* | | Replace assert on unrecognised commands with print, so that a minorexpoonserver2014-06-261-1/+7
| |/ |/| | | | | | | parsing issue doesn't completely kill a parsing update. Add parsing for requires and alias commands.
* | Refer to debian package, not upstream URLexpoonserver2014-05-191-1/+1
|/
* 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
| |