378 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
expo	0c20ef2a04	Fix up parser paths so everything is found	2012-08-05 00:26:05 +02:00
Martin Green	833ddeef8b	Merge	2012-06-10 17:24:10 +01:00
Martin Green	d37001962b	no need to export to cavetab2 anymore	2012-06-10 17:22:50 +01:00
ExpoOnServer	6ba6f108ab	merge	2012-06-10 17:21:26 +01:00
ExpoOnServer	0fabcaedf8	no need to export cavetab2 anymore	2012-06-10 17:20:57 +01:00
Martin Green	f369f34c8f	update caves from new cave file format not cavetab2.csv	2012-06-10 17:16:33 +01:00
Martin Green	0d346c80f7	Merge	2012-06-10 16:56:44 +01:00
Martin Green	19055d01fb	New parser for new cave format	2012-06-10 16:56:12 +01:00
ExpoOnServer	00c0358855	Looks like photos have been added by editing urls.py.	2012-06-10 16:19:17 +01:00
Martin Green	9024520184	Start to change dataformat for caves, along with there editing. Start to change survex reader to cope better with equates/tags.	2012-06-10 14:59:21 +01:00
Martin Green	52620ea1c5	Editing for entrances along with caves ... More detailed display of entrances	2012-05-23 09:23:40 +01:00
Martin Green	599c59454a	Render a cave editing page. Nb it does not do save anything yet.	2012-01-07 19:05:25 +00:00
Wookey	8222ed3b6a	merge from upstream	2011-09-15 12:13:07 +01:00
Wookey	58a2f5340b	Add 2010 and 2011 logbooks to parsing list (can we make this auto ... somehow - by agreeing a logbook format, or letting it guess)?	2011-09-15 12:12:18 +01:00
expo	378ddfe96d	branch merge	2011-09-02 03:39:20 +02:00
expo	4def1aece2	Remove old ref to goatchurch in localconfig	2011-09-01 01:50:51 +02:00
Martin Green	2145d1187e	Bug fix	2011-08-08 13:11:57 +01:00
Martin Green	9878cf890d	ignorecase when finding html tags	2011-08-08 12:58:02 +01:00
Martin Green	fe1989001c	template changes. Fix link to css.	2011-08-08 12:40:47 +01:00
Martin Green	3205e1752c	Added 'page not found do you wnat to make this page' page. Minor tweaks	2011-08-08 12:18:47 +01:00
Martin Green	a0df539ca1	Fix logbook editing	2011-08-08 12:17:38 +01:00
Martin Green	57ace11427	=Make a common base for expoweb pages. Ignore any header information in expoweb except titles.	2011-08-08 10:58:50 +01:00
Martin Green	4c4b6ef11f	Allow pages to be rendered when the body tag has attributes. Put an edit link on the homepage.	2011-08-08 10:04:59 +01:00
Martin Green	d75bad22de	Allow for editing flatpage titles, and made a common uneditable list of links.	2011-08-08 09:51:47 +01:00
Martin Green	c039183137	Allow the viewing of noinfo caves on non public website without login	2011-08-08 08:51:12 +01:00
Martin Green	da3efb97ce	Changed regex for finding head and body of flat pages.	2011-08-07 19:17:27 +01:00
Martin Green	f527bd616a	bug fix for edit link for index files	2011-08-07 17:30:18 +01:00
expo	24fdf9be3c	Changed ubuntu local settings to be applicable to the expo machine	2011-08-07 16:12:52 +02:00
expo	b1b91d3f62	Make caveindex link to urls in the original hierachy such that their ... hyperlinks and images work.	2011-08-07 16:11:35 +02:00
ExpoOnServer	c944fdcf5e	update localsettings for server and expo machine	2011-07-14 03:50:49 +01:00
Wookey	aa8c35be7b	Attempt 17b to end with the right files as tip	2011-07-12 02:44:07 +01:00
Wookey	f60c4cba23	Add odt and ods mime types to our list. ... Maybe this should just be read in from the real list...	2011-07-12 00:57:48 +01:00
ExpoOnServer	9f9fbe33be	merging correct urls.py for /troggle dir in	2011-07-12 00:49:24 +01:00
ExpoOnServer	c7e58eb36d	I seem to be going wrong in circles here	2011-07-11 23:45:12 +01:00
Wookey	9e5e636d0d	really, really get all version the same!	2011-07-11 23:43:32 +01:00
ExpoOnServer	0bfcbdc9cc	add /troggle dir (Martin's changes to get main site back as entry point)	2011-07-11 23:35:11 +01:00
Wookey	ded3d58da1	rest of martin's changes, without reverting lineend issues	2011-07-11 23:28:23 +01:00
Wookey	b6a1503c7a	Add changes from martin	2011-07-11 23:19:48 +01:00
Martin Green	3b028661f6	Moved troggle main page to /troggle added a link in flat pages. ... Now / takes you to the expoweb index page	2011-07-11 22:38:40 +01:00
Martin Green	27e224619e	Do not make an entrance redirect for entrances without there own pages	2011-07-11 22:37:49 +01:00
Martin Green	8c2cf48195	implemented mimetypes, index.htm(l) and fixed edit view	2011-07-11 22:36:48 +01:00
Martin Green	d3fb0352be	Change absolute url for caves to there expoweb url, such that links work	2011-07-11 22:35:32 +01:00
Wookey	78cedb2070	remove all the DOS linefeeds	2011-07-11 02:10:22 +01:00
Wookey	cc27334193	Add /index.htm to EXPOWEB root URL in main template so that you get ... the static stuff	2011-07-11 01:55:12 +01:00
Wookey	a2e1882d91	undosify lineends	2011-07-11 01:49:03 +01:00
Wookey	0183f94780	merge martin's tip again	2011-07-11 00:52:58 +01:00
Martin Green	5cbfa6d8b1	Split up tags such that they use ajax	2011-07-11 00:50:07 +01:00
Wookey	cc8c47f21f	Merge from Martin's tip	2011-07-11 00:49:18 +01:00
Martin Green	861daee66f	Removed conversion to wiki, replaced Surveystation models with text, added area 1623 to all relevant caves.	2011-07-11 00:15:59 +01:00
Martin Green	db2d954b1d	Added flat pages for entrance and special flatpage redirects. ... Enetrances should probably store their urls like cavers. Maybe the flatpages should be handled by the app Aaron installed.	2011-07-11 00:13:06 +01:00