summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Fix survey scansSam Wenham2019-02-241-10/+11
| | | | | Remove the assert for folders in survey wallets, this does mean currently they will be ignored by troggle.
* Make things more compatiable with newer pythonSam Wenham2019-02-244-33/+54
| | | | | | | Fix the expeditions list Improvements to make it compatiable with django 1.8 Bump the years to add 2018 Update the .hgignore file to ignore junk
* Prevent troggle adding the menu if there is one in the fileSam Wenham2019-02-232-3/+20
| | | | | Add a Docker compose file to bring up a dev troggle easily Various PEP improvments
* FileUploadForm does not work with django 1.7.expoonserver2018-06-172-29/+29
| | | | | It tries to use database during class initialisation. removed it for now - not sure if it's important...
* Fix the django for the spinny js cave viewer.Sam Wenham2018-04-201-8/+8
| | | | | Make the paths settings (don't hard code things like this!!) Add " round spinny urls from the late merge (the rest were done for the move off 1.4.2
* Merge with django-upgradeSam Wenham2018-04-171-3/+17
|\
| * Add CaveView spinny caves view to each troggle cave pageexpoonserver2018-04-171-4/+18
| |
* | Add default BooleanField(default=False) for django 1.7 compatibilitySam Wenham2018-04-173-7/+7
| |
* | missed from last commitSam Wenham2018-04-151-1/+1
| |
* | Django 1.7 mostly working. Big refactor so probably bugsSam Wenham2018-04-154-9/+9
| |
* | Up to 1.6.11 on stretch. New manage.py. Some tidyingSam Wenham2018-04-151-1/+1
| |
* | More cleanup and modernisationSam Wenham2018-04-141-1/+1
| |
* | Clean up indenting in modelsSam Wenham2018-04-141-23/+23
| | | | | | | | add registration required modules
* | Import Image from PIL to support newer pythonSam Wenham2018-04-101-1/+2
|/ | | | import the Django registration module rather than the troggle one
* Test whether url is not 'None' before applying 'startswith' test inexpoonserver2017-10-251-1/+1
| | | | forms.py entering new caves, otherwise it barfs.
* Fix Scan scanning, so that 2015#X01 format (with 'X') is accepted inexpoonserver2017-03-071-2/+2
| | | | scan directories. Allows 2016 data to be processed.
* Fix cave pages to have entrances and description on one page.expo2016-07-021-0/+1
| | | | | Fixes broken links on description and entrance pages. Removes need for jquery-ui.
* Commit changes made on expo 2015expo2015-09-162-1/+7
|
* I think this is breaking prospectingSam Wenham2015-06-281-1/+1
|
* Moved notable caves to settings.py, link to a script to fix permissionsexpo2015-06-212-5/+20
|
* Fix up obvious URLs containing subarea names (smkridge)Wookey2015-04-081-1/+1
|
* Fix templates to use system javascript for jquery, jquery-ui andWookey2014-09-111-1/+1
| | | | jquery-ui themes
* Add 107 to notable caves (noting that this is hard-coded intoWookey2014-07-281-1/+1
| | | | core/views_caves.py which is just shoddy)
* Prospecting guide and images and few minor other things.expo2013-08-015-23/+286
|
* Don't explode if a master survex file is not found for a directory -Wookey2013-07-021-1/+1
| | | | that shouldn't cause total failure to read the database in.
* Add comment to identifycavedir functionwookey2013-06-241-1/+3
| | | | and remove now-disused special-case filename
* MergeMartin2012-08-143-17/+54
|\
| * Bug fixing of cave and entrance forms removal of slugsMartin2012-08-143-17/+54
| |
* | added entrance locationsMartin2012-08-141-0/+6
|/
* Started removing foreignkeys to caves, to achieve greater flexability. Some ↵expo2012-08-124-18/+58
| | | | log book entries stuff may be broken. Add ability to make new caves and entrances via website.
* Made a prospecting guide and fixed survex station description. Removed ↵Martin Green2012-08-103-2/+80
| | | | parsing of underground descriptions to wikis.
* Editing no longer changes files more than nesecary. Removed TinyMCE editing. ↵expo2012-08-061-8/+8
| | | | /Sumbit/Submit
* Fixed cave orderexpo2012-08-051-2/+2
|
* Fixed cave orderexpo2012-08-051-2/+14
|
* Start to change dataformat for caves, along with there editing. Start to ↵Martin Green2012-06-104-61/+161
| | | | change survex reader to cope better with equates/tags.
* Editing for entrances along with cavesMartin Green2012-05-232-29/+31
| | | | More detailed display of entrances
* Render a cave editing page. Nb it does not do save anything yet.Martin Green2012-01-072-13/+50
|
* Fix logbook editingMartin Green2011-08-081-1/+1
|
* Allow the viewing of noinfo caves on non public website without loginMartin Green2011-08-081-6/+6
|
* remove all the DOS linefeedsWookey2011-07-1113-2637/+2637
|
* merge martin's tip againWookey2011-07-111-1/+1
|\
| * Merge from Martin's tipWookey2011-07-116-46/+91
| |\
| * \ merge fix from martin's tip.Wookey2011-07-105-5/+131
| |\ \
| * | | debugexpo2011-05-021-1/+1
| | | |
* | | | Split up tags such that they use ajaxMartin Green2011-07-111-0/+25
| |_|/ |/| |
* | | 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-111-0/+19
| | | | | | | | | | | | | | | | | | 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
| | |