expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-22 07:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Philip Sargent 2019-07-11 17:19:06 +02:00
commit 3bc2063538
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
folk/folk.csv
View File

@ -1,6 +1,6 @@
Name,Lastname,Guest,VfHO member,Mugshot,1976,1977,1978,1979,1980,1981,1982,1983,1984,1985,1986,1987,1988,1989,1990,1991,1992,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
Hugh Adams,Adams,,,,,,,,,,,,,,,,,,,,,1,,1,,,,,,,,,,,,,,,,,,,,,,,,
Rob Adams,Adams,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,,1,,,,,
Rob Adams (Robert),Adams,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,,1,,,,,
Adam Aldridge,Aldridge,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,
Michael Allen,Allen,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
Craig Anderson,Anderson,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,
@ -133,7 +133,7 @@ Sean Houlihane,Houlihane,,,,,,,,,,,,,,,,,,,,,,1,,,,1,,,,,,,,,,,,,,,,,,,,,
David Howes,Howes,,,l/daveh.htm,,,,,,,,,,,,,,1,1,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
Cat Hulse,Hulse,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,,,,,,1,
Rachel Hunter,Hunter,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
<span lang="hu">Bal&aacute;zs Izapy</span>,Izapy,1,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,
<span lang="hu">Bal&aacute;zs Izapy</span>,Izapy,1,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,
Martin Jahnke,Jahnke,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,,,,,,,,,
Kate Janossy,Janossy,,,i/katej.jpg,,,,,,,,,,,,,,,,,,,1,1,,,1,,,,,,,,,,,,,,,,,,,,,
Dave Johnson,Johnson,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,
@ -166,7 +166,7 @@ Gill Lindsey,Lindsey,,,i/gill_lindsey.jpg,,,,,,,,,,,,,,,,1,1,,,,1,,,,,,,,,,,,,,,
Dave Loeffler,Loeffler,,1,l/davel.htm,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,1,1,1,,,,-1,-1,,,,,,,
Jane Lolly,Lolly,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
Glen Long,Long,,,i/glen.jpg,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
Pete Lord (Petel),Lord,,,i/petel.jpg,,,,,,,,,,,,,,,,,,1,1,,1,,,,,,,,,,,,,,,,,,,,,,,
Pete Lord,Lord,,,i/petel.jpg,,,,,,,,,,,,,,,,,,1,1,,1,,,,,,,,,,,,,,,,,,,,,,,
Fleur Loveridge,Loveridge,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,1,1,,
Erin Lynch,Lynch,,,i/erin.jpg,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,
Tim Lyons,Lyons,1,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
@ -302,7 +302,7 @@ Hannah Walker,Walker,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,
Ian Walker,Walker,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,1,,,,,,,
Julian Walker,Walker,1,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
Nathan Walker,Walker,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,,
Stuart Walker,Walker,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,,,,,,
Stuart Walker (Stu),Walker,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,,,,,,
Becky Ward,Ward,,,l/rhrw.htm,,,,,,,-1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
Martin Warren,Warren,1,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
Matt Watson,Watson,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,,,,

Can't render this file because it contains an unexpected character in line 10 and column 12.

2
years/2012/logbook.html
View File

@ -957,7 +957,7 @@ Had an explore, realised the 1978 survey has the wrong angle for the side passag
<hr />
<div class="tripdate" id="t2012-08-22b">2012-08-22</div>
<div class="trippeople">Olly, <u>Jenny</u> Stuart B, Terry, Annette</div>
<div class="trippeople">Olly, <u>Jenny</u>, Stuart B, Terry, Annette</div>
<div class="triptitle">Eish&ouml;hle Tourist Trip</div>
<p>Walked down from our bivi to meet the others at the Stogerweg junction. Walked (slowly) to Eish&ouml;hle. It was very hot and took hours, eventually got to the Ice Tunnel entrance which had less ice than Olly remembered. The bolts were almost out of reach! All got down and admired the ice.</p>

2
years/2013/logbook.html
View File

@ -219,7 +219,7 @@ Julian was patiently waiting to take us down the hill.</p>
<hr />
<div class="tripdate" id="t2013-07-28b">2013-07-28</div>
<div class="trippeople">Chris, Mike<u>, Becka</u></div>
<div class="trippeople">Chris, Mike, <u>Becka</u></div>
<div class="triptitle">258 Rigging</div>
<p>Becka rigged Caramel Catharsis then showed Chris and Mike the top of

6
years/2015/logbook.html
View File

@ -496,7 +496,7 @@ to wait for our lift down the hill.
<hr />
<div class="tripdate" id="t2015-07-27c">2015-07-27</div>
<div class="trippeople">Andy, Ben Whetton, <u>Anthony</u></div>
<div class="trippeople">Andy K, Ben Whetton, <u>Anthony</u></div>
<div class="triptitle">Tunnocks - pushing Kraken</div>
<p>Despite heavy overnight rain, we decided to press on with our planned trip on the basis
@ -639,7 +639,7 @@ endeavours.</p>
<hr />
<div class="tripdate" id="t2015-07-28e">2015-07-28</div>
<div class="trippeople"><u>Elaine</u>, Michael, Matt</div>
<div class="trippeople"><u>Elaine</u>, Michael S, Matt</div>
<div class="triptitle">Balcony - Ice Cock area</div>
<p>Previous trips to the Ice Cock area left two A leads, so two teams went down to push the
@ -738,7 +738,7 @@ that went nowhere.</p>
<hr />
<div class="tripdate" id="t2015-08-03a">2015-08-03</div>
<div class="trippeople">Michael, Elaine &amp; <u>Elliott</u></div>
<div class="trippeople">Michael S, Elaine &amp; <u>Elliott</u></div>
<div class="triptitle">Purple Lupin Shaft</div>
<p>After being pressured to start pulling gear out of various places, we decided to polish off the

8
years/2016/logbook.html
View File

@ -436,7 +436,7 @@ in a trade route rig. So we headed out to rethink.
<hr />
<div class="tripdate" id="t2016-07-02a">2016-07-02</div>
<div class="trippeople">David, <u>Roshni</u>, Mark (rescuer)</div>
<div class="trippeople">David, <u>Roshni</u>, Mark D(rescuer)</div>
<div class="triptitle">264 Balcony - Cathedral Chasm</div>
<p>First 7 hours of the trip went relatively smoothly, despite David forgetting to bring a pencil
for surveying. We made our way to Cathedral Chasm, which included getting past a particularly awkward
@ -476,7 +476,7 @@ the end of the day, it was an experience, albeit not a fun one. We live to cave
<hr />
<div class="tripdate" id="t2016-07-02b">2016-07-02</div>
<div class="trippeople">Mark, George, Nat, Haydon</div>
<div class="trippeople">Mark D, George, Nat, Haydon</div>
<div class="triptitle">Balkonhöhle Rescue</div>
<p>At 22:00 David and Roshni's callout went live. We scanned the hill for lights, but saw
@ -810,7 +810,7 @@ the right, finishing in an aven (Rob said this has now crapped out).</p>
<hr />
<div class="tripdate" id="t2016-07-07b">2016-07-07 to 10</div>
<div class="trippeople"><u>Mark</u>, Anthony, Luke</div>
<div class="trippeople"><u>Mark D</u>, Anthony, Luke</div>
<div class="triptitle">Tunnocks Camp</div>
<h3>Day 1</h3>
<p>Descended lunchtime and sent down at a steady pace. Met up with David, Julian and Becka at
@ -1411,7 +1411,7 @@ to the boulder it was on than it appeared to be.</p>
<hr />
<div class="tripdate" id="t2016-07-20b">2016-07-20</div>
<div class="trippeople"><u>Anthony</u>, Elliott, David, Mark, Rob</div>
<div class="trippeople"><u>Anthony</u>, Elliott, David, Mark D, Rob</div>
<div class="triptitle">Tunnocks derig, Upper Kraken to String Theory</div>
<p> The objective of this trip was to derig at least as far as the top of the flood-prone Procrastination pitch. The