summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Stop django moaning about unit tests from pre 1.6, like we have any anyway!Sam Wenham2019-02-241-0/+2
|
* Fix survey scansSam Wenham2019-02-243-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 explodeSam Wenham2019-02-243-56/+68
|
* Make things more compatiable with newer pythonSam Wenham2019-02-2414-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 codeSam Wenham2019-02-231-1/+1
|
* Prevent troggle adding the menu if there is one in the fileSam Wenham2019-02-2310-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 boomSam Wenham2018-06-201-1/+1
|
* Move the years on a bitSam Wenham2018-06-201-2/+2
|
* Add missing linefeed on survey-parsing error messageexpoonserver2018-06-181-2/+2
|
* Make sure that cave parser only reads .html files in cave_data dir (to stop ↵expoonserver2018-06-181-2/+3
| | | | foo~ causing 'duplicate cave' error)
* Add 'troggle' namespace to databasereset.py so it runs in django >1.5expoonserver2018-06-171-1/+1
|
* FileUploadForm does not work with django 1.7.expoonserver2018-06-172-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 databaseexpoonserver2018-06-171-2/+4
|
* imports must specify the application name i nlater django versions.expoonserver2018-06-161-1/+1
| | | | databasereset updated accordingly.
* Add the extra setting for the threed cache to all the template configsSam Wenham2018-04-203-0/+3
|
* Fix the django for the spinny js cave viewer.Sam Wenham2018-04-202-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-upgradeSam Wenham2018-04-173-4/+453
|\
| * Add CaveView spinny caves view to each troggle cave pageexpoonserver2018-04-173-5/+454
| |
* | Add default BooleanField(default=False) for django 1.7 compatibilitydjango-upgradeSam Wenham2018-04-173-7/+7
| |
* | 1.7 requiremnetsSam Wenham2018-04-152-3/+10
| |
* | New vars needed to make django 1.7 and tinymce workSam Wenham2018-04-154-0/+12
| |
* | Django 1.7 wsgi.pySam Wenham2018-04-151-0/+14
| |
* | missed from last commitSam Wenham2018-04-151-1/+1
| |
* | Django 1.7 mostly working. Big refactor so probably bugsSam Wenham2018-04-1518-59/+81
| |
* | Up to 1.6.11 on stretch. New manage.py. Some tidyingSam Wenham2018-04-158-17/+52
| |
* | More cleanup and modernisationSam Wenham2018-04-143-4/+4
| |
* | Clean up indenting in modelsSam Wenham2018-04-142-23/+26
| | | | | | | | add registration required modules
* | Add ref as a valid survex command to prevent errorsSam Wenham2018-04-141-1/+1
| |
* | add all the docker commands to bulid and run troggle in a container (more of ↵Sam Wenham2018-04-111-1/+6
| | | | | | | | a guide than something to run)
* | Add missing expose container port and commneted command to auto start the ↵Sam Wenham2018-04-112-0/+8
| | | | | | | | dev server
* | Update requirements for 1.5.12 and preserve the 1.4.22 requiremnetsSam Wenham2018-04-112-2/+9
| |
* | Add the docker files and the pip requiremnets.txt to allow install usign pipSam Wenham2018-04-114-0/+37
| |
* | Upgrade to django 1.5, some functions have been changedSam Wenham2018-04-1134-103/+104
| | | | | | | | | | url in templates now requires quotes roung the first arg USE_TZ added
* | Import Image from PIL to support newer pythonSam Wenham2018-04-102-2/+3
|/ | | | import the Django registration module rather than the troggle one
* Avoid barf if URL field in new cave form is left blank.Wookey2018-02-281-1/+1
|\
| * Test whether url is not 'None' before applying 'startswith' test inexpoonserver2017-10-251-1/+1
| | | | | | | | forms.py entering new caves, otherwise it barfs.
* | Update old website base URL in template from cucc.survex.com/expo to ↵Wookey2018-02-281-1/+1
|/ | | | expo.survex.com
* Fix Scan scanning, so that 2015#X01 format (with 'X') is accepted inexpoonserver2017-03-071-2/+2
| | | | scan directories. Allows 2016 data to be processed.
* Bring troggle a little more up to dateSam Wenham2016-09-041-3/+5
|
* Fix cave pages to have entrances and description on one page.expo2016-07-022-10/+112
| | | | | Fixes broken links on description and entrance pages. Removes need for jquery-ui.
* merge serve changesexpo2016-06-093-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 ↵expo2015-09-164-1/+16
| |\ | | | | | | | | | databaseReset script
| * | Commit changes made on expo 2015expo2015-09-162-1/+7
| | |
* | | MergeSam Wenham2016-05-201-1/+2
|\ \ \
| * | | tidy up after mergeSam Wenham2015-08-221-3/+0
| | | |
| * | | Merge settings changesSam Wenham2015-08-221-1/+5
| |\| | | | |/ | |/|
| | * properly quote JSLIB_PATH and mke clear that example password is just an exampleexpo2015-07-261-2/+2
| | |
* | | Merge 'expofiles' instead of 'expoimages' config changesWookey2016-01-274-11/+11
|\ \ \
| * | | Move expoimage to expofilesexpoonserver2015-10-023-6/+6
| | | | | | | | | | | | | | | | | | | | Relies on permanent rediect in apache config to keep old URLs working everywhere.
| * | | remove code saying we can't do interlaced pngs. It's fine now.expoonserver2015-10-021-5/+5
| |/ /