Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Started removing foreignkeys to caves, to achieve greater flexability. Some ↵ | expo | 2012-08-12 | 10 | -21/+79 |
| | | | | log book entries stuff may be broken. Add ability to make new caves and entrances via website. | ||||
* | Prospecting template | Martin Green | 2012-08-10 | 2 | -0/+82 |
| | |||||
* | Made a prospecting guide and fixed survex station description. Removed ↵ | Martin Green | 2012-08-10 | 9 | -70/+85 |
| | | | | parsing of underground descriptions to wikis. | ||||
* | Fixed directory names for the survey scans such that surveys could be found. ↵ | expo | 2012-08-08 | 1 | -13/+13 |
| | | | | It did not seem possible to simply change the localsettings.py file to get it to work. | ||||
* | Prevent modification of auto generated files | expo | 2012-08-06 | 1 | -0/+3 |
| | |||||
* | Editing no longer changes files more than nesecary. Removed TinyMCE editing. ↵ | expo | 2012-08-06 | 8 | -37/+45 |
| | | | | /Sumbit/Submit | ||||
* | Fix broken markup | expo | 2012-08-05 | 1 | -2/+2 |
| | |||||
* | Fixed cave order | expo | 2012-08-05 | 1 | -2/+2 |
| | |||||
* | Fixed cave order | expo | 2012-08-05 | 1 | -2/+14 |
| | |||||
* | FIx base template so admin link, expoweb link work and use consistent base URL | expo | 2012-08-05 | 2 | -8/+8 |
| | |||||
* | Note that the instructions for adding a survey are all wrong. | expo | 2012-08-05 | 1 | -1/+17 |
| | |||||
* | Fix up parser paths so everything is found | expo | 2012-08-05 | 2 | -2/+3 |
| | |||||
* | Merge | Martin Green | 2012-06-10 | 1 | -49/+0 |
|\ | |||||
| * | merge | ExpoOnServer | 2012-06-10 | 1 | -49/+0 |
| |\ | |||||
| | * | no need to export cavetab2 anymore | ExpoOnServer | 2012-06-10 | 1 | -49/+0 |
| | | | |||||
* | | | no need to export to cavetab2 anymore | Martin Green | 2012-06-10 | 1 | -6/+0 |
|/ / | |||||
* / | update caves from new cave file format not cavetab2.csv | Martin Green | 2012-06-10 | 1 | -13/+1 |
|/ | |||||
* | Merge | Martin Green | 2012-06-10 | 1 | -0/+3 |
|\ | |||||
| * | Looks like photos have been added by editing urls.py. | ExpoOnServer | 2012-06-10 | 1 | -0/+3 |
| | | |||||
* | | New parser for new cave format | Martin Green | 2012-06-10 | 1 | -0/+166 |
|/ | |||||
* | Start to change dataformat for caves, along with there editing. Start to ↵ | Martin Green | 2012-06-10 | 16 | -140/+392 |
| | | | | change survex reader to cope better with equates/tags. | ||||
* | Editing for entrances along with caves | Martin Green | 2012-05-23 | 3 | -32/+86 |
| | | | | More detailed display of entrances | ||||
* | Render a cave editing page. Nb it does not do save anything yet. | Martin Green | 2012-01-07 | 6 | -15/+72 |
| | |||||
* | merge from upstream | Wookey | 2011-09-15 | 1 | -0/+2 |
|\ | |||||
| * | Add 2010 and 2011 logbooks to parsing list (can we make this auto | Wookey | 2011-09-15 | 1 | -0/+2 |
| | | | | | | | | somehow - by agreeing a logbook format, or letting it guess)? | ||||
* | | branch merge | expo | 2011-09-02 | 12 | -55/+103 |
|\ \ | |/ |/| | |||||
| * | Bug fix | Martin Green | 2011-08-08 | 1 | -3/+3 |
| | | |||||
| * | ignorecase when finding html tags | Martin Green | 2011-08-08 | 1 | -6/+6 |
| | | |||||
| * | template changes. Fix link to css. | Martin Green | 2011-08-08 | 2 | -2/+2 |
| | | |||||
| * | Added 'page not found do you wnat to make this page' page. Minor tweaks | Martin Green | 2011-08-08 | 3 | -21/+34 |
| | | |||||
| * | Fix logbook editing | Martin Green | 2011-08-08 | 1 | -1/+1 |
| | | |||||
| * | =Make a common base for expoweb pages. Ignore any header information in ↵ | Martin Green | 2011-08-08 | 5 | -16/+24 |
| | | | | | | | | expoweb except titles. | ||||
| * | Allow pages to be rendered when the body tag has attributes. Put an edit ↵ | Martin Green | 2011-08-08 | 2 | -2/+4 |
| | | | | | | | | link on the homepage. | ||||
| * | Allow for editing flatpage titles, and made a common uneditable list of links. | Martin Green | 2011-08-08 | 6 | -19/+44 |
| | | |||||
| * | Allow the viewing of noinfo caves on non public website without login | Martin Green | 2011-08-08 | 1 | -6/+6 |
| | | |||||
| * | Changed regex for finding head and body of flat pages. | Martin Green | 2011-08-07 | 1 | -2/+1 |
| | | |||||
| * | bug fix for edit link for index files | Martin Green | 2011-08-07 | 1 | -1/+1 |
| | | |||||
| * | Changed ubuntu local settings to be applicable to the expo machine | expo | 2011-08-07 | 1 | -4/+5 |
| | | |||||
| * | Make caveindex link to urls in the original hierachy such that their | expo | 2011-08-07 | 1 | -3/+3 |
| | | | | | | | | hyperlinks and images work. | ||||
* | | Remove old ref to goatchurch in localconfig | expo | 2011-09-01 | 1 | -1/+1 |
|/ | |||||
* | update localsettings for server and expo machine | ExpoOnServer | 2011-07-14 | 2 | -27/+36 |
| | |||||
* | Attempt 17b to end with the right files as tip | Wookey | 2011-07-12 | 2 | -16/+16 |
|\ | |||||
| * | merging correct urls.py for /troggle dir in | ExpoOnServer | 2011-07-12 | 2 | -16/+16 |
| |\ | |||||
| * \ | I seem to be going wrong in circles here | ExpoOnServer | 2011-07-11 | 0 | -0/+0 |
| |\ \ | |||||
* | | | | Add odt and ods mime types to our list. | Wookey | 2011-07-12 | 3 | -16/+18 |
| |_|/ |/| | | | | | | | | Maybe this should just be read in from the real list... | ||||
* | | | really, really get all version the same! | Wookey | 2011-07-11 | 2 | -16/+16 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | rest of martin's changes, without reverting lineend issues | Wookey | 2011-07-11 | 77 | -6652/+6650 |
| |\ | |||||
| | * | Add changes from martin | Wookey | 2011-07-11 | 1 | -7/+35 |
| | | | |||||
* | | | add /troggle dir (Martin's changes to get main site back as entry point) | ExpoOnServer | 2011-07-11 | 2 | -7/+36 |
|\| | | |/ |/| | |||||
| * | Moved troggle main page to /troggle added a link in flat pages. | Martin Green | 2011-07-11 | 2 | -1/+2 |
| | | | | | | | | Now / takes you to the expoweb index page |