Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | added Rad's playground | Rad | 2019-02-25 | 5 | -1/+64 |
| | |||||
* | merge | Rad | 2019-02-25 | 3 | -7/+8 |
|\ | |||||
| * | Fix the All Survex page to work with 1623 area | Sam Wenham | 2019-02-25 | 3 | -7/+8 |
| | | |||||
* | | change to table | Rad | 2019-02-25 | 1 | -3/+3 |
|/ | |||||
* | Decode the url encoded # when looking at wallets | Sam Wenham | 2019-02-24 | 1 | -5/+6 |
| | |||||
* | Deal better with the wallet letter number combo of 2019#X01 | Sam Wenham | 2019-02-24 | 2 | -7/+10 |
| | |||||
* | Stop django moaning about unit tests from pre 1.6, like we have any anyway! | Sam Wenham | 2019-02-24 | 1 | -0/+2 |
| | |||||
* | Fix survey scans | Sam Wenham | 2019-02-24 | 3 | -13/+14 |
| | | | | | Remove the assert for folders in survey wallets, this does mean currently they will be ignored by troggle. | ||||
* | Make the suryeys importer not explode | Sam Wenham | 2019-02-24 | 3 | -56/+68 |
| | |||||
* | Make things more compatiable with newer python | Sam Wenham | 2019-02-24 | 14 | -101/+153 |
| | | | | | | | Fix the expeditions list Improvements to make it compatiable with django 1.8 Bump the years to add 2018 Update the .hgignore file to ignore junk | ||||
* | Revert urls.py as it contains Django 1.8 upgrade code | Sam Wenham | 2019-02-23 | 1 | -1/+1 |
| | |||||
* | Prevent troggle adding the menu if there is one in the file | Sam Wenham | 2019-02-23 | 10 | -18/+77 |
| | | | | | Add a Docker compose file to bring up a dev troggle easily Various PEP improvments | ||||
* | Don't create years that aren't here yet troggle goes boom | Sam Wenham | 2018-06-20 | 1 | -1/+1 |
| | |||||
* | Move the years on a bit | Sam Wenham | 2018-06-20 | 1 | -2/+2 |
| | |||||
* | Add missing linefeed on survey-parsing error message | expoonserver | 2018-06-18 | 1 | -2/+2 |
| | |||||
* | Make sure that cave parser only reads .html files in cave_data dir (to stop ↵ | expoonserver | 2018-06-18 | 1 | -2/+3 |
| | | | | foo~ causing 'duplicate cave' error) | ||||
* | Add 'troggle' namespace to databasereset.py so it runs in django >1.5 | expoonserver | 2018-06-17 | 1 | -1/+1 |
| | |||||
* | FileUploadForm does not work with django 1.7. | expoonserver | 2018-06-17 | 2 | -29/+29 |
| | | | | | It tries to use database during class initialisation. removed it for now - not sure if it's important... | ||||
* | django.setup needs to be run before any attempt to use database | expoonserver | 2018-06-17 | 1 | -2/+4 |
| | |||||
* | imports must specify the application name i nlater django versions. | expoonserver | 2018-06-16 | 1 | -1/+1 |
| | | | | databasereset updated accordingly. | ||||
* | Add the extra setting for the threed cache to all the template configs | Sam Wenham | 2018-04-20 | 3 | -0/+3 |
| | |||||
* | Fix the django for the spinny js cave viewer. | Sam Wenham | 2018-04-20 | 2 | -9/+9 |
| | | | | | Make the paths settings (don't hard code things like this!!) Add " round spinny urls from the late merge (the rest were done for the move off 1.4.2 | ||||
* | Merge with django-upgrade | Sam Wenham | 2018-04-17 | 3 | -4/+453 |
|\ | |||||
| * | Add CaveView spinny caves view to each troggle cave page | expoonserver | 2018-04-17 | 3 | -5/+454 |
| | | |||||
* | | Add default BooleanField(default=False) for django 1.7 compatibility | Sam Wenham | 2018-04-17 | 3 | -7/+7 |
| | | |||||
* | | 1.7 requiremnets | Sam Wenham | 2018-04-15 | 2 | -3/+10 |
| | | |||||
* | | New vars needed to make django 1.7 and tinymce work | Sam Wenham | 2018-04-15 | 4 | -0/+12 |
| | | |||||
* | | Django 1.7 wsgi.py | Sam Wenham | 2018-04-15 | 1 | -0/+14 |
| | | |||||
* | | missed from last commit | Sam Wenham | 2018-04-15 | 1 | -1/+1 |
| | | |||||
* | | Django 1.7 mostly working. Big refactor so probably bugs | Sam Wenham | 2018-04-15 | 18 | -59/+81 |
| | | |||||
* | | Up to 1.6.11 on stretch. New manage.py. Some tidying | Sam Wenham | 2018-04-15 | 8 | -17/+52 |
| | | |||||
* | | More cleanup and modernisation | Sam Wenham | 2018-04-14 | 3 | -4/+4 |
| | | |||||
* | | Clean up indenting in models | Sam Wenham | 2018-04-14 | 2 | -23/+26 |
| | | | | | | | | add registration required modules | ||||
* | | Add ref as a valid survex command to prevent errors | Sam Wenham | 2018-04-14 | 1 | -1/+1 |
| | | |||||
* | | add all the docker commands to bulid and run troggle in a container (more of ↵ | Sam Wenham | 2018-04-11 | 1 | -1/+6 |
| | | | | | | | | a guide than something to run) | ||||
* | | Add missing expose container port and commneted command to auto start the ↵ | Sam Wenham | 2018-04-11 | 2 | -0/+8 |
| | | | | | | | | dev server | ||||
* | | Update requirements for 1.5.12 and preserve the 1.4.22 requiremnets | Sam Wenham | 2018-04-11 | 2 | -2/+9 |
| | | |||||
* | | Add the docker files and the pip requiremnets.txt to allow install usign pip | Sam Wenham | 2018-04-11 | 4 | -0/+37 |
| | | |||||
* | | Upgrade to django 1.5, some functions have been changed | Sam Wenham | 2018-04-11 | 34 | -103/+104 |
| | | | | | | | | | | url in templates now requires quotes roung the first arg USE_TZ added | ||||
* | | Import Image from PIL to support newer python | Sam Wenham | 2018-04-10 | 2 | -2/+3 |
|/ | | | | import the Django registration module rather than the troggle one | ||||
* | Avoid barf if URL field in new cave form is left blank. | Wookey | 2018-02-28 | 1 | -1/+1 |
|\ | |||||
| * | Test whether url is not 'None' before applying 'startswith' test in | expoonserver | 2017-10-25 | 1 | -1/+1 |
| | | | | | | | | forms.py entering new caves, otherwise it barfs. | ||||
* | | Update old website base URL in template from cucc.survex.com/expo to ↵ | Wookey | 2018-02-28 | 1 | -1/+1 |
|/ | | | | expo.survex.com | ||||
* | Fix Scan scanning, so that 2015#X01 format (with 'X') is accepted in | expoonserver | 2017-03-07 | 1 | -2/+2 |
| | | | | scan directories. Allows 2016 data to be processed. | ||||
* | Bring troggle a little more up to date | Sam Wenham | 2016-09-04 | 1 | -3/+5 |
| | |||||
* | Fix cave pages to have entrances and description on one page. | expo | 2016-07-02 | 2 | -10/+112 |
| | | | | | Fixes broken links on description and entrance pages. Removes need for jquery-ui. | ||||
* | merge serve changes | expo | 2016-06-09 | 3 | -8/+9 |
|\ | | | | | | | HGerver canges Enter commit message. Lines beginning with 'HG:' are removed. | ||||
| * | Store expo user/password info in localsettings file, and not repeated in ↵ | expo | 2015-09-16 | 4 | -1/+16 |
| |\ | | | | | | | | | | databaseReset script | ||||
| * | | Commit changes made on expo 2015 | expo | 2015-09-16 | 2 | -1/+7 |
| | | | |||||
* | | | Merge | Sam Wenham | 2016-05-20 | 1 | -1/+2 |
|\ \ \ |