Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
|\ \ \ | ||||||
| * | | | tidy up after merge | Sam Wenham | 2015-08-22 | 1 | -3/+0 | |
| | | | | ||||||
| * | | | Merge settings changes | Sam Wenham | 2015-08-22 | 1 | -1/+5 | |
| |\| | | | |/ | |/| | ||||||
| | * | properly quote JSLIB_PATH and mke clear that example password is just an example | expo | 2015-07-26 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge 'expofiles' instead of 'expoimages' config changes | Wookey | 2016-01-27 | 4 | -11/+11 | |
|\ \ \ | ||||||
| * | | | Move expoimage to expofiles | expoonserver | 2015-10-02 | 3 | -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. | expoonserver | 2015-10-02 | 1 | -5/+5 | |
| |/ / | ||||||
* / / | Correct typo on cave and entrance template files | Wookey | 2016-01-27 | 2 | -2/+2 | |
|/ / | | | | | | | ('If you edit this files...') | |||||
* | | Change JSLIB_PATH to JSLIB_URL and correct the path | Sam Wenham | 2015-07-01 | 1 | -1/+1 | |
| | | ||||||
* | | Fix unquoted string in troggle localsettingspotatohut.py | Wookey | 2015-07-01 | 1 | -1/+1 | |
| | | ||||||
* | | sysadmin to expouser for email | Sam Wenham | 2015-07-01 | 1 | -1/+1 | |
| | | ||||||
* | | Move expo user settings out of databasereset.py to localsettings where they ↵ | Sam Wenham | 2015-07-01 | 5 | -1/+20 | |
|/ | | | | really belong | |||||
* | Add a little style | Sam Wenham | 2015-06-28 | 1 | -0/+9 | |
| | ||||||
* | Remove unnecessary escape slashes | Sam Wenham | 2015-06-28 | 1 | -2/+2 | |
| | ||||||
* | I think this is breaking prospecting | Sam Wenham | 2015-06-28 | 1 | -1/+1 | |
| | ||||||
* | Remove balkonhoehle from the QM parser as this will need a lot of effort to ↵ | Sam Wenham | 2015-06-28 | 1 | -1/+1 | |
| | | | | get working | |||||
* | Correct JSLIB_URL | Sam Wenham | 2015-06-27 | 2 | -2/+2 | |
| | ||||||
* | Don't put passwords in the repo | expo | 2015-06-24 | 3 | -3/+8 | |
| | ||||||
* | Survex parser fix to avoid allocation on error (by martin). | expo | 2015-06-24 | 1 | -4/+4 | |
| | ||||||
* | Added warnings that the database will need updating is cave or entrance data ↵ | expo | 2015-06-21 | 2 | -0/+2 | |
| | | | | files are modified | |||||
* | Moved notable caves to settings.py, link to a script to fix permissions | expo | 2015-06-21 | 3 | -5/+22 | |
| | ||||||
* | Have different links for system js files and troggle js files | expo | 2015-06-21 | 1 | -1/+1 | |
| | ||||||
* | merge balconhoehle changes from server | Wookey | 2015-06-19 | 1 | -0/+1 | |
|\ | ||||||
| * | Add in balkon hoehle QM list | DWalker | 2015-05-25 | 1 | -0/+1 | |
| | | ||||||
* | | Use django-registration, not a local copy. | Wookey | 2015-06-10 | 49 | -2552/+0 | |
|/ | | | | This old one is uses deprecated hashcompat. | |||||
* | Change password of 'expo' user created by databasereset script to match that ↵ | Wookey | 2015-05-25 | 1 | -1/+1 | |
| | | | | used elsewhere |