Commit Graph

Select branches

Hide Pull Requests

Faster-survex-parser

RW_rebuild

django-1.10

django-upgrade

django-upgrade-pt2

master

old-master

Mono Color

• bfc867826d Add the extra setting for the threed cache to all the template configs Sam Wenham 2018-04-20 20:58:05 +01:00
• 46124a770f Fix the django for the spinny js cave viewer. 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 Sam Wenham 2018-04-20 20:55:12 +01:00
• af13e84c74 Fix the django for the spinny js cave viewer. 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 Sam Wenham 2018-04-20 20:55:12 +01:00
• 6f6327d267 Merge with django-upgrade Sam Wenham 2018-04-17 22:19:20 +01:00
• bcaa4b27d2 Merge with django-upgrade Sam Wenham 2018-04-17 22:19:20 +01:00
• 6710a469ee Add CaveView spinny caves view to each troggle cave page expoonserver 2018-04-17 21:57:02 +01:00
• d0e0eee15a Add CaveView spinny caves view to each troggle cave page expoonserver 2018-04-17 21:57:02 +01:00
• 174c475ec7 Add default BooleanField(default=False) for django 1.7 compatibility Sam Wenham 2018-04-17 21:51:39 +01:00
• e61dffbfea Add default BooleanField(default=False) for django 1.7 compatibility django-upgrade Sam Wenham 2018-04-17 21:51:39 +01:00
• d3b42a125d 1.7 requiremnets Sam Wenham 2018-04-15 16:45:07 +01:00
• 222a87f5bd 1.7 requiremnets Sam Wenham 2018-04-15 16:45:07 +01:00
• 2f2f4d396d New vars needed to make django 1.7 and tinymce work Sam Wenham 2018-04-15 16:36:23 +01:00
• 5853daba89 New vars needed to make django 1.7 and tinymce work Sam Wenham 2018-04-15 16:36:23 +01:00
• e1eea7088f Django 1.7 wsgi.py Sam Wenham 2018-04-15 16:29:30 +01:00
• 7faf2e1cb9 Django 1.7 wsgi.py Sam Wenham 2018-04-15 16:29:30 +01:00
• 760fa3114f missed from last commit Sam Wenham 2018-04-15 16:28:52 +01:00
• 0633e17d11 missed from last commit Sam Wenham 2018-04-15 16:28:52 +01:00
• 798ae591c6 Django 1.7 mostly working. Big refactor so probably bugs Sam Wenham 2018-04-15 16:28:13 +01:00
• 758259be4d Django 1.7 mostly working. Big refactor so probably bugs Sam Wenham 2018-04-15 16:28:13 +01:00
• 7877efba0a Up to 1.6.11 on stretch. New manage.py. Some tidying Sam Wenham 2018-04-15 12:00:59 +01:00
• 2c2c815b25 Up to 1.6.11 on stretch. New manage.py. Some tidying Sam Wenham 2018-04-15 12:00:59 +01:00
• cfa888fde6 More cleanup and modernisation Sam Wenham 2018-04-14 21:37:12 +01:00
• 3fd805e26c More cleanup and modernisation Sam Wenham 2018-04-14 21:37:12 +01:00
• cedcb0988a Clean up indenting in models add registration required modules Sam Wenham 2018-04-14 21:14:19 +01:00
• 1974d0758a Clean up indenting in models add registration required modules Sam Wenham 2018-04-14 21:14:19 +01:00
• c939013b14 Add ref as a valid survex command to prevent errors Sam Wenham 2018-04-14 16:13:21 +01:00
• e6b12e99e6 Add ref as a valid survex command to prevent errors Sam Wenham 2018-04-14 16:13:21 +01:00
• 458d0e1ebc add all the docker commands to bulid and run troggle in a container (more of a guide than something to run) Sam Wenham 2018-04-11 22:32:47 +01:00
• f60df05aab add all the docker commands to bulid and run troggle in a container (more of a guide than something to run) Sam Wenham 2018-04-11 22:32:47 +01:00
• 776152ef47 Add missing expose container port and commneted command to auto start the dev server Sam Wenham 2018-04-11 22:18:15 +01:00
• 6c1915deed Add missing expose container port and commneted command to auto start the dev server Sam Wenham 2018-04-11 22:18:15 +01:00
• 9f285a9f34 Update requirements for 1.5.12 and preserve the 1.4.22 requiremnets Sam Wenham 2018-04-11 22:13:31 +01:00
• 1f8512a82c Update requirements for 1.5.12 and preserve the 1.4.22 requiremnets Sam Wenham 2018-04-11 22:13:31 +01:00
• 302ad0632e Add the docker files and the pip requiremnets.txt to allow install usign pip Sam Wenham 2018-04-11 22:03:48 +01:00
• c638e1c392 Add the docker files and the pip requiremnets.txt to allow install usign pip Sam Wenham 2018-04-11 22:03:48 +01:00
• ffb5d7bdda Upgrade to django 1.5, some functions have been changed url in templates now requires quotes roung the first arg USE_TZ added Sam Wenham 2018-04-11 22:02:57 +01:00
• 789c33fcb6 Upgrade to django 1.5, some functions have been changed url in templates now requires quotes roung the first arg USE_TZ added Sam Wenham 2018-04-11 22:02:57 +01:00
• 242cf4741a Import Image from PIL to support newer python import the Django registration module rather than the troggle one Sam Wenham 2018-04-10 01:34:06 +01:00
• 0ef4f7832c Import Image from PIL to support newer python import the Django registration module rather than the troggle one Sam Wenham 2018-04-10 01:34:06 +01:00
• 41a14f161d Avoid barf if URL field in new cave form is left blank. Wookey 2018-02-28 15:57:27 +00:00
• 0c2a6b49ba Avoid barf if URL field in new cave form is left blank. Wookey 2018-02-28 15:57:27 +00:00
• f0e1406c5f Update old website base URL in template from cucc.survex.com/expo to expo.survex.com Wookey 2018-02-28 15:55:00 +00:00
• 6481fda4d7 Update old website base URL in template from cucc.survex.com/expo to expo.survex.com Wookey 2018-02-28 15:55:00 +00:00
• d7c6676c49 Test whether url is not 'None' before applying 'startswith' test in forms.py entering new caves, otherwise it barfs. expoonserver 2017-10-25 03:49:03 +01:00
• 86b1e6e577 Test whether url is not 'None' before applying 'startswith' test in forms.py entering new caves, otherwise it barfs. expoonserver 2017-10-25 03:49:03 +01:00
• 5e9dfc6ea6 Fix Scan scanning, so that 2015#X01 format (with 'X') is accepted in scan directories. Allows 2016 data to be processed. expoonserver 2017-03-07 15:44:42 +00:00
• d7b2ddefce Fix Scan scanning, so that 2015#X01 format (with 'X') is accepted in scan directories. Allows 2016 data to be processed. expoonserver 2017-03-07 15:44:42 +00:00
• 27fca090fc Bring troggle a little more up to date Sam Wenham 2016-09-04 13:47:26 +01:00
• 93d1c330c1 Bring troggle a little more up to date Sam Wenham 2016-09-04 13:47:26 +01:00
• 716131f005 Fix cave pages to have entrances and description on one page. Fixes broken links on description and entrance pages. Removes need for jquery-ui. expo 2016-07-02 23:42:47 +01:00
• 0239800ff1 Fix cave pages to have entrances and description on one page. Fixes broken links on description and entrance pages. Removes need for jquery-ui. expo 2016-07-02 23:42:47 +01:00
• 496280f3e6 merge serve changes expo 2016-06-09 04:16:46 +01:00
• 4320e76298 merge serve changes expo 2016-06-09 04:16:46 +01:00
• 0dd0951b28 Merge Sam Wenham 2016-05-20 21:35:58 +01:00
• c3952cf3e7 Merge Sam Wenham 2016-05-20 21:35:58 +01:00
• b9597fbb57 Merge 'expofiles' instead of 'expoimages' config changes Wookey 2016-01-27 04:27:38 +00:00
• 9ec3b9d1f7 Merge 'expofiles' instead of 'expoimages' config changes Wookey 2016-01-27 04:27:38 +00:00
• edc6591554 Correct typo on cave and entrance template files ('If you edit this files...') Wookey 2016-01-27 04:24:44 +00:00
• b63ac24468 Correct typo on cave and entrance template files ('If you edit this files...') Wookey 2016-01-27 04:24:44 +00:00
• 560b9bf985 Move expoimage to expofiles Relies on permanent rediect in apache config to keep old URLs working everywhere. expoonserver 2015-10-02 15:10:04 +01:00
• 6357efa0b6 Move expoimage to expofiles Relies on permanent rediect in apache config to keep old URLs working everywhere. expoonserver 2015-10-02 15:10:04 +01:00
• 6652e3f160 remove code saying we can't do interlaced pngs. It's fine now. expoonserver 2015-10-02 15:07:03 +01:00
• fadf562fd9 remove code saying we can't do interlaced pngs. It's fine now. expoonserver 2015-10-02 15:07:03 +01:00
• b0f1f73ce4 Store expo user/password info in localsettings file, and not repeated in databaseReset script expo 2015-09-16 01:58:51 +01:00
• 32f3dac621 Store expo user/password info in localsettings file, and not repeated in databaseReset script expo 2015-09-16 01:58:51 +01:00
• 214d887c57 Commit changes made on expo 2015 expo 2015-09-16 01:52:45 +01:00
• 73e27355b1 Commit changes made on expo 2015 expo 2015-09-16 01:52:45 +01:00
• 6b16724c2a tidy up after merge Sam Wenham 2015-08-22 13:28:17 +01:00
• 7e99c05e87 tidy up after merge Sam Wenham 2015-08-22 13:28:17 +01:00
• f1bb927063 Merge settings changes Sam Wenham 2015-08-22 13:26:38 +01:00
• 223be0454e Merge settings changes Sam Wenham 2015-08-22 13:26:38 +01:00
• eeda1bed73 properly quote JSLIB_PATH and mke clear that example password is just an example expo 2015-07-26 00:38:10 +01:00
• 58831117e9 properly quote JSLIB_PATH and mke clear that example password is just an example expo 2015-07-26 00:38:10 +01:00
• 751ec9517f Change JSLIB_PATH to JSLIB_URL and correct the path Sam Wenham 2015-07-01 18:22:25 +01:00
• ad640eb70a Change JSLIB_PATH to JSLIB_URL and correct the path Sam Wenham 2015-07-01 18:22:25 +01:00
• 228814be33 Fix unquoted string in troggle localsettingspotatohut.py Wookey 2015-07-01 03:55:12 +01:00
• af2c8dd44c Fix unquoted string in troggle localsettingspotatohut.py Wookey 2015-07-01 03:55:12 +01:00
• cebcbeb73a sysadmin to expouser for email Sam Wenham 2015-07-01 01:26:04 +01:00
• 467ec2bcc3 sysadmin to expouser for email Sam Wenham 2015-07-01 01:26:04 +01:00
• 057b09dca9 Move expo user settings out of databasereset.py to localsettings where they really belong Sam Wenham 2015-07-01 01:18:25 +01:00
• a70621609b Move expo user settings out of databasereset.py to localsettings where they really belong Sam Wenham 2015-07-01 01:18:25 +01:00
• 480541ae54 Add a little style Sam Wenham 2015-06-28 13:52:33 +01:00
• a024475446 Add a little style Sam Wenham 2015-06-28 13:52:33 +01:00
• 60303d041c Remove unnecessary escape slashes Sam Wenham 2015-06-28 13:46:28 +01:00
• d9a78fe2ab Remove unnecessary escape slashes Sam Wenham 2015-06-28 13:46:28 +01:00
• 5a911ecec7 I think this is breaking prospecting Sam Wenham 2015-06-28 13:39:50 +01:00
• 06de254c9e I think this is breaking prospecting Sam Wenham 2015-06-28 13:39:50 +01:00
• 7056f9a8b2 Remove balkonhoehle from the QM parser as this will need a lot of effort to get working Sam Wenham 2015-06-28 12:28:18 +01:00
• a6cba84dce Remove balkonhoehle from the QM parser as this will need a lot of effort to get working Sam Wenham 2015-06-28 12:28:18 +01:00
• 34036581f2 Correct JSLIB_URL Sam Wenham 2015-06-27 13:01:15 +01:00
• 49e8c50650 Correct JSLIB_URL Sam Wenham 2015-06-27 13:01:15 +01:00
• dcc67fddda Don't put passwords in the repo expo 2015-06-24 04:41:50 +01:00
• 4e57af79d4 Don't put passwords in the repo expo 2015-06-24 04:41:50 +01:00
• 03cad0a37f Survex parser fix to avoid allocation on error (by martin). expo 2015-06-24 04:09:19 +01:00
• ee66e1dd8d Survex parser fix to avoid allocation on error (by martin). expo 2015-06-24 04:09:19 +01:00
• a4651eaa0a Added warnings that the database will need updating is cave or entrance data files are modified expo 2015-06-21 15:11:51 +01:00
• 45fd219bc6 Added warnings that the database will need updating is cave or entrance data files are modified expo 2015-06-21 15:11:51 +01:00
• 7aed3d3b30 Moved notable caves to settings.py, link to a script to fix permissions expo 2015-06-21 15:08:09 +01:00
• 087a028388 Moved notable caves to settings.py, link to a script to fix permissions expo 2015-06-21 15:08:09 +01:00
• 4771f52b20 Have different links for system js files and troggle js files expo 2015-06-21 15:06:44 +01:00