2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-05-13 11:34:40 +01:00
Commit Graph

1308 Commits

Author SHA1 Message Date
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
Sam Wenham 06de254c9e I think this is breaking prospecting 2015-06-28 13:39:50 +01:00
Sam Wenham 5a911ecec7 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 7056f9a8b2 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
Sam Wenham 34036581f2 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 dcc67fddda 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 03cad0a37f 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
expo a4651eaa0a Added warnings that the database will need updating is cave or entrance data files are modified 2015-06-21 15:11:51 +01:00
expo 087a028388 Moved notable caves to settings.py, link to a script to fix permissions 2015-06-21 15:08:09 +01:00
expo 7aed3d3b30 Moved notable caves to settings.py, link to a script to fix permissions 2015-06-21 15:08:09 +01:00
expo 9fd6163704 Have different links for system js files and troggle js files 2015-06-21 15:06:44 +01:00
expo 4771f52b20 Have different links for system js files and troggle js files 2015-06-21 15:06:44 +01:00
Wookey 1b875a11a7 merge balconhoehle changes from server 2015-06-19 01:55:51 +01:00
Wookey 77ad85b05c merge balconhoehle changes from server 2015-06-19 01:55:51 +01:00
Wookey cad8001bd0 Use django-registration, not a local copy.
This old one is uses deprecated hashcompat.
2015-06-10 23:52:49 +01:00