expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-12-04 23:52:18 +00:00
Code Issues 19 Projects 3 Activity
1,143 Commits 7 Branches 0 Tags 34 MiB
656ddcfe93
Commit Graph

1143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sam Wenham
6f6327d267 Merge with django-upgrade 2018-04-17 22:19:20 +01:00
expoonserver
d0e0eee15a Add CaveView spinny caves view to each troggle cave page 2018-04-17 21:57:02 +01:00
expoonserver
6710a469ee Add CaveView spinny caves view to each troggle cave page 2018-04-17 21:57:02 +01:00
Sam Wenham
e61dffbfea Add default BooleanField(default=False) for django 1.7 compatibility 2018-04-17 21:51:39 +01:00
Sam Wenham
174c475ec7 Add default BooleanField(default=False) for django 1.7 compatibility 2018-04-17 21:51:39 +01:00
Sam Wenham
222a87f5bd 1.7 requiremnets 2018-04-15 16:45:07 +01:00
Sam Wenham
d3b42a125d 1.7 requiremnets 2018-04-15 16:45:07 +01:00
Sam Wenham
5853daba89 New vars needed to make django 1.7 and tinymce work 2018-04-15 16:36:23 +01:00
Sam Wenham
2f2f4d396d New vars needed to make django 1.7 and tinymce work 2018-04-15 16:36:23 +01:00
Sam Wenham
7faf2e1cb9 Django 1.7 wsgi.py 2018-04-15 16:29:30 +01:00
Sam Wenham
e1eea7088f Django 1.7 wsgi.py 2018-04-15 16:29:30 +01:00
Sam Wenham
0633e17d11 missed from last commit 2018-04-15 16:28:52 +01:00
Sam Wenham
760fa3114f missed from last commit 2018-04-15 16:28:52 +01:00
Sam Wenham
758259be4d Django 1.7 mostly working. Big refactor so probably bugs 2018-04-15 16:28:13 +01:00
Sam Wenham
798ae591c6 Django 1.7 mostly working. Big refactor so probably bugs 2018-04-15 16:28:13 +01:00