2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-05-07 00:57:40 +01:00
Commit Graph

403 Commits

Author SHA1 Message Date
wookey bb1989d0f0 Add some exception checking to parsers/caves.py so that missing entrance
slugs don't blow up the import. Also reduce the noise, so
you just get a warning about missing slugs printed out
2012-09-24 23:23:38 +01:00
wookey 418e5e1d3f Add debug for which entrance file was being read so we get a clue where to look when 'databasereset newcaves' falls over 2012-09-24 22:38:35 +01:00
Wookey 3b12e6d975 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 54d7f1d097 Remove jgtfile URLs (presumably no longer needed) 2012-09-08 01:12:17 +01:00
Martin cfc90deb83 Merge 2012-08-14 23:49:26 +02:00
Martin 1a0e577606 Bug fixing of cave and entrance forms removal of slugs 2012-08-14 22:51:15 +02:00
Martin a05fe94d90 ignore files ending in ~ 2012-08-14 15:31:34 +02:00
Martin 8e64062214 added entrance locations 2012-08-14 15:08:08 +02:00
Martin 8c1882eec8 fixed spelling 2012-08-14 15:06:18 +02:00
Martin 8dd51096cf allow extensions to be capatalised 2012-08-14 15:05:15 +02:00
expo ecd5bbcb1d 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 6d5babd331 Prospecting template 2012-08-10 19:34:44 +02:00
Martin Green 79b7d32664 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 dd66ad835a 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 a29fd964bd Prevent modification of auto generated files 2012-08-06 12:56:20 +02:00
expo 1ef274ec1d Editing no longer changes files more than nesecary. Removed TinyMCE editing. /Sumbit/Submit 2012-08-06 12:19:48 +02:00
expo 0f5627505f Fix broken markup 2012-08-05 21:37:46 +02:00
expo c0782e1cca Fixed cave order 2012-08-05 19:28:34 +02:00
expo ed1d273e03 Fixed cave order 2012-08-05 19:26:24 +02:00
expo 9654e5da1c FIx base template so admin link, expoweb link work and use consistent base URL 2012-08-05 02:33:48 +02:00
expo 8040b746b4 Note that the instructions for adding a survey are all wrong. 2012-08-05 00:35:02 +02:00
expo 05004aa874 Fix up parser paths so everything is found 2012-08-05 00:26:05 +02:00
Martin Green 4a21720745 Merge 2012-06-10 17:24:10 +01:00
Martin Green 13cb2e9b0f no need to export to cavetab2 anymore 2012-06-10 17:22:50 +01:00
ExpoOnServer 0259947cda merge 2012-06-10 17:21:26 +01:00
ExpoOnServer 080684e56f no need to export cavetab2 anymore 2012-06-10 17:20:57 +01:00
Martin Green 4b269bb234 update caves from new cave file format not cavetab2.csv 2012-06-10 17:16:33 +01:00
Martin Green 1a62931202 Merge 2012-06-10 16:56:44 +01:00
Martin Green c2029df3c9 New parser for new cave format 2012-06-10 16:56:12 +01:00
ExpoOnServer 4a074295ad Looks like photos have been added by editing urls.py. 2012-06-10 16:19:17 +01:00
Martin Green 711fefb0da 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 fd12e70f78 Editing for entrances along with caves
More detailed display of entrances
2012-05-23 09:23:40 +01:00
Martin Green fac89bae30 Render a cave editing page. Nb it does not do save anything yet. 2012-01-07 19:05:25 +00:00
Wookey ab97e367cb merge from upstream 2011-09-15 12:13:07 +01:00
Wookey ae693ca4c5 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 77dea07b40 branch merge 2011-09-02 03:39:20 +02:00
expo 77dcf7f759 Remove old ref to goatchurch in localconfig 2011-09-01 01:50:51 +02:00
Martin Green 59e7c4d5df Bug fix 2011-08-08 13:11:57 +01:00
Martin Green 0b5e57b85e ignorecase when finding html tags 2011-08-08 12:58:02 +01:00
Martin Green c623acf832 template changes. Fix link to css. 2011-08-08 12:40:47 +01:00
Martin Green 36b1888f46 Added 'page not found do you wnat to make this page' page. Minor tweaks 2011-08-08 12:18:47 +01:00
Martin Green c09a668620 Fix logbook editing 2011-08-08 12:17:38 +01:00
Martin Green e85c386375 =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 c66ecc4d7f 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 13fe89af9f Allow for editing flatpage titles, and made a common uneditable list of links. 2011-08-08 09:51:47 +01:00
Martin Green d8fe39ae86 Allow the viewing of noinfo caves on non public website without login 2011-08-08 08:51:12 +01:00
Martin Green 5f5359f933 Changed regex for finding head and body of flat pages. 2011-08-07 19:17:27 +01:00
Martin Green e820a516de bug fix for edit link for index files 2011-08-07 17:30:18 +01:00
expo e9fdea80c0 Changed ubuntu local settings to be applicable to the expo machine 2011-08-07 16:12:52 +02:00
expo 9534bd8881 Make caveindex link to urls in the original hierachy such that their
hyperlinks and images work.
2011-08-07 16:11:35 +02:00