expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-22 23:31:52 +00:00
Code Issues 19 Projects 3 Activity
1,152 Commits 7 Branches 0 Tags 34 MiB
44caf35fd8
Commit Graph

1152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
7877efba0a 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
cfa888fde6 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
cedcb0988a 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
c939013b14 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
458d0e1ebc 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
776152ef47 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
9f285a9f34 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
302ad0632e 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
ffb5d7bdda 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
Sam Wenham
242cf4741a 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
41a14f161d 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
Wookey
f0e1406c5f 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
d7c6676c49 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
expoonserver
5e9dfc6ea6 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
Sam Wenham
27fca090fc 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
716131f005 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
expo
496280f3e6 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
Sam Wenham
0dd0951b28 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
b9597fbb57 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
Wookey
edc6591554 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