Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | 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 | ||||
| * | Do not make an entrance redirect for entrances without there own pages | Martin Green | 2011-07-11 | 1 | -2/+3 |
| | | |||||
| * | implemented mimetypes, index.htm(l) and fixed edit view | Martin Green | 2011-07-11 | 1 | -7/+35 |
| | | |||||
| * | Change absolute url for caves to there expoweb url, such that links work | Martin Green | 2011-07-11 | 1 | -8/+9 |
| | | |||||
* | | remove all the DOS linefeeds | Wookey | 2011-07-11 | 75 | -6323/+6323 |
| | | |||||
* | | Add /index.htm to EXPOWEB root URL in main template so that you get | Wookey | 2011-07-11 | 1 | -1/+1 |
| | | | | | | | | the static stuff | ||||
* | | undosify lineends | Wookey | 2011-07-11 | 2 | -327/+327 |
|/ | |||||
* | merge martin's tip again | Wookey | 2011-07-11 | 1 | -1/+1 |
|\ | |||||
| * | Merge from Martin's tip | Wookey | 2011-07-11 | 41 | -143/+994 |
| |\ | |||||
| * \ | merge fix from martin's tip. | Wookey | 2011-07-10 | 17 | -20/+376 |
| |\ \ | |||||
| * | | | debug | expo | 2011-05-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | Split up tags such that they use ajax | Martin Green | 2011-07-11 | 7 | -90/+116 |
| |_|/ |/| | | |||||
* | | | Removed conversion to wiki, replaced Surveystation models with text, added ↵ | Martin Green | 2011-07-11 | 10 | -86/+213 |
| | | | | | | | | | | | | area 1623 to all relevant caves. | ||||
* | | | Added flat pages for entrance and special flatpage redirects. | Martin Green | 2011-07-11 | 3 | -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 forms | Martin Green | 2011-07-11 | 1 | -1/+1 |
| | | | |||||
* | | | slug views, start of cave eidt form, cavelist splitting up by kataster area etc. | Martin Green | 2011-07-11 | 1 | -2/+29 |
| | | | |||||
* | | | Added parsing of all.svx, along side parsing individual caves. | Martin Green | 2011-07-11 | 2 | -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 forms | Martin Green | 2011-07-10 | 1 | -33/+36 |
| | | | |||||
* | | | Removed SurveyStation model (not SurvexStation) | Martin Green | 2011-07-10 | 1 | -1/+0 |
| | | | |||||
* | | | Added THREEDTOPOS setting for survexs 3dtopos program | Martin Green | 2011-07-10 | 3 | -0/+3 |
| | | | |||||
* | | | Added url to cave and turned entrances station names and removed the ↵ | Martin Green | 2011-07-10 | 1 | -9/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | previous SurveyStation model. Note caves should be rendered in the directory of their original url to make links work. Note SurveyStations appeared to duplicate SurvexStations. Note Given we want to be running from a mercurial repository, it is easiest to store the names of survey stations rather than foreign keys. | ||||
* | | | Add ability to views caves via their cave slug. Not recommended until links ↵ | Martin Green | 2011-07-10 | 1 | -0/+1 |
| | | | | | | | | | | | | are fixed. | ||||
* | | | Changed to regex to make 2003 expo logbooks parse | Martin Green | 2011-07-10 | 1 | -1/+1 |
| | | | |||||
* | | | Added redmund style for jquery-ui | Martin Green | 2011-07-10 | 16 | -0/+568 |
| |/ |/| | |||||
* | | Added editing of flat pages. Added slugfields to models to refer to them. | Martin Green | 2011-06-02 | 17 | -20/+376 |
|/ | |||||
* | debug | Martin Green | 2011-05-02 | 1 | -1/+1 |
| | |||||
* | debug | Martin Green | 2011-05-02 | 1 | -1/+1 |
| | |||||
* | Try to fake crsf tags so site works on djang0 1.1 | Martin Green | 2011-05-02 | 1 | -0/+10 |
| | |||||
* | Attempt to get CSRF tag not breaking django 1.1 | Martin Green | 2011-05-02 | 1 | -0/+1 |
| | |||||
* | Attempt to get csrf tag working in django 1.1- | Martin Green | 2011-05-02 | 3 | -1/+13 |
| | |||||
* | Get CSRF middleware to work on django 1.1- and 1.2+ | Martin Green | 2011-05-02 | 1 | -1/+7 |
| | |||||
* | Added ability to host website not at the root, eg. http://m.com/troggle/ | Martin Green | 2011-05-02 | 4 | -5/+14 |
| | |||||
* | Debugging, and make get_name function accessable (should really be renamed) | Martin Green | 2011-05-02 | 2 | -25/+29 |
| | |||||
* | CRCF protection | Martin Green | 2011-05-02 | 1 | -1/+1 |
| | |||||
* | decorator to check if user is logged in if settings.PUBLIC_SITE | Martin Green | 2011-05-02 | 1 | -0/+14 |
| |