Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge in Sam's parser debugging | Wookey | 2015-04-08 | 4 | -2/+12 | |
|\ | ||||||
| * | Revert all of this the date is needed and is a not null in the db | Sam Wenham | 2015-01-26 | 1 | -1/+2 | |
| | | ||||||
| * | One more try | Sam Wenham | 2015-01-26 | 1 | -1/+0 | |
| | | ||||||
| * | Ooops that wasn't right | Sam Wenham | 2015-01-26 | 1 | -1/+0 | |
| | | ||||||
| * | Don't assert an error on bad date formats | Sam Wenham | 2015-01-26 | 1 | -1/+2 | |
| | | ||||||
| * | A little more verbosity | Sam Wenham | 2015-01-19 | 2 | -2/+8 | |
| | | ||||||
| * | Add a little verbosity | Sam Wenham | 2015-01-19 | 1 | -0/+3 | |
| | | ||||||
| * | Try and ignore files that don't end .html (We really need to change to .xml) ↵ | Sam Wenham | 2015-01-19 | 2 | -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 a | Wookey | 2015-04-08 | 1 | -0/+0 | |
| | | | | | | | | pain | |||||
* | | Rename troggle paper to not have a space in it. | Wookey | 2015-04-06 | 1 | -0/+0 | |
| | | ||||||
* | | remove two files accidentally included in last commit | Wookey | 2014-09-11 | 1 | -30/+0 | |
| | | ||||||
* | | remove internal copies of jquery, jquiery-forms, jquery-ui+themes, | Wookey | 2014-09-11 | 65 | -3565/+30 | |
| | | | | | | | | django-feincms and codemirror | |||||
* | | Fix templates to use system javascript for jquery, jquery-ui and | Wookey | 2014-09-11 | 10 | -18/+19 | |
| | | | | | | | | jquery-ui themes | |||||
* | | Use REPOS_ROOT_PATH so there is just one place to change paths | Wookey | 2014-09-11 | 3 | -41/+35 | |
| | | ||||||
* | | Update the README file a bit - still needs work. | Wookey | 2014-09-10 | 1 | -5/+7 | |
|/ | ||||||
* | Merge change of 'cavesnew'->'caves' in databasereset. | Wookey | 2014-07-28 | 1 | -1/+1 | |
|\ | ||||||
| * | Add 107 to notable caves (noting that this is hard-coded into | Wookey | 2014-07-28 | 1 | -1/+1 | |
| | | | | | | | | core/views_caves.py which is just shoddy) | |||||
* | | Change databasereset to use 'caves' instead of 'cavesnew' for reloading the ↵ | expo | 2014-07-28 | 1 | -2/+2 | |
|/ | | | | cave database | |||||
* | Set potato hut localsettingsfile to have correct URLs | expo | 2014-07-23 | 1 | -2/+2 | |
| | ||||||
* | Fix media url to allow for working in the hut | Sam | 2014-07-23 | 1 | -1/+1 | |
| | ||||||
* | Add a new config file for the potato hut setup. | expo | 2014-07-23 | 1 | -0/+72 | |
| | ||||||
* | Allow comma in starcommands (*,fix) (comma is default valid *set blank) | Wookey | 2014-07-01 | 1 | -1/+1 | |
| | ||||||
* | Fix survex parser to allow whitespace between * and command (as survex | Wookey | 2014-07-01 | 1 | -1/+1 | |
| | | | | does). | |||||
* | merge in survex parsing changes from server. | Wookey | 2014-06-26 | 1 | -3/+3 | |
|\ | ||||||
| * | Merge with server version | Wookey | 2014-06-09 | 1 | -1/+1 | |
| |\ | ||||||
| * | | Tidy up urls file a little | Wookey | 2014-05-14 | 1 | -3/+3 | |
| | | | ||||||
* | | | Remove spurious real password from example localsettingserver.py file. | expoonserver | 2014-06-26 | 1 | -2/+6 | |
| | | | | | | | | | | | | Add comment on how to use it. | |||||
* | | | Replace assert on unrecognised commands with print, so that a minor | expoonserver | 2014-06-26 | 1 | -1/+7 | |
| |/ |/| | | | | | | | parsing issue doesn't completely kill a parsing update. Add parsing for requires and alias commands. | |||||
* | | Refer to debian package, not upstream URL | expoonserver | 2014-05-19 | 1 | -1/+1 | |
|/ | ||||||
* | 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 | |
|/ |