2561 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
expoonserver	5de882d65f	Remove Cambridge Uni logo ... from minutes of Jan 2017 expo meeting: we should remove the university logo from the front page of the expo website, as we are not the University of Cambridge and they don't like being associated with things they aren't	2017-01-15 21:58:07 +00:00
Wookey	80d0311483	Merge with changes from server	2016-11-17 12:31:00 +00:00
Wookey	b48d0da6b1	Fix name misspellings in 1995 and 1997 logbooks. (helps website trip indexing)	2016-11-17 12:30:23 +00:00
Wookey	b00517e9c6	Correct year Juliet Morse attended (off-by-one, check by logbooks)	2016-11-17 12:29:01 +00:00
Wookey	3f30d977e6	Add links to logbooks scans for 2015 and 2016	2016-11-17 12:27:59 +00:00
Sam Wenham	07fbb26935	Update the intro	2016-11-15 12:19:21 +00:00
Sam Wenham	682bbc16cc	Merge	2016-09-04 13:34:43 +01:00
Sam Wenham	da9ba6a2d3	Fix links for weatherwriter and bootstrap 2017 as people have added links to it	2016-09-04 13:25:29 +01:00
Wookey	5b999c2bbc	Fix typo in 2016 logbook	2016-08-28 11:39:56 +01:00
Wookey	97e34034d4	Merge changes from elseshere: logbook heading parsing consistency changes, ... bierbook updates, route to the bottom added, 2001-02, 2001-03, 2012-dd-05 2016-01 caves updated, robwatson pic added, rope history updated, stonemonkey description added therion protractors parameterised	2016-08-26 13:01:13 +01:00
Wookey	89101dd874	Add basecamp callout book entries to logbook	2016-08-26 12:44:15 +01:00
goatchurch	aa5d9ed16d	Edited logbook text so that it can be parsed more easily into dates, titles and persons on trip	2016-08-09 13:47:53 +01:00
expo	f229425e28	Merge changes from Cambridge server	2016-08-03 04:35:01 +01:00
expo laptop	5f71d26d84	Merge changes done on Cambridge server during expo	2016-08-03 01:58:58 +02:00
Wookey	dbb910a3f2	Update cave lists with 2016 kataster numbers	2016-08-02 03:58:21 +01:00
Wookey	b788192c85	Renumber 1987-02 to 1623/267	2016-08-02 03:46:53 +01:00
Wookey	ede7190512	rename 1623-2014-NEO-01 to 1623-273 ... Add entrance photos.	2016-08-02 01:48:51 +01:00
Wookey	3188143855	Add Eu Cave rescue report on te 2016 deep callout.	2016-08-01 11:37:43 +01:00
Wookey	e1aebab506	Merge changes from 2nd half of expo. ... Merge folk.csv changes for 2 attempts.	2016-07-31 12:20:31 +01:00
Olly Betts	b68c3623df	merged	2016-07-31 12:11:44 +12:00
expo	63d969cff6	Stuff added via web interface	2016-07-29 06:46:15 +01:00
Michael at Laptop	4c840e7a65	Consolidate therionprotractors	2016-07-27 21:46:38 +01:00
Wookey	5d1f6aff96	Add link to logbook in 2002 index	2016-07-24 13:22:30 +01:00
Wookey	de80174a7d	Add 2016 roster of people	2016-07-24 12:40:04 +01:00
Michael at Laptop	95f7a22946	update bierbook and seshbook with suggestions from expo 2016	2016-07-24 11:07:46 +01:00
Michael at Laptop	01fdbc54ef	tunnocksschirt	2016-07-23 13:20:24 +01:00
Martin Green	fc3ca5e8c6	Updated stone monkey description	2016-07-22 17:04:36 +01:00
expo	2a28be269f	Changes made by web interface	2016-07-22 12:48:23 +01:00
Martin Green	6404879d52	Rope labeling	2016-07-22 13:02:08 +01:00
Wookey	f8369dd2eb	Add rescue debrief doc to 2016	2016-07-15 22:20:34 +01:00
Olly Betts	652479c237	Remove dummy file	2016-07-15 18:42:48 +02:00
Olly Betts	a6f87cc3f8	Fix whitespace damage	2016-07-15 18:33:19 +02:00
Michael at Laptop	438ee68d72	Merge	2016-07-15 13:07:39 +01:00
Michael at Laptop	6399627e6f	Merge	2016-07-15 13:06:12 +01:00
DavidWalker13	496b24c1d5	added curries to stuff bought 2016	2016-07-15 13:02:49 +01:00
DavidWalker13	5a66a1c84d	added items to things bought 2016	2016-07-15 13:00:24 +01:00
expo	9c799ef213	merge	2016-07-15 12:43:43 +01:00
expo	1ac885313c	update 2016 folk list and added roshnis photo	2016-07-15 12:43:16 +01:00
DavidWalker13	8adefdc1a6	added post expo 2016 documentation	2016-07-15 12:20:50 +01:00
Wookey	4ab1f051c9	Fix typo in fleur's name	2016-07-15 11:36:56 +01:00
expo laptop	4c4f9f26ce	A picture of a mule	2016-07-15 12:12:56 +02:00
expo laptop	d472176f8b	merge	2016-07-15 12:10:26 +02:00
expo	aef828579a	I feel a little guilty	2016-07-15 11:30:28 +01:00
expo laptop	3a736b658e	?	2016-07-15 02:48:21 +02:00
expo laptop	05dec933ab	Added MarkS link page	2016-07-15 02:47:17 +02:00
expo	eef70a7976	Changes made in 2016 via web intereface	2016-07-14 23:33:04 +01:00
Wookey	d395732c97	Fix broken links in 1996WK11 description (now 268!)	2016-07-14 13:33:08 +01:00
expoonserver	eec516117f	Update fixed aids list to include china climb ... Add tunnocks and put in some 2014 info.	2016-07-13 14:19:38 +01:00
Wookey	9651f0971b	Make 2016 'current', not future, in index	2016-07-13 14:01:28 +01:00
Wookey	997c4d9997	merge server changes (basecampleft list and therion protractors). ... Add 1:400 therion protractor.	2016-07-11 21:18:40 +01:00