summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* New parser for new cave formatMartin Green2012-06-101-0/+166
|
* Start to change dataformat for caves, along with there editing. Start to ↵Martin Green2012-06-1016-140/+392
| | | | change survex reader to cope better with equates/tags.
* Editing for entrances along with cavesMartin Green2012-05-233-32/+86
| | | | More detailed display of entrances
* Render a cave editing page. Nb it does not do save anything yet.Martin Green2012-01-076-15/+72
|
* merge from upstreamWookey2011-09-151-0/+2
|\
| * Add 2010 and 2011 logbooks to parsing list (can we make this autoWookey2011-09-151-0/+2
| | | | | | | | somehow - by agreeing a logbook format, or letting it guess)?
* | branch mergeexpo2011-09-0212-55/+103
|\ \ | |/ |/|
| * Bug fixMartin Green2011-08-081-3/+3
| |
| * ignorecase when finding html tagsMartin Green2011-08-081-6/+6
| |
| * template changes. Fix link to css.Martin Green2011-08-082-2/+2
| |
| * Added 'page not found do you wnat to make this page' page. Minor tweaksMartin Green2011-08-083-21/+34
| |
| * Fix logbook editingMartin Green2011-08-081-1/+1
| |
| * =Make a common base for expoweb pages. Ignore any header information in ↵Martin Green2011-08-085-16/+24
| | | | | | | | expoweb except titles.
| * Allow pages to be rendered when the body tag has attributes. Put an edit ↵Martin Green2011-08-082-2/+4
| | | | | | | | link on the homepage.
| * Allow for editing flatpage titles, and made a common uneditable list of links.Martin Green2011-08-086-19/+44
| |
| * Allow the viewing of noinfo caves on non public website without loginMartin Green2011-08-081-6/+6
| |
| * Changed regex for finding head and body of flat pages.Martin Green2011-08-071-2/+1
| |
| * bug fix for edit link for index filesMartin Green2011-08-071-1/+1
| |
| * Changed ubuntu local settings to be applicable to the expo machineexpo2011-08-071-4/+5
| |
| * Make caveindex link to urls in the original hierachy such that theirexpo2011-08-071-3/+3
| | | | | | | | hyperlinks and images work.
* | Remove old ref to goatchurch in localconfigexpo2011-09-011-1/+1
|/
* update localsettings for server and expo machineExpoOnServer2011-07-142-27/+36
|
* Attempt 17b to end with the right files as tipWookey2011-07-123-16/+16
|\
| * merging correct urls.py for /troggle dir inExpoOnServer2011-07-122-16/+16
| |\
| * | Add empty troggle_log.txt file to save doing it by handExpoOnServer2011-07-121-0/+0
| | |
| * | I seem to be going wrong in circles hereExpoOnServer2011-07-110-0/+0
| |\ \
* | | | Add odt and ods mime types to our list.Wookey2011-07-123-16/+18
| |_|/ |/| | | | | | | | Maybe this should just be read in from the real list...
* | | really, really get all version the same!Wookey2011-07-112-16/+16
|\ \ \ | |/ / |/| / | |/
| * rest of martin's changes, without reverting lineend issuesWookey2011-07-1177-6652/+6650
| |\
| | * Add changes from martinWookey2011-07-111-7/+35
| | |
* | | add /troggle dir (Martin's changes to get main site back as entry point)ExpoOnServer2011-07-112-7/+36
|\| | | |/ |/|
| * Moved troggle main page to /troggle added a link in flat pages.Martin Green2011-07-112-1/+2
| | | | | | | | Now / takes you to the expoweb index page
| * Do not make an entrance redirect for entrances without there own pagesMartin Green2011-07-111-2/+3
| |
| * implemented mimetypes, index.htm(l) and fixed edit viewMartin Green2011-07-111-7/+35
| |
| * Change absolute url for caves to there expoweb url, such that links workMartin Green2011-07-111-8/+9
| |
* | remove all the DOS linefeedsWookey2011-07-1175-6323/+6323
| |
* | Add /index.htm to EXPOWEB root URL in main template so that you getWookey2011-07-111-1/+1
| | | | | | | | the static stuff
* | undosify lineendsWookey2011-07-112-327/+327
|/
* merge martin's tip againWookey2011-07-111-1/+1
|\
| * Merge from Martin's tipWookey2011-07-1142-143/+1783
| |\
| * \ merge fix from martin's tip.Wookey2011-07-1017-20/+376
| |\ \
| * | | debugexpo2011-05-021-1/+1
| | | |
* | | | Split up tags such that they use ajaxMartin Green2011-07-117-90/+116
| |_|/ |/| |
* | | Removed conversion to wiki, replaced Surveystation models with text, added ↵Martin Green2011-07-1110-86/+213
| | | | | | | | | | | | area 1623 to all relevant caves.
* | | Added flat pages for entrance and special flatpage redirects.Martin Green2011-07-113-3/+52
| | | | | | | | | | | | Enetrances should probably store their urls like cavers. Maybe the flatpages should be handled by the app Aaron installed.
* | | Removed links to removed formsMartin Green2011-07-111-1/+1
| | |
* | | slug views, start of cave eidt form, cavelist splitting up by kataster area etc.Martin Green2011-07-111-2/+29
| | |
* | | Added parsing of all.svx, along side parsing individual caves.Martin Green2011-07-112-7/+84
| | | | | | | | | | | | | | | | | | Added the making and parsing of all.pos to determine the location of stations. Mare work is required so the caves are parsed and stored only once. Survex parsing appears to include bugs, that print out errors.
* | | Removed modelforms for Caves started to add normal formsMartin Green2011-07-101-33/+36
| | |
* | | Removed SurveyStation model (not SurvexStation)Martin Green2011-07-101-1/+0
| | |