expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-05-13 10:54:41 +01:00
Code Issues 18 Projects 3 Activity
1,308 Commits 7 Branches 0 Tags
d9c6986a892c47233a95081af94a1d2ea25a64ce
Commit Graph

1308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Wenham 12a991920a Get get_absolute_url in the correct place 2019-02-25 23:07:20 +00:00
RadostW d3f633e41d 2019-02-25 22:34:13 +00:00
RadostW 0758efb3ec 2019-02-25 22:34:13 +00:00
RadostW 61bd6e81f1 tab/space fix 2019-02-25 22:28:30 +00:00
RadostW 54b782c67e tab/space fix 2019-02-25 22:28:30 +00:00
RadostW edddfb7fc6 added Rad's playground 2019-02-25 22:24:33 +00:00
RadostW 78a5f656b9 added Rad's playground 2019-02-25 22:24:33 +00:00
RadostW 71d1719850 merge 2019-02-25 21:02:30 +00:00
RadostW 6e23853759 merge 2019-02-25 21:02:30 +00:00
RadostW 7c2d336bd7 change to table 2019-02-25 20:58:32 +00:00
RadostW becfaa1504 change to table 2019-02-25 20:58:32 +00:00
Sam Wenham bebbad2448 Fix the All Survex page to work with 1623 area 2019-02-25 20:13:28 +00:00
Sam Wenham 77a6015ad6 Fix the All Survex page to work with 1623 area 2019-02-25 20:13:28 +00:00
Sam Wenham b43bd58f22 Decode the url encoded # when looking at wallets 2019-02-24 19:50:45 +00:00
Sam Wenham 7c15a7439d Decode the url encoded # when looking at wallets 2019-02-24 19:50:45 +00:00
Sam Wenham e59f8308ce Deal better with the wallet letter number combo of 2019#X01 2019-02-24 18:55:30 +00:00
Sam Wenham b4f4db5754 Deal better with the wallet letter number combo of 2019#X01 2019-02-24 18:55:30 +00:00
Sam Wenham f6d4ce8d0b Stop django moaning about unit tests from pre 1.6, like we have any anyway! 2019-02-24 16:48:12 +00:00
Sam Wenham c6656e6642 Stop django moaning about unit tests from pre 1.6, like we have any anyway! 2019-02-24 16:48:12 +00:00
Sam Wenham af22385c68 Fix survey scans 
Remove the assert for folders in survey wallets, this does mean currently they
will be ignored by troggle.
 2019-02-24 16:46:02 +00:00
Sam Wenham e6fa54d0e5 Fix survey scans 
Remove the assert for folders in survey wallets, this does mean currently they
will be ignored by troggle.
 2019-02-24 16:46:02 +00:00
Sam Wenham 8fd23008e3 Make the suryeys importer not explode 2019-02-24 14:29:14 +00:00
Sam Wenham f16b4e3f47 Make the suryeys importer not explode 2019-02-24 14:29:14 +00:00
Sam Wenham 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
 2019-02-24 13:03:34 +00:00
Sam Wenham 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
 2019-02-24 13:03:34 +00:00
Sam Wenham 670559ec87 Revert urls.py as it contains Django 1.8 upgrade code 2019-02-23 15:43:38 +00:00
Sam Wenham 552730f0a3 Revert urls.py as it contains Django 1.8 upgrade code 2019-02-23 15:43:38 +00:00
Sam Wenham 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
 2019-02-23 15:30:58 +00:00
Sam Wenham 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
 2019-02-23 15:30:58 +00:00
Sam Wenham 019f8c0550 Don't create years that aren't here yet troggle goes boom 2018-06-20 18:14:13 +01:00
Sam Wenham f58b1db920 Don't create years that aren't here yet troggle goes boom 2018-06-20 18:14:13 +01:00
Sam Wenham 952af7adc5 Move the years on a bit 2018-06-20 18:11:12 +01:00
Sam Wenham 3d2ac06a72 Move the years on a bit 2018-06-20 18:11:12 +01:00
expoonserver e3e75a40bf Add missing linefeed on survey-parsing error message 2018-06-18 23:43:20 +01:00
expoonserver 9802f45452 Add missing linefeed on survey-parsing error message 2018-06-18 23:43:20 +01:00
expoonserver b4d3cb514c Make sure that cave parser only reads .html files in cave_data dir (to stop foo~ causing 'duplicate cave' error) 2018-06-18 23:17:05 +01:00
expoonserver 1ad58d6b5d Make sure that cave parser only reads .html files in cave_data dir (to stop foo~ causing 'duplicate cave' error) 2018-06-18 23:17:05 +01:00
expoonserver 01f17dc1cc Add 'troggle' namespace to databasereset.py so it runs in django >1.5 2018-06-17 02:41:58 +01:00
expoonserver 6805bcb690 Add 'troggle' namespace to databasereset.py so it runs in django >1.5 2018-06-17 02:41:58 +01:00
expoonserver 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...
 2018-06-17 02:24:00 +01:00
expoonserver 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...
 2018-06-17 02:24:00 +01:00
expoonserver 94c232c775 django.setup needs to be run before any attempt to use database 2018-06-17 02:23:02 +01:00
expoonserver 10a05d686e django.setup needs to be run before any attempt to use database 2018-06-17 02:23:02 +01:00
expoonserver 4f665070d7 imports must specify the application name i nlater django versions. 
databasereset updated accordingly.
 2018-06-16 19:00:26 +01:00
expoonserver 89ef5c19ff imports must specify the application name i nlater django versions. 
databasereset updated accordingly.
 2018-06-16 19:00:26 +01:00
Sam Wenham bfc867826d Add the extra setting for the threed cache to all the template configs 2018-04-20 20:58:05 +01:00
Sam Wenham 4385ce86c1 Add the extra setting for the threed cache to all the template configs 2018-04-20 20:58:05 +01:00
Sam Wenham 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
 2018-04-20 20:55:12 +01:00
Sam Wenham 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
 2018-04-20 20:55:12 +01:00
Sam Wenham bcaa4b27d2 Merge with django-upgrade 2018-04-17 22:19:20 +01:00