Commit Graph

Select branches

Hide Pull Requests

Faster-survex-parser

RW_rebuild

django-1.10

django-upgrade

django-upgrade-pt2

master

old-master

Mono Color

• 5e9dfc6ea6 Fix Scan scanning, so that 2015#X01 format (with 'X') is accepted in scan directories. Allows 2016 data to be processed. expoonserver 2017-03-07 15:44:42 +00:00
• d7b2ddefce Fix Scan scanning, so that 2015#X01 format (with 'X') is accepted in scan directories. Allows 2016 data to be processed. expoonserver 2017-03-07 15:44:42 +00:00
• 27fca090fc Bring troggle a little more up to date Sam Wenham 2016-09-04 13:47:26 +01:00
• 93d1c330c1 Bring troggle a little more up to date Sam Wenham 2016-09-04 13:47:26 +01:00
• 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. expo 2016-07-02 23:42:47 +01:00
• 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. expo 2016-07-02 23:42:47 +01:00
• 496280f3e6 merge serve changes expo 2016-06-09 04:16:46 +01:00
• 4320e76298 merge serve changes expo 2016-06-09 04:16:46 +01:00
• 0dd0951b28 Merge Sam Wenham 2016-05-20 21:35:58 +01:00
• c3952cf3e7 Merge Sam Wenham 2016-05-20 21:35:58 +01:00
• b9597fbb57 Merge 'expofiles' instead of 'expoimages' config changes Wookey 2016-01-27 04:27:38 +00:00
• 9ec3b9d1f7 Merge 'expofiles' instead of 'expoimages' config changes Wookey 2016-01-27 04:27:38 +00:00
• edc6591554 Correct typo on cave and entrance template files ('If you edit this files...') Wookey 2016-01-27 04:24:44 +00:00
• b63ac24468 Correct typo on cave and entrance template files ('If you edit this files...') Wookey 2016-01-27 04:24:44 +00:00
• 560b9bf985 Move expoimage to expofiles Relies on permanent rediect in apache config to keep old URLs working everywhere. expoonserver 2015-10-02 15:10:04 +01:00
• 6357efa0b6 Move expoimage to expofiles Relies on permanent rediect in apache config to keep old URLs working everywhere. expoonserver 2015-10-02 15:10:04 +01:00
• 6652e3f160 remove code saying we can't do interlaced pngs. It's fine now. expoonserver 2015-10-02 15:07:03 +01:00
• fadf562fd9 remove code saying we can't do interlaced pngs. It's fine now. expoonserver 2015-10-02 15:07:03 +01:00
• b0f1f73ce4 Store expo user/password info in localsettings file, and not repeated in databaseReset script expo 2015-09-16 01:58:51 +01:00
• 32f3dac621 Store expo user/password info in localsettings file, and not repeated in databaseReset script expo 2015-09-16 01:58:51 +01:00
• 214d887c57 Commit changes made on expo 2015 expo 2015-09-16 01:52:45 +01:00
• 73e27355b1 Commit changes made on expo 2015 expo 2015-09-16 01:52:45 +01:00
• 6b16724c2a tidy up after merge Sam Wenham 2015-08-22 13:28:17 +01:00
• 7e99c05e87 tidy up after merge Sam Wenham 2015-08-22 13:28:17 +01:00
• f1bb927063 Merge settings changes Sam Wenham 2015-08-22 13:26:38 +01:00
• 223be0454e Merge settings changes Sam Wenham 2015-08-22 13:26:38 +01:00
• eeda1bed73 properly quote JSLIB_PATH and mke clear that example password is just an example expo 2015-07-26 00:38:10 +01:00
• 58831117e9 properly quote JSLIB_PATH and mke clear that example password is just an example expo 2015-07-26 00:38:10 +01:00
• 751ec9517f Change JSLIB_PATH to JSLIB_URL and correct the path Sam Wenham 2015-07-01 18:22:25 +01:00
• ad640eb70a Change JSLIB_PATH to JSLIB_URL and correct the path Sam Wenham 2015-07-01 18:22:25 +01:00
• 228814be33 Fix unquoted string in troggle localsettingspotatohut.py Wookey 2015-07-01 03:55:12 +01:00
• af2c8dd44c Fix unquoted string in troggle localsettingspotatohut.py Wookey 2015-07-01 03:55:12 +01:00
• cebcbeb73a sysadmin to expouser for email Sam Wenham 2015-07-01 01:26:04 +01:00
• 467ec2bcc3 sysadmin to expouser for email Sam Wenham 2015-07-01 01:26:04 +01:00
• 057b09dca9 Move expo user settings out of databasereset.py to localsettings where they really belong Sam Wenham 2015-07-01 01:18:25 +01:00
• a70621609b Move expo user settings out of databasereset.py to localsettings where they really belong Sam Wenham 2015-07-01 01:18:25 +01:00
• 480541ae54 Add a little style Sam Wenham 2015-06-28 13:52:33 +01:00
• a024475446 Add a little style Sam Wenham 2015-06-28 13:52:33 +01:00
• 60303d041c Remove unnecessary escape slashes Sam Wenham 2015-06-28 13:46:28 +01:00
• d9a78fe2ab Remove unnecessary escape slashes Sam Wenham 2015-06-28 13:46:28 +01:00
• 5a911ecec7 I think this is breaking prospecting Sam Wenham 2015-06-28 13:39:50 +01:00
• 06de254c9e I think this is breaking prospecting Sam Wenham 2015-06-28 13:39:50 +01:00
• 7056f9a8b2 Remove balkonhoehle from the QM parser as this will need a lot of effort to get working Sam Wenham 2015-06-28 12:28:18 +01:00
• a6cba84dce Remove balkonhoehle from the QM parser as this will need a lot of effort to get working Sam Wenham 2015-06-28 12:28:18 +01:00
• 34036581f2 Correct JSLIB_URL Sam Wenham 2015-06-27 13:01:15 +01:00
• 49e8c50650 Correct JSLIB_URL Sam Wenham 2015-06-27 13:01:15 +01:00
• dcc67fddda Don't put passwords in the repo expo 2015-06-24 04:41:50 +01:00
• 4e57af79d4 Don't put passwords in the repo expo 2015-06-24 04:41:50 +01:00
• 03cad0a37f Survex parser fix to avoid allocation on error (by martin). expo 2015-06-24 04:09:19 +01:00
• ee66e1dd8d Survex parser fix to avoid allocation on error (by martin). expo 2015-06-24 04:09:19 +01:00
• a4651eaa0a Added warnings that the database will need updating is cave or entrance data files are modified expo 2015-06-21 15:11:51 +01:00
• 45fd219bc6 Added warnings that the database will need updating is cave or entrance data files are modified expo 2015-06-21 15:11:51 +01:00
• 7aed3d3b30 Moved notable caves to settings.py, link to a script to fix permissions expo 2015-06-21 15:08:09 +01:00
• 087a028388 Moved notable caves to settings.py, link to a script to fix permissions expo 2015-06-21 15:08:09 +01:00
• 4771f52b20 Have different links for system js files and troggle js files expo 2015-06-21 15:06:44 +01:00
• 9fd6163704 Have different links for system js files and troggle js files expo 2015-06-21 15:06:44 +01:00
• 77ad85b05c merge balconhoehle changes from server Wookey 2015-06-19 01:55:51 +01:00
• 1b875a11a7 merge balconhoehle changes from server Wookey 2015-06-19 01:55:51 +01:00
• 01d877d26e Use django-registration, not a local copy. This old one is uses deprecated hashcompat. Wookey 2015-06-10 23:52:49 +01:00
• cad8001bd0 Use django-registration, not a local copy. This old one is uses deprecated hashcompat. Wookey 2015-06-10 23:52:49 +01:00
• e84d990366 Add in balkon hoehle QM list DWalker 2015-05-25 21:55:54 +01:00
• 220d5f589d Add in balkon hoehle QM list DWalker 2015-05-25 21:55:54 +01:00
• e06be10f7f Change password of 'expo' user created by databasereset script to match that used elsewhere Wookey 2015-05-25 21:26:26 +01:00
• d1ffa6fa1f Change password of 'expo' user created by databasereset script to match that used elsewhere Wookey 2015-05-25 21:26:26 +01:00
• fe6750e824 Fix up obvious URLs containing subarea names (smkridge) Wookey 2015-04-08 03:40:57 +01:00
• 412a9dbefe Fix up obvious URLs containing subarea names (smkridge) Wookey 2015-04-08 03:40:57 +01:00
• d29fe2ee1c Merge in Sam's parser debugging Wookey 2015-04-08 03:27:48 +01:00
• dc385b52bf Merge in Sam's parser debugging Wookey 2015-04-08 03:27:48 +01:00
• 1156b1d3ea rename troggle paper.odt to troggle_paper.odt as space in repo are a pain Wookey 2015-04-08 03:24:00 +01:00
• bc4fa32ce9 rename troggle paper.odt to troggle_paper.odt as space in repo are a pain Wookey 2015-04-08 03:24:00 +01:00
• 126a10cf94 Rename troggle paper to not have a space in it. Wookey 2015-04-06 02:38:24 +01:00
• d5d0a24bed Rename troggle paper to not have a space in it. Wookey 2015-04-06 02:38:24 +01:00
• 4560e0da84 Revert all of this the date is needed and is a not null in the db Sam Wenham 2015-01-26 21:53:32 +00:00
• 244a6177cf Revert all of this the date is needed and is a not null in the db Sam Wenham 2015-01-26 21:53:32 +00:00
• f9c2e0e170 One more try Sam Wenham 2015-01-26 21:15:17 +00:00
• 086bfe61a1 One more try Sam Wenham 2015-01-26 21:15:17 +00:00
• cf413dd03c Ooops that wasn't right Sam Wenham 2015-01-26 21:13:47 +00:00
• 187e537f46 Ooops that wasn't right Sam Wenham 2015-01-26 21:13:47 +00:00
• 4965678443 Don't assert an error on bad date formats Sam Wenham 2015-01-26 21:12:27 +00:00
• a5e7fcf435 Don't assert an error on bad date formats Sam Wenham 2015-01-26 21:12:27 +00:00
• 67f94f9436 A little more verbosity Sam Wenham 2015-01-19 22:48:50 +00:00
• 3bdd1ad737 A little more verbosity Sam Wenham 2015-01-19 22:48:50 +00:00
• 1186662960 Add a little verbosity Sam Wenham 2015-01-19 22:41:48 +00:00
• 0ab32ef60a Add a little verbosity Sam Wenham 2015-01-19 22:41:48 +00:00
• 3010961383 Try and ignore files that don't end .html (We really need to change to .xml) eg .html.orig!! Change the index on troggle to move on with the year Sam Wenham 2015-01-19 21:28:35 +00:00
• 9961c31e73 Try and ignore files that don't end .html (We really need to change to .xml) eg .html.orig!! Change the index on troggle to move on with the year Sam Wenham 2015-01-19 21:28:35 +00:00
• 806fd41130 remove two files accidentally included in last commit Wookey 2014-09-11 07:41:33 +01:00
• 7bd035f602 remove two files accidentally included in last commit Wookey 2014-09-11 07:41:33 +01:00
• af07161f05 remove internal copies of jquery, jquiery-forms, jquery-ui+themes, django-feincms and codemirror Wookey 2014-09-11 07:40:58 +01:00
• 086793c341 remove internal copies of jquery, jquiery-forms, jquery-ui+themes, django-feincms and codemirror Wookey 2014-09-11 07:40:58 +01:00
• 5ff759db93 Fix templates to use system javascript for jquery, jquery-ui and jquery-ui themes Wookey 2014-09-11 07:38:45 +01:00
• 814ecf8425 Fix templates to use system javascript for jquery, jquery-ui and jquery-ui themes Wookey 2014-09-11 07:38:45 +01:00
• 7f292d402b Use REPOS_ROOT_PATH so there is just one place to change paths Wookey 2014-09-11 06:33:34 +01:00
• 8563edd4a7 Use REPOS_ROOT_PATH so there is just one place to change paths Wookey 2014-09-11 06:33:34 +01:00
• c180780da9 Update the README file a bit - still needs work. Wookey 2014-09-10 23:46:05 +01:00
• e72546d4b8 Update the README file a bit - still needs work. Wookey 2014-09-10 23:46:05 +01:00
• d75862bc41 Merge change of 'cavesnew'->'caves' in databasereset. Wookey 2014-07-28 01:22:52 +01:00
• 9d3cac41b9 Merge change of 'cavesnew'->'caves' in databasereset. Wookey 2014-07-28 01:22:52 +01:00
• 7cdb603d75 Add 107 to notable caves (noting that this is hard-coded into core/views_caves.py which is just shoddy) Wookey 2014-07-28 01:21:24 +01:00
• 3daf8d14c9 Add 107 to notable caves (noting that this is hard-coded into core/views_caves.py which is just shoddy) Wookey 2014-07-28 01:21:24 +01:00