2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-05-10 06:17:22 +01:00
Commit Graph

397 Commits

Author SHA1 Message Date
Wookey 6060ae1c08 Add some debug to cave parser as it's easy to make it fail
e.g. by referring to slugs that don't exist.
2012-09-24 22:29:18 +01:00
expoonserver e2c6845ae0 Remove jgtfile URLs (presumably no longer needed) 2012-09-08 01:12:17 +01:00
Martin 71289d9b0f Merge 2012-08-14 23:49:26 +02:00
Martin 25a73c4ab7 Bug fixing of cave and entrance forms removal of slugs 2012-08-14 22:51:15 +02:00
Martin a4f9f5bb5a ignore files ending in ~ 2012-08-14 15:31:34 +02:00
Martin 29c2c5f88d added entrance locations 2012-08-14 15:08:08 +02:00
Martin 532b8e064b fixed spelling 2012-08-14 15:06:18 +02:00
Martin 951f88a59a allow extensions to be capatalised 2012-08-14 15:05:15 +02:00
expo 28047277f1 Started removing foreignkeys to caves, to achieve greater flexability. Some log book entries stuff may be broken. Add ability to make new caves and entrances via website. 2012-08-12 19:10:23 +02:00
Martin Green 5ff163efaa Prospecting template 2012-08-10 19:34:44 +02:00
Martin Green 52736ca1b3 Made a prospecting guide and fixed survex station description. Removed parsing of underground descriptions to wikis. 2012-08-10 19:02:13 +02:00
expo 484f8f76cc Fixed directory names for the survey scans such that surveys could be found. It did not seem possible to simply change the localsettings.py file to get it to work. 2012-08-08 11:29:15 +02:00
expo 70a743f88b Prevent modification of auto generated files 2012-08-06 12:56:20 +02:00
expo 44eb3c0caf Editing no longer changes files more than nesecary. Removed TinyMCE editing. /Sumbit/Submit 2012-08-06 12:19:48 +02:00
expo c221b75afc Fix broken markup 2012-08-05 21:37:46 +02:00
expo b2fc3dd35b Fixed cave order 2012-08-05 19:28:34 +02:00
expo 2208f0748b Fixed cave order 2012-08-05 19:26:24 +02:00
expo 0785455bac FIx base template so admin link, expoweb link work and use consistent base URL 2012-08-05 02:33:48 +02:00
expo 742848409b Note that the instructions for adding a survey are all wrong. 2012-08-05 00:35:02 +02:00
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