expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-05-11 09:54:31 +01:00
Code Issues 18 Projects 3 Activity
3,527 Commits 7 Branches 0 Tags
0e19353f8f046102693a99ac4fc00a1dfd4b5dfd
Commit Graph

3527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
expoonserver 560b9bf985 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
expoonserver 6652e3f160 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 b0f1f73ce4 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
expo 214d887c57 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 6b16724c2a 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
Sam Wenham f1bb927063 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
expo eeda1bed73 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
Sam Wenham 751ec9517f 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
Wookey 228814be33 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 cebcbeb73a 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 057b09dca9 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 480541ae54 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 60303d041c Remove unnecessary escape slashes 2015-06-28 13:46:28 +01:00