Commit Graph

778 Commits

Author SHA1 Message Date
Jenny
7987ff4279 merge 2016-05-15 08:31:32 +12:00
Jenny
36a6597bab Add survey and tweak description of 2004-01, ready for katastering. 2016-05-15 08:30:34 +12:00
Wookey
41943d3959 Add bier tent to expo folk list. Set it and rover to 'not underground' status 2016-05-14 02:47:13 +01:00
Jenny
9fb52b9af2 Attempt to fix tags in 1996WK4 and 2009-03 to stop databaseReset.py complaining. 2016-05-11 15:06:44 +12:00
Jenny
9332fa5b8e Merge 2016-05-11 14:58:56 +12:00
Jenny
6463a5018d Add more Olly/Jenny plateau cave descriptions and photos 2016-05-11 14:58:12 +12:00
DavidWalker13
c48f254422 take 3 2016-05-10 22:22:52 +01:00
DavidWalker13
24b0ec44dd take 2 2016-05-10 22:01:21 +01:00
DavidWalker13
fc12274d08 added link to survey for balkony 2016-05-10 21:56:08 +01:00
Wookey
68aff4fcc4 merge lots of server changes 2016-05-10 02:41:52 +01:00
Wookey
ee4cda627e Add katasterable-or-not and numberindexfiles for tracking cave lists
Thanks to Wadders for preparing them
2016-05-10 02:40:26 +01:00
Jenny
00b176d9b3 fix another photo link (hopefully) 2016-05-05 08:28:43 +12:00
Jenny
f9ef0a606a fix mistakes i made in 2007-71 and 2013-sw-01 2016-05-05 08:14:50 +12:00
Jenny
f4ebe06ec4 Entrance phots for 83, files for 2013-sw-01 2016-05-04 14:16:11 +12:00
Jenny
3a7e41de05 Entrance photos for 2007-70 and 2013-sw-01.
fix typos in 2007-71
2016-05-04 13:58:13 +12:00
Jenny
fae9a0decf Photos, 2007-71 2016-05-04 09:29:52 +12:00
Jenny
eb353e1eb6 still tryign to make 2007-71 work 2016-05-04 09:24:11 +12:00
Jenny
2666bf1810 still trying to make 2007-71 work 2016-05-04 09:22:03 +12:00
Jenny
7c77a7e400 Trying to make photos work for 2007-71 2016-05-04 09:19:29 +12:00
Jenny
4958317fc6 2007-71 - manually entering length & depth info, and trying to make photos work. 2016-05-04 09:06:38 +12:00
Jenny
d696046e20 Merge 2016-05-03 17:30:15 +12:00
Jenny
853848b514 Adding links to entrance photos for 2007-71 2016-05-03 17:28:03 +12:00
Wookey
4e70ae3388 Add 96WK11 entrance info and cave description. Inculding entrance pic, tag location pic, wook descending pic. And pland an elevation drawn-up surveys (scans). 2016-05-02 02:15:29 +01:00
Wookey
9b76ef19a5 Update 1996WK4 with info from 2015 failed refinding attempt. 2016-04-29 23:03:04 +01:00
Jenny
d49baaf223 Fix typos and correct marking status for 2009-03 2016-04-29 08:08:38 +12:00
Jenny
316ce0b8a2 Merge 2016-04-28 09:04:53 +12:00
Jenny
fc0c100a9b Adding 2007-71 underground descriton and entrance data, and hopefully not breaking anything. 2016-04-28 09:03:03 +12:00
Wookey
ceb2bce011 Update folk list for 2015: Sam did go underground (just). Add missing Nathan Walker. 2016-04-27 02:24:49 +01:00
Wookey
656f3fb037 Add 2015 logbook images 2016-04-25 04:57:31 +01:00
Wookey
f8a2312937 Correct error for Densham. He was there in 2010, not 2009. 2016-04-20 04:19:42 +01:00
Wookey
1cb8ca2d52 Fix more off-by-ones chopping off names and update records section 2016-04-20 04:19:10 +01:00
Wookey
2745c8b528 Fix off-by-one error chopping off first char of people's names 2016-04-20 03:44:41 +01:00
Wookey
d380bbf126 Add people for 2015 2016-04-20 03:44:12 +01:00
Wookey
348804144f Remove spurious trailing space in all cave files 2016-03-20 02:41:50 +00:00
Wookey
d27be9aca9 Rename entrance_data files with spaces in them (guaranteed to break something) 2016-03-20 02:30:44 +00:00
Wookey
411ec79662 Fix annoying 'if you edit this files' spello in every cave-data and entrance_data file 2016-03-20 02:24:37 +00:00
Wookey
37e6d79500 Correct 'expoimages' -> 'expofiles' in many files. 2016-03-20 01:18:27 +00:00
expo
538e2536f7 Changes made via web interface 2015 2015-08-14 14:42:54 +01:00
Wookey
3405902b2c Merge in lots of updates from expo machine 2015-08-08 03:48:26 +01:00
Wookey
75e9364d63 Add survex file for 107 into cave_data 2015-08-08 00:05:24 +01:00
expo
77fa2f6610 marking updated, links fixed 2015-08-02 10:54:08 +01:00
expo
cc62d8824a Name changed 2015-08-02 10:52:15 +01:00
expo
98222771de Fixed broken links 2015-08-02 10:51:45 +01:00
expo
82f772cadf Name fixed 2015-08-02 10:48:58 +01:00
expo
3e903f28db Name fixed 2015-08-02 10:48:19 +01:00
expo
f638d865d4 clarification of notes 2015-08-02 10:47:37 +01:00
expo
b6619ee8cb name corrected 2015-08-02 10:46:31 +01:00
expo
2d2491d538 new descriptions etc 2015-08-02 10:45:49 +01:00
Wookey
9ad9875e29 Add cave entry for 2009-03 2015-07-31 00:31:21 +01:00
Wookey
740df00a71 remove spuirous spaces 2015-07-31 00:17:49 +01:00
Wookey
833c504c37 Add cave entry for 2009-03 2015-07-31 00:02:24 +01:00
expo
f3a13d8085 initial commit of CUCC2015DL01 and CUCC2015DL02 2015-07-27 22:41:33 +01:00
expo
5c14c21678 Put in relative URLs so that cave decription, survye and data links work for major caves 2015-07-26 01:02:06 +01:00
Olly Betts
6be112763a Use a rendered terrain image instead of the scanned map 2015-07-21 16:59:14 +01:00
Olly Betts
18e7126dd9 Update prospecting guide for coord system switch in dataset 2015-07-21 07:41:28 +02:00
Olly Betts
cacde9fea7 Create v7 3d files, since that's all cavestats can handle 2015-07-21 07:40:56 +02:00
Sam Wenham
e9b0d98af5 Correct Nat's mugshot page 2015-06-28 12:39:14 +01:00
Wookey
09de048af9 Add pic of Nat to folk list 2015-06-26 01:58:20 +01:00
expo
be70d66913 merge ol's prospecting guide changes 2015-06-24 03:59:57 +01:00
expo
42baf77dac Update descriptions for 263 and 264 (during training weeken) 2015-06-24 03:57:35 +01:00
expo
9f6bcdd477 Added warning to update database 2015-06-21 15:21:17 +01:00
expo
9688f3d22b updated description 2015-06-21 15:02:19 +01:00
expo
57013bc47e moved balkony images and updated descriptions 2015-06-20 22:23:12 +01:00
olly
c01591872d Cut down on noise from parsing dump3d output 2015-06-20 11:43:34 +12:00
olly
486ef4a633 More pythonic if 2015-06-20 11:06:52 +12:00
olly
05b55391d6 whitespace cleanup 2015-06-20 10:51:19 +12:00
olly
293441a503 Remove bogus trailing ; 2015-06-20 10:44:17 +12:00
olly
85d776666e Fix coordinates of "all" to match map scan 2015-06-20 10:43:51 +12:00
olly
bf265338a7 Fix layout of area table 2015-06-20 10:42:05 +12:00
olly
faa7b06758 Revert commit 2078 - put the javascript back in <head> 2015-06-20 10:30:46 +12:00
Wookey
537831449d Merge balconhoehle approach info and lots of logbook edits 2015-06-19 03:23:06 +01:00
DavidWalker13
a7c7ef71e4 added entrance photo for Blakonhoehle 2015-05-25 22:55:26 +01:00
DavidWalker13
cee0131928 Changed 264 description 2015-05-25 22:12:38 +01:00
expoonserver
7e8b240a87 Add co-ordinates and access description for 264 (clownhöhle) 2015-05-25 21:40:04 +01:00
Wookey
c2dfc6182c fix up URLs in cave_data files for ${subarea} -> '1623' 2015-04-07 05:26:41 +01:00
Wookey
b4472fd12b remove lots of autogenerated files in the reop 2015-04-07 05:05:39 +01:00
Wookey
4bdd193d7f .hg/last-message.txt 2015-04-07 05:01:27 +01:00
Wookey
8763d9831b move all the noinfo subareas in noinfo/1623 2015-04-06 04:52:20 +01:00
Wookey
2a671e9095 Update locations and infability for 2014-NEO-01 and 2014-SD-01 2015-03-25 03:58:02 +00:00
Wookey
d9d6ceef67 about 5th attempt to get 2014-NEO-01 and 2014-SD-01 to have matching
filenames and slugs everywhere...
2015-03-25 03:40:29 +00:00
Wookey
2fa5279506 unixify lineends on a load of files in cave_data/entrance_data 2015-03-25 03:36:58 +00:00
Wookey
87c46836f3 remove spurious 1623-CUCC 2014 SD 01A.html
rename 1623-CUCC 2014 * -> 1623-2014-*
2015-03-25 03:35:56 +00:00
Wookey
2c7f33a15d Regularise names and explorer info a little 2015-03-25 03:28:56 +00:00
Wookey
d8312307ef Fix various slugname mismatches 2015-03-25 03:22:25 +00:00
Wookey
5e8c902772 make 2011-01 slug and filenames match up 2015-03-25 03:13:03 +00:00
Wookey
460117963d fix 263->163 typos in clownhöhle 2015-03-25 03:06:44 +00:00
Wookey
b7759e0e51 remove cave_data/1623-2011-01.html (we have
cave_data/1623-2011-1.html) already
2015-03-25 00:37:37 +00:00
Wookey
933d0daf42 more noinfo/cave_data/2011-1.html to noinfo/cave_data/1623-2011-1.html 2015-03-25 00:31:50 +00:00
expoonserver
a10dc78739 replace cave_data/1623-2011-1.html with more up-to-date cave_data/2011-1.html 2015-03-25 00:15:07 +00:00
Wookey
3eb9d153dd Remove spurious 'CUCC' from 2014-NEO-01 and 2014-SD-01 2015-03-24 22:36:55 +00:00
Wookey
e4a5c0f93b Move Bullet Second Hoehle updated description to correct filename 1623-2011-01.html (removing old 1623-2011-1.html) 2015-02-01 15:22:31 +00:00
Wookey
16217c32e4 rename 2005-05 -> 264 (balconhoehle), 2010-01 ->263 (clownhoehle). 2015-02-01 12:26:29 +00:00
Wookey
b70999367c rename 2011-1 files to 2011-01 for consistency 2015-01-26 21:45:18 +00:00
Wookey
86c65a2f65 Assign kataster number 263 to 1623-2010-01 2015-01-20 21:37:30 +00:00
Wookey
782dba6323 Rename balconhoehle (1623-2005-05) as 264, now it has a number 2015-01-20 21:34:15 +00:00
Wookey
12cb690c88 Correct accidentaly-intoduced syntax error in noinfo/make-folklist.py 2015-01-13 17:47:48 +00:00
Wookey
3ec0285fbb Remove some waddington wordiness 2015-01-13 17:45:43 +00:00
Wookey
7c8c1d1323 Update 'consecutive expos' records. 2015-01-13 17:38:27 +00:00
Wookey
13cd22e7d2 Add 2014 expo members 2015-01-03 00:32:35 +00:00
Martin Green
93c6071bab merge 2014-08-25 19:03:00 +01:00
expo
30a5978cc9 ? 2014-08-21 21:59:14 +01:00
expo
5f64069ae3 entered via website 2014-08-21 21:57:50 +01:00
expo
c15b8b092c modified via website 2014-08-21 21:46:00 +01:00
expo
b20d827893 added 2014-08-21 21:41:37 +01:00
expo
c19c68854d data entered via website 2014-08-15 17:14:45 +01:00
Wookey
bf4c76f0c8 Merge changes 2014-08-13 14:52:26 +01:00
Wookey
e19a209ea9 Remove kataster_form.sxd as it's now a .odg in the 'documents' bucket
Update link in the kaster page "katast.htm"
2014-08-13 14:50:31 +01:00
expo
8e7238bca1 Edits via troggle 2014-08-09 22:33:58 +01:00
expoonserver
9446c5600c Fix up dump3d output parsing in prospecting-guide script to recognise new 3d types in survex >= 1.2.7 2014-08-05 13:08:03 +01:00
expoonserver
c98ed6a3c1 Correct path to entrance photo 2014-08-05 13:06:20 +01:00
Sam
3288c1b531 Fix 1623-2010-01 slugs by adding "a" the the enterance 2014-07-25 13:34:37 +01:00
expo
dd5ed99183 add 2010-03 entrance file placeholder. No rel info-needs adding. Adding this just stops troggle whinging. 2014-07-24 02:29:11 +01:00
expo
8772021e66 Add ../ to survey URLs to get out of 'plateau' level. This should all be fixed. 2014-07-24 02:17:19 +01:00
expo
afd0ad4f17 Move 107 full-size surveys into '107' subdir. Fix URLs accordingly. 2014-07-24 02:07:54 +01:00
expo
b915e1c045 Updated 107 entrance description for 2013 finders. (Awaiting pics) 2014-07-24 01:33:22 +01:00
expoonserver
5521857e97 Add links to Julia's 2013 entrance photos for 2001-02, 2001-03 204f
231b,c,g,g and 244
2014-07-15 15:50:25 +01:00
expoonserver
53c3755187 Add 231b entrance photos at sensible web resolution. 2014-07-14 23:40:31 +01:00
expoonserver
44d6f442ed Add 231b entrance photos 2014-07-14 22:36:09 +01:00
Wookey
4e2623ae62 Rename 1978 107 survey to 'survey-1978'
Add links from 2013 plen and elv to original PDFs (in files bucket,
not website)
2014-07-14 03:59:24 +01:00
Wookey
bfbf9804da Add 2013 finds into 107 (gemshoehle) cave description. 2014-07-14 03:45:17 +01:00
Wookey
3ddea343a4 Edit the thumbnail entrance pic link for 107 too. 2014-07-14 03:12:16 +01:00
Wookey
1dd55800e8 Fix link to entrance pic for 107 2014-07-14 03:09:21 +01:00
Wookey
050d30798d UPdate 107 html to point at new images 2014-07-11 01:06:15 +01:00
Wookey
3d48ef8b71 Move 107 images into it's own dir from 'others'.
Add 2013 plan and survey
2014-07-11 00:39:23 +01:00
Andy Waddington on Loser
9dd33d5911 All minor typos or tiny markup erros 2014-07-03 11:25:49 +01:00
Andy Waddington on Loser
c1e2297069 Fixed single letter typo first noted in my "2003WebsiteBuglist" file less than eleven years ago...
user: Andy Waddington on Loser <expo@pennine.ddns.me.uk>
branch 'expoweb'
changed noinfo/years/1978/descnt.htm
2014-07-02 17:43:14 +01:00
expoonserver
8a654a2dad Links to UBSS journal added for survey and references. 2013-10-08 02:06:36 +01:00
Wookey
4d79effe45 Add survey image png file of LA11 (lungehöhle), linking to PDF 2013-10-07 23:38:53 +01:00
Wookey
5cff21e843 Move Sternloch images into LA12 subdir. 2013-10-04 14:42:25 +01:00
Wookey
1c21f654e4 Add PDF of drawn up LA11 (Lunghöhle) LUSS survey. 2013-10-04 14:41:43 +01:00
Wookey
3eed63125d Merge changes pulled in from online edits on server 2013-10-04 10:51:30 +01:00
Wookey
085aaf9f07 Move the stenloch entrance pic to the right place 2013-10-04 10:49:52 +01:00
expoonserver
d978588aae remove unused entrance slug 2013-10-04 03:23:50 +01:00
expoonserver
67c21f41ec Include UBSS in explorers, and correct areas list 2013-10-04 03:18:24 +01:00
expoonserver
48fe93df47 Update areas 2013-10-04 03:17:40 +01:00
expoonserver
ea89d4e513 Update area names for 1999_MS_02 2013-10-04 03:16:43 +01:00
expoonserver
33bb793da2 update BS16 info 2013-10-04 03:06:16 +01:00
Wookey
4c92332b4e Add pic of luss bivi and Sternloch (LA12) entrance 2013-10-04 02:59:06 +01:00
Wookey
c2a8a808a2 Merge expo 2013 changes and wook's slippy-map updates 2013-08-27 00:10:19 +01:00
Wookey
42dc67e15d Add 2013 members 2013-08-08 17:50:47 +01:00
olly
2e40991173 merge 2013-08-08 15:47:13 +02:00
expo
511c717eff Updates to caves to improve prospecting guide. Changed main page to 2013. 2013-08-01 17:06:38 +02:00
expo
1a4c89aa5d Add amd64-named version of cavestats 2013-07-22 00:18:08 +02:00
expo
1c88389861 update build info for cavestats, and make cavestats a link to ewither amd64 or i386 version 2013-07-21 23:37:30 +02:00
expo
97046b8336 rebuild cavestats_i386 to actually be a 23bit not 64 bit binary.
Also update to .3d v7 from survex 1.2.6 to match amd64 version
2013-07-21 15:25:42 +02:00
Wookey
5f5823eacb Add ms-loeffler's surname 2013-06-25 17:08:58 +01:00
Wookey
e66e552398 Fix errors in noinfo/folk.csv 2013-06-25 04:13:32 +01:00
expoonserver
aece4b5327 Add 2012 people to the folk csv file - the definitive way of creating a new year. 2013-06-25 03:54:42 +01:00
Wookey
cef8994642 Add entrance slug designations - not sure this is right... 2013-06-20 02:19:09 +01:00
Wookey
8ca836e5ec Declare prospectoing guide page to be UTF-8 2013-06-19 04:05:46 +01:00
Wookey
e7f536cfb7 further tidying and documenting of the main 3ddump file regexp 2013-06-19 03:50:45 +01:00
Wookey
d6ee94bf79 Use verbose option for regex to lay it out with comments so not
utterly cryptic
2013-06-19 03:35:59 +01:00
Wookey
dca54300c4 Update prospecting guide scripts to include greisskogel area
And make much more robust for missing files, processing errors and
simplify main regex
2013-06-19 03:21:41 +01:00
Wookey
8e4980d5d8 Updated 'cavestats' binary that understands 3d format v7
and new message format (amd64 version)
2013-06-11 04:00:47 +01:00
Wookey
eb7cacba21 Set up proper OS path for cavestats binary 2013-06-11 03:58:57 +01:00
Wookey
d0c3799cfb Correct cavestats build info
(need to copy file in after build otherwise dpkg-source barfs on
changed file)
2013-06-11 03:57:17 +01:00
Wookey
1649f30f81 Update cavestats.c for newer survex help message lookup format 2013-06-11 03:56:09 +01:00
expoonserver
f8b29db2a4 Correct typo in julian's name. 2012-09-24 23:51:57 +01:00
Wookey
c9568c2d64 Remove reference to nonexistent entrance slug in 2010-03 2012-09-24 23:41:21 +01:00
Wookey
45de603552 Correct entrance slug name for 2012-ns-03 to match reference in cave_data 2012-09-24 23:39:30 +01:00
Wookey
7951ddd39f Correct entrance slugs (really this time) for 2012-ns-09 and
2012-ns-13 which have 'b' entrances.
Also rename 1623-2012-ns-03a.html to 1623-2012-ns-03.html so that it
matches slug reference for the cave.
2012-09-24 23:37:18 +01:00
Wookey
3357ec2284 remove non-existent entracne slug in 2012-ns-10 2012-09-24 22:41:30 +01:00
expoonserver
6c23512132 Get rid of long-superceded CAVETAB.sxc file
HG removed noinfo/CAVETAB2-use-the-csv-file-not-this-one.sx
2012-09-24 21:43:42 +01:00
Wookey
810997377c remove absolute URLs and fix <entranceslugs> pointing at the wrong caves 2012-09-24 21:30:00 +01:00
expo
b7a28447f2 Merge assorted fixes from server 2012-09-08 04:21:41 +02:00
Wookey
ad491eb225 Remove some more old svn-prop backup files 2012-09-08 03:19:10 +01:00
Wookey
2f9dd49f0b Add surveys of 148, 81, 82 area and links from 148 and 81 descriptions. 2012-09-08 03:14:48 +01:00
expoonserver
188aff791e Tidy up a load of svn-prop files that shouldn't be here and certainly not in mercurial VCS 2012-09-08 02:17:00 +01:00
expoonserver
2c47e0964b rename 2012-dd-06.html to 1623-2012-dd-06.html fixing slug names and missing description close tag 2012-09-08 02:15:20 +01:00
ExpoOnServer
7ebf36e6e7 Remove '?' from filename 1623-BS20-nn?.html as it blows up windows machines 2012-09-05 22:54:32 +01:00
ExpoOnServer
460de01fae Correct filenames and slugs for the various 2012-dd caves.
Add area and entrance info to 1623-2012-dd-01
remove Spurious DOS lineends in various files
2012-09-05 02:15:56 +01:00
expo
92e486c9fb remove duplicate files for 2012-dd-02 and 04 to 09.
move 2012-dd-03.html to correct 1623-2012-dd-03.html
2012-09-05 02:34:10 +02:00
expo
35aa55d765 Move updated description and pics from wrongly-named 2011-1 into correct 1623-2011-1
Hg: --
2012-09-04 05:04:04 +02:00
expo
19afe492af Add 1623-2010-03 2012-09-04 04:44:54 +02:00
expo
3436134ffa Add cave data and photos for 2011-1 2012-09-04 04:39:07 +02:00
expo
637a50e549 Add Noel Snape cave and entrance data 2012-ns-03, 09, 10, 13 2012-09-04 04:37:03 +02:00
expo
8d571f5144 Add entrance photo links 2012-09-04 04:16:42 +02:00
expo
e2f4953fa4 Correct exploration date 2012-09-04 03:43:30 +02:00
Martin
153ffd9e1e Merge 2012-08-17 17:58:40 +02:00
Martin
127bbe2358 underground description of bullet 2nd 2012-08-17 17:58:12 +02:00
Martin Green
53bfcefdf2 merge 2012-08-17 16:59:45 +02:00
Martin
4c8401e124 Bullet 2nd entrance photos and rigging diagram 2012-08-17 16:57:41 +02:00
Martin
6e7b6ed3ae Duncan and Dours caves 2012-08-14 20:49:44 +02:00
Hannah Walker
2233c20160 added entrance photos 2012-08-14 19:48:08 +02:00
expo
75ba419792 added 2011-1 2012-08-14 16:26:51 +02:00
expo
cc13cff199 added 2012-OK-03, which might be identical to BS17 2012-08-14 13:21:28 +02:00
expo
9c92c23483 added 2012-OK-01 and 2012-OK-02 2012-08-14 12:26:24 +02:00
expo
fbf67c6c2f Reverted to previous name 2012-08-14 10:58:29 +02:00
expo
f4dd4d41d8 Add tag station for 99OB01 2012-08-13 22:02:13 +02:00
Martin Green
3072901c84 Fixed other point description 2012-08-10 19:40:55 +02:00
expo
9431632e27 Update 157 2012-08-05 21:28:29 +02:00
Martin Green
a8d0280184 Changed format of cave and entrance data from cavetab2 to individual files. 2012-06-10 15:08:41 +01:00
Wookey
c9977f2ff1 Added Theresa Stolle (aka 'UBSS german mate') 2011-10-02 22:16:31 +01:00
Wookey
5bae53acb3 Correct JulietM's expo dates from 1996 to 1997 2011-09-28 14:08:42 +01:00
Wookey
5580fba5fa Update the folk list for 2010 and 2011 2011-09-27 03:48:10 +01:00
expo
48efd8bce4 nial's set of changes at start of expo 2011-07-28 11:35:06 +02:00
expo
05860d5b85 Pile of updates merged from server 2011-07-14 04:43:42 +02:00
ExpoOnServer
63e907404b updates to scripts
surveytable needs tobe moved to new section of repo
tools and scripts should be separated somehow
2011-07-14 03:13:06 +01:00
expo
e04eaf89d1 Merge from server
Adding lots to .hgignore
2011-07-14 04:26:39 +02:00
Aiora Zabala
041d0c1eb9 Added id="links" to pages that missed it. Part II 2011-06-01 10:55:49 +02:00