|
|
41e11c6c2e
|
|
2019-02-25 23:37:12 +00:00 |
|
Sam Wenham
|
0eb5e560d2
|
Merge
|
2019-02-25 23:34:10 +00:00 |
|
Sam Wenham
|
a61e66bb47
|
Start of moving databasereset to django management
|
2019-02-25 23:10:24 +00:00 |
|
Sam Wenham
|
f9dc4500d9
|
Get get_absolute_url in the correct place
|
2019-02-25 23:07:20 +00:00 |
|
|
|
d3f633e41d
|
|
2019-02-25 22:34:13 +00:00 |
|
|
|
61bd6e81f1
|
tab/space fix
|
2019-02-25 22:28:30 +00:00 |
|
|
|
edddfb7fc6
|
added Rad's playground
|
2019-02-25 22:24:33 +00:00 |
|
|
|
71d1719850
|
merge
|
2019-02-25 21:02:30 +00:00 |
|
|
|
7c2d336bd7
|
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
|
b43bd58f22
|
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
|
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
|
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
|
8fd23008e3
|
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
|
670559ec87
|
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
|
019f8c0550
|
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 |
|
expoonserver
|
e3e75a40bf
|
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
|
01f17dc1cc
|
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
|
94c232c775
|
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 |
|
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
|
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
|
bcaa4b27d2
|
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 |
|
Sam Wenham
|
e61dffbfea
|
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
|
5853daba89
|
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
|
0633e17d11
|
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
|
2c2c815b25
|
Up to 1.6.11 on stretch. New manage.py. Some tidying
|
2018-04-15 12:00:59 +01:00 |
|
Sam Wenham
|
3fd805e26c
|
More cleanup and modernisation
|
2018-04-14 21:37:12 +01:00 |
|
Sam Wenham
|
1974d0758a
|
Clean up indenting in models
add registration required modules
|
2018-04-14 21:14:19 +01:00 |
|
Sam Wenham
|
e6b12e99e6
|
Add ref as a valid survex command to prevent errors
|
2018-04-14 16:13:21 +01:00 |
|
Sam Wenham
|
f60df05aab
|
add all the docker commands to bulid and run troggle in a container (more of a guide than something to run)
|
2018-04-11 22:32:47 +01:00 |
|
Sam Wenham
|
6c1915deed
|
Add missing expose container port and commneted command to auto start the dev server
|
2018-04-11 22:18:15 +01:00 |
|
Sam Wenham
|
1f8512a82c
|
Update requirements for 1.5.12 and preserve the 1.4.22 requiremnets
|
2018-04-11 22:13:31 +01:00 |
|
Sam Wenham
|
c638e1c392
|
Add the docker files and the pip requiremnets.txt to allow install usign pip
|
2018-04-11 22:03:48 +01:00 |
|
Sam Wenham
|
789c33fcb6
|
Upgrade to django 1.5, some functions have been changed
url in templates now requires quotes roung the first arg
USE_TZ added
|
2018-04-11 22:02:57 +01:00 |
|
Sam Wenham
|
0ef4f7832c
|
Import Image from PIL to support newer python
import the Django registration module rather than the troggle one
|
2018-04-10 01:34:06 +01:00 |
|
Wookey
|
0c2a6b49ba
|
Avoid barf if URL field in new cave form is left blank.
|
2018-02-28 15:57:27 +00:00 |
|
Wookey
|
6481fda4d7
|
Update old website base URL in template from cucc.survex.com/expo to expo.survex.com
|
2018-02-28 15:55:00 +00:00 |
|
expoonserver
|
86b1e6e577
|
Test whether url is not 'None' before applying 'startswith' test in
forms.py entering new caves, otherwise it barfs.
|
2017-10-25 03:49:03 +01:00 |
|
expoonserver
|
d7b2ddefce
|
Fix Scan scanning, so that 2015#X01 format (with 'X') is accepted in
scan directories. Allows 2016 data to be processed.
|
2017-03-07 15:44:42 +00:00 |
|
