expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-29 05:11:52 +00:00
Code Issues 19 Projects 3 Activity

Commit Graph

  • 6e23853759 merge Rad 2019-02-25 21:02:30 +0000
  • 71d1719850 merge Rad 2019-02-25 21:02:30 +0000
  • becfaa1504 change to table Rad 2019-02-25 20:58:32 +0000
  • 7c2d336bd7 change to table Rad 2019-02-25 20:58:32 +0000
  • 77a6015ad6 Fix the All Survex page to work with 1623 area Sam Wenham 2019-02-25 20:13:28 +0000
  • bebbad2448 Fix the All Survex page to work with 1623 area Sam Wenham 2019-02-25 20:13:28 +0000
  • 7c15a7439d Decode the url encoded # when looking at wallets Sam Wenham 2019-02-24 19:50:45 +0000
  • b43bd58f22 Decode the url encoded # when looking at wallets Sam Wenham 2019-02-24 19:50:45 +0000
  • b4f4db5754 Deal better with the wallet letter number combo of 2019#X01 Sam Wenham 2019-02-24 18:55:30 +0000
  • e59f8308ce Deal better with the wallet letter number combo of 2019#X01 Sam Wenham 2019-02-24 18:55:30 +0000
  • c6656e6642 Stop django moaning about unit tests from pre 1.6, like we have any anyway! Sam Wenham 2019-02-24 16:48:12 +0000
  • f6d4ce8d0b Stop django moaning about unit tests from pre 1.6, like we have any anyway! Sam Wenham 2019-02-24 16:48:12 +0000
  • e6fa54d0e5 Fix survey scans Remove the assert for folders in survey wallets, this does mean currently they will be ignored by troggle. Sam Wenham 2019-02-24 16:46:02 +0000
  • af22385c68 Fix survey scans Remove the assert for folders in survey wallets, this does mean currently they will be ignored by troggle. Sam Wenham 2019-02-24 16:46:02 +0000
  • f16b4e3f47 Make the suryeys importer not explode Sam Wenham 2019-02-24 14:29:14 +0000
  • 8fd23008e3 Make the suryeys importer not explode Sam Wenham 2019-02-24 14:29:14 +0000
  • 4ad5b68433 Make things more compatiable with newer python 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 Sam Wenham 2019-02-24 13:03:34 +0000
  • 8f66837f6f Make things more compatiable with newer python 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 Sam Wenham 2019-02-24 13:03:34 +0000
  • 552730f0a3 Revert urls.py as it contains Django 1.8 upgrade code Sam Wenham 2019-02-23 15:43:38 +0000
  • 670559ec87 Revert urls.py as it contains Django 1.8 upgrade code Sam Wenham 2019-02-23 15:43:38 +0000
  • a1f02e575f Prevent troggle adding the menu if there is one in the file Add a Docker compose file to bring up a dev troggle easily Various PEP improvments Sam Wenham 2019-02-23 15:30:58 +0000
  • 7f92a7280d Prevent troggle adding the menu if there is one in the file Add a Docker compose file to bring up a dev troggle easily Various PEP improvments Sam Wenham 2019-02-23 15:30:58 +0000
  • f58b1db920 Don't create years that aren't here yet troggle goes boom Sam Wenham 2018-06-20 18:14:13 +0100
  • 019f8c0550 Don't create years that aren't here yet troggle goes boom Sam Wenham 2018-06-20 18:14:13 +0100
  • 3d2ac06a72 Move the years on a bit Sam Wenham 2018-06-20 18:11:12 +0100
  • 952af7adc5 Move the years on a bit Sam Wenham 2018-06-20 18:11:12 +0100
  • 9802f45452 Add missing linefeed on survey-parsing error message expoonserver 2018-06-18 23:43:20 +0100
  • e3e75a40bf Add missing linefeed on survey-parsing error message expoonserver 2018-06-18 23:43:20 +0100
  • 1ad58d6b5d Make sure that cave parser only reads .html files in cave_data dir (to stop foo~ causing 'duplicate cave' error) expoonserver 2018-06-18 23:17:05 +0100
  • b4d3cb514c Make sure that cave parser only reads .html files in cave_data dir (to stop foo~ causing 'duplicate cave' error) expoonserver 2018-06-18 23:17:05 +0100
  • 6805bcb690 Add 'troggle' namespace to databasereset.py so it runs in django >1.5 expoonserver 2018-06-17 02:41:58 +0100
  • 01f17dc1cc Add 'troggle' namespace to databasereset.py so it runs in django >1.5 expoonserver 2018-06-17 02:41:58 +0100
  • c162411f0b FileUploadForm does not work with django 1.7. It tries to use database during class initialisation. removed it for now - not sure if it's important... expoonserver 2018-06-17 02:24:00 +0100
  • c3300f7c96 FileUploadForm does not work with django 1.7. It tries to use database during class initialisation. removed it for now - not sure if it's important... expoonserver 2018-06-17 02:24:00 +0100
  • 10a05d686e django.setup needs to be run before any attempt to use database expoonserver 2018-06-17 02:23:02 +0100
  • 94c232c775 django.setup needs to be run before any attempt to use database expoonserver 2018-06-17 02:23:02 +0100
  • 89ef5c19ff imports must specify the application name i nlater django versions. databasereset updated accordingly. expoonserver 2018-06-16 19:00:26 +0100
  • 4f665070d7 imports must specify the application name i nlater django versions. databasereset updated accordingly. expoonserver 2018-06-16 19:00:26 +0100
  • 4385ce86c1 Add the extra setting for the threed cache to all the template configs Sam Wenham 2018-04-20 20:58:05 +0100
  • bfc867826d Add the extra setting for the threed cache to all the template configs Sam Wenham 2018-04-20 20:58:05 +0100
  • 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 +0100
  • 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 +0100
  • 6f6327d267 Merge with django-upgrade Sam Wenham 2018-04-17 22:19:20 +0100
  • bcaa4b27d2 Merge with django-upgrade Sam Wenham 2018-04-17 22:19:20 +0100
  • 6710a469ee Add CaveView spinny caves view to each troggle cave page expoonserver 2018-04-17 21:57:02 +0100
  • d0e0eee15a Add CaveView spinny caves view to each troggle cave page expoonserver 2018-04-17 21:57:02 +0100
  • 174c475ec7 Add default BooleanField(default=False) for django 1.7 compatibility Sam Wenham 2018-04-17 21:51:39 +0100
  • e61dffbfea Add default BooleanField(default=False) for django 1.7 compatibility django-upgrade Sam Wenham 2018-04-17 21:51:39 +0100
  • d3b42a125d 1.7 requiremnets Sam Wenham 2018-04-15 16:45:07 +0100
  • 222a87f5bd 1.7 requiremnets Sam Wenham 2018-04-15 16:45:07 +0100
  • 2f2f4d396d New vars needed to make django 1.7 and tinymce work Sam Wenham 2018-04-15 16:36:23 +0100
  • 5853daba89 New vars needed to make django 1.7 and tinymce work Sam Wenham 2018-04-15 16:36:23 +0100
  • e1eea7088f Django 1.7 wsgi.py Sam Wenham 2018-04-15 16:29:30 +0100
  • 7faf2e1cb9 Django 1.7 wsgi.py Sam Wenham 2018-04-15 16:29:30 +0100
  • 760fa3114f missed from last commit Sam Wenham 2018-04-15 16:28:52 +0100
  • 0633e17d11 missed from last commit Sam Wenham 2018-04-15 16:28:52 +0100
  • 798ae591c6 Django 1.7 mostly working. Big refactor so probably bugs Sam Wenham 2018-04-15 16:28:13 +0100
  • 758259be4d Django 1.7 mostly working. Big refactor so probably bugs Sam Wenham 2018-04-15 16:28:13 +0100
  • 7877efba0a Up to 1.6.11 on stretch. New manage.py. Some tidying Sam Wenham 2018-04-15 12:00:59 +0100
  • 2c2c815b25 Up to 1.6.11 on stretch. New manage.py. Some tidying Sam Wenham 2018-04-15 12:00:59 +0100
  • cfa888fde6 More cleanup and modernisation Sam Wenham 2018-04-14 21:37:12 +0100
  • 3fd805e26c More cleanup and modernisation Sam Wenham 2018-04-14 21:37:12 +0100
  • cedcb0988a Clean up indenting in models add registration required modules Sam Wenham 2018-04-14 21:14:19 +0100
  • 1974d0758a Clean up indenting in models add registration required modules Sam Wenham 2018-04-14 21:14:19 +0100
  • c939013b14 Add ref as a valid survex command to prevent errors Sam Wenham 2018-04-14 16:13:21 +0100
  • e6b12e99e6 Add ref as a valid survex command to prevent errors Sam Wenham 2018-04-14 16:13:21 +0100
  • 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 +0100
  • 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 +0100
  • 776152ef47 Add missing expose container port and commneted command to auto start the dev server Sam Wenham 2018-04-11 22:18:15 +0100
  • 6c1915deed Add missing expose container port and commneted command to auto start the dev server Sam Wenham 2018-04-11 22:18:15 +0100
  • 9f285a9f34 Update requirements for 1.5.12 and preserve the 1.4.22 requiremnets Sam Wenham 2018-04-11 22:13:31 +0100
  • 1f8512a82c Update requirements for 1.5.12 and preserve the 1.4.22 requiremnets Sam Wenham 2018-04-11 22:13:31 +0100
  • 302ad0632e Add the docker files and the pip requiremnets.txt to allow install usign pip Sam Wenham 2018-04-11 22:03:48 +0100
  • c638e1c392 Add the docker files and the pip requiremnets.txt to allow install usign pip Sam Wenham 2018-04-11 22:03:48 +0100
  • 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 +0100
  • 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 +0100
  • 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 +0100
  • 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 +0100
  • 41a14f161d Avoid barf if URL field in new cave form is left blank. Wookey 2018-02-28 15:57:27 +0000
  • 0c2a6b49ba Avoid barf if URL field in new cave form is left blank. Wookey 2018-02-28 15:57:27 +0000
  • f0e1406c5f Update old website base URL in template from cucc.survex.com/expo to expo.survex.com Wookey 2018-02-28 15:55:00 +0000
  • 6481fda4d7 Update old website base URL in template from cucc.survex.com/expo to expo.survex.com Wookey 2018-02-28 15:55:00 +0000
  • 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 +0100
  • 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 +0100
  • 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 +0000
  • 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 +0000
  • 27fca090fc Bring troggle a little more up to date Sam Wenham 2016-09-04 13:47:26 +0100
  • 93d1c330c1 Bring troggle a little more up to date Sam Wenham 2016-09-04 13:47:26 +0100
  • 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 +0100
  • 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 +0100
  • 496280f3e6 merge serve changes expo 2016-06-09 04:16:46 +0100
  • 4320e76298 merge serve changes expo 2016-06-09 04:16:46 +0100
  • 0dd0951b28 Merge Sam Wenham 2016-05-20 21:35:58 +0100
  • c3952cf3e7 Merge Sam Wenham 2016-05-20 21:35:58 +0100
  • b9597fbb57 Merge 'expofiles' instead of 'expoimages' config changes Wookey 2016-01-27 04:27:38 +0000
  • 9ec3b9d1f7 Merge 'expofiles' instead of 'expoimages' config changes Wookey 2016-01-27 04:27:38 +0000
  • edc6591554 Correct typo on cave and entrance template files ('If you edit this files...') Wookey 2016-01-27 04:24:44 +0000
  • b63ac24468 Correct typo on cave and entrance template files ('If you edit this files...') Wookey 2016-01-27 04:24:44 +0000
  • 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 +0100
  • 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 +0100