expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-01-19 20:53:04 +00:00
Code Issues 18 Projects 3 Activity

Commit Graph

  • 73bb60eff9 Rad 2019-02-25 23:52:47 +00:00
  • ccc347eddc Rad 2019-02-25 23:52:47 +00:00
  • 0a214c5d4b Rad 2019-02-25 23:51:26 +00:00
  • a013f5bef2 Rad 2019-02-25 23:51:26 +00:00
  • 29c53f35ab Rad 2019-02-25 23:48:58 +00:00
  • 75acd74d5b Rad 2019-02-25 23:48:58 +00:00
  • 3746dab5de Rad 2019-02-25 23:46:52 +00:00
  • 0c63156428 Rad 2019-02-25 23:46:52 +00:00
  • 18dbadd675 space/tab Rad 2019-02-25 23:42:56 +00:00
  • 8173c3c45d space/tab Rad 2019-02-25 23:42:56 +00:00
  • ee2cd0d391 trying to add new field Rad 2019-02-25 23:40:53 +00:00
  • f23700b1b7 trying to add new field Rad 2019-02-25 23:40:53 +00:00
  • 0cc4e7c7d3 Rad 2019-02-25 23:37:12 +00:00
  • 41e11c6c2e Rad 2019-02-25 23:37:12 +00:00
  • 478065786f Merge Sam Wenham 2019-02-25 23:34:10 +00:00
  • 0eb5e560d2 Merge Sam Wenham 2019-02-25 23:34:10 +00:00
  • e64d82cd92 Start of moving databasereset to django management Sam Wenham 2019-02-25 23:10:24 +00:00
  • a61e66bb47 Start of moving databasereset to django management Sam Wenham 2019-02-25 23:10:24 +00:00
  • 12a991920a Get get_absolute_url in the correct place Sam Wenham 2019-02-25 23:07:20 +00:00
  • f9dc4500d9 Get get_absolute_url in the correct place Sam Wenham 2019-02-25 23:07:20 +00:00
  • 0758efb3ec Rad 2019-02-25 22:34:13 +00:00
  • d3f633e41d Rad 2019-02-25 22:34:13 +00:00
  • 54b782c67e tab/space fix Rad 2019-02-25 22:28:30 +00:00
  • 61bd6e81f1 tab/space fix Rad 2019-02-25 22:28:30 +00:00
  • 78a5f656b9 added Rad's playground Rad 2019-02-25 22:24:33 +00:00
  • edddfb7fc6 added Rad's playground Rad 2019-02-25 22:24:33 +00:00
  • 6e23853759 merge Rad 2019-02-25 21:02:30 +00:00
  • 71d1719850 merge Rad 2019-02-25 21:02:30 +00:00
  • becfaa1504 change to table Rad 2019-02-25 20:58:32 +00:00
  • 7c2d336bd7 change to table Rad 2019-02-25 20:58:32 +00:00
  • 77a6015ad6 Fix the All Survex page to work with 1623 area Sam Wenham 2019-02-25 20:13:28 +00:00
  • bebbad2448 Fix the All Survex page to work with 1623 area Sam Wenham 2019-02-25 20:13:28 +00:00
  • 7c15a7439d Decode the url encoded # when looking at wallets Sam Wenham 2019-02-24 19:50:45 +00:00
  • b43bd58f22 Decode the url encoded # when looking at wallets Sam Wenham 2019-02-24 19:50:45 +00:00
  • b4f4db5754 Deal better with the wallet letter number combo of 2019#X01 Sam Wenham 2019-02-24 18:55:30 +00:00
  • e59f8308ce Deal better with the wallet letter number combo of 2019#X01 Sam Wenham 2019-02-24 18:55:30 +00:00
  • c6656e6642 Stop django moaning about unit tests from pre 1.6, like we have any anyway! Sam Wenham 2019-02-24 16:48:12 +00:00
  • f6d4ce8d0b Stop django moaning about unit tests from pre 1.6, like we have any anyway! Sam Wenham 2019-02-24 16:48:12 +00:00
  • 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 +00:00
  • 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 +00:00
  • f16b4e3f47 Make the suryeys importer not explode Sam Wenham 2019-02-24 14:29:14 +00:00
  • 8fd23008e3 Make the suryeys importer not explode Sam Wenham 2019-02-24 14:29:14 +00:00
  • 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 +00:00
  • 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 +00:00
  • 552730f0a3 Revert urls.py as it contains Django 1.8 upgrade code Sam Wenham 2019-02-23 15:43:38 +00:00
  • 670559ec87 Revert urls.py as it contains Django 1.8 upgrade code Sam Wenham 2019-02-23 15:43:38 +00:00
  • 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 +00:00
  • 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 +00:00
  • f58b1db920 Don't create years that aren't here yet troggle goes boom Sam Wenham 2018-06-20 18:14:13 +01:00
  • 019f8c0550 Don't create years that aren't here yet troggle goes boom Sam Wenham 2018-06-20 18:14:13 +01:00
  • 3d2ac06a72 Move the years on a bit Sam Wenham 2018-06-20 18:11:12 +01:00
  • 952af7adc5 Move the years on a bit Sam Wenham 2018-06-20 18:11:12 +01:00
  • 9802f45452 Add missing linefeed on survey-parsing error message expoonserver 2018-06-18 23:43:20 +01:00
  • e3e75a40bf Add missing linefeed on survey-parsing error message expoonserver 2018-06-18 23:43:20 +01:00
  • 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 +01:00
  • 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 +01:00
  • 6805bcb690 Add 'troggle' namespace to databasereset.py so it runs in django >1.5 expoonserver 2018-06-17 02:41:58 +01:00
  • 01f17dc1cc Add 'troggle' namespace to databasereset.py so it runs in django >1.5 expoonserver 2018-06-17 02:41:58 +01:00
  • 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 +01:00
  • 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 +01:00
  • 10a05d686e django.setup needs to be run before any attempt to use database expoonserver 2018-06-17 02:23:02 +01:00
  • 94c232c775 django.setup needs to be run before any attempt to use database expoonserver 2018-06-17 02:23:02 +01:00
  • 89ef5c19ff imports must specify the application name i nlater django versions. databasereset updated accordingly. expoonserver 2018-06-16 19:00:26 +01:00
  • 4f665070d7 imports must specify the application name i nlater django versions. databasereset updated accordingly. expoonserver 2018-06-16 19:00:26 +01:00
  • 4385ce86c1 Add the extra setting for the threed cache to all the template configs Sam Wenham 2018-04-20 20:58:05 +01:00
  • 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