expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-26 01:01:53 +00:00
Code Issues 19 Projects 3 Activity
611 Commits 7 Branches 0 Tags 34 MiB
7a7433bc84
Commit Graph

611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sam Wenham
93d1c330c1 Bring troggle a little more up to date 2016-09-04 13:47:26 +01:00
expo
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.
 2016-07-02 23:42:47 +01:00
expo
4320e76298 merge serve changes 
HGerver canges Enter commit message.  Lines beginning with 'HG:' are removed.
 2016-06-09 04:16:46 +01:00
Sam Wenham
c3952cf3e7 Merge 2016-05-20 21:35:58 +01:00
Wookey
9ec3b9d1f7 Merge 'expofiles' instead of 'expoimages' config changes 2016-01-27 04:27:38 +00:00
Wookey
b63ac24468 Correct typo on cave and entrance template files 
('If you edit this files...')
 2016-01-27 04:24:44 +00:00
expoonserver
6357efa0b6 Move expoimage to expofiles 
Relies on permanent rediect in apache config to keep old URLs working
everywhere.
 2015-10-02 15:10:04 +01:00
expoonserver
fadf562fd9 remove code saying we can't do interlaced pngs. It's fine now. 2015-10-02 15:07:03 +01:00
expo
32f3dac621 Store expo user/password info in localsettings file, and not repeated in databaseReset script 2015-09-16 01:58:51 +01:00
expo
73e27355b1 Commit changes made on expo 2015 2015-09-16 01:52:45 +01:00
Sam Wenham
7e99c05e87 tidy up after merge 2015-08-22 13:28:17 +01:00
Sam Wenham
223be0454e Merge settings changes 2015-08-22 13:26:38 +01:00
expo
58831117e9 properly quote JSLIB_PATH and mke clear that example password is just an example 2015-07-26 00:38:10 +01:00
Sam Wenham
ad640eb70a Change JSLIB_PATH to JSLIB_URL and correct the path 2015-07-01 18:22:25 +01:00
Wookey
af2c8dd44c Fix unquoted string in troggle localsettingspotatohut.py 2015-07-01 03:55:12 +01:00
Sam Wenham
467ec2bcc3 sysadmin to expouser for email 2015-07-01 01:26:04 +01:00
Sam Wenham
a70621609b Move expo user settings out of databasereset.py to localsettings where they really belong 2015-07-01 01:18:25 +01:00
Sam Wenham
a024475446 Add a little style 2015-06-28 13:52:33 +01:00
Sam Wenham
d9a78fe2ab Remove unnecessary escape slashes 2015-06-28 13:46:28 +01:00
Sam Wenham
06de254c9e I think this is breaking prospecting 2015-06-28 13:39:50 +01:00
Sam Wenham
a6cba84dce Remove balkonhoehle from the QM parser as this will need a lot of effort to get working 2015-06-28 12:28:18 +01:00
Sam Wenham
49e8c50650 Correct JSLIB_URL 2015-06-27 13:01:15 +01:00
expo
4e57af79d4 Don't put passwords in the repo 2015-06-24 04:41:50 +01:00
expo
ee66e1dd8d Survex parser fix to avoid allocation on error (by martin). 2015-06-24 04:09:19 +01:00
expo
45fd219bc6 Added warnings that the database will need updating is cave or entrance data files are modified 2015-06-21 15:11:51 +01:00