Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Django 1.7 mostly working. Big refactor so probably bugs | Sam Wenham | 2018-04-15 | 1 | -2/+2 |
| | |||||
* | sysadmin to expouser for email | Sam Wenham | 2015-07-01 | 1 | -1/+1 |
| | |||||
* | Move expo user settings out of databasereset.py to localsettings where they ↵ | Sam Wenham | 2015-07-01 | 1 | -1/+4 |
| | | | | really belong | ||||
* | Don't put passwords in the repo | expo | 2015-06-24 | 1 | -1/+1 |
| | |||||
* | Change password of 'expo' user created by databasereset script to match that ↵ | Wookey | 2015-05-25 | 1 | -1/+1 |
| | | | | used elsewhere | ||||
* | Change databasereset to use 'caves' instead of 'cavesnew' for reloading the ↵ | expo | 2014-07-28 | 1 | -2/+2 |
| | | | | cave database | ||||
* | Document 'cavesnew' option in databasereset.py - which just reads in | wookey | 2013-10-07 | 1 | -1/+3 |
| | | | | caves datafiles. | ||||
* | merged in proper CSRF changes from server | Wookey | 2013-07-02 | 1 | -7/+7 |
|\ | |||||
| * | Change database syntax to modern format as old style no longer | Wookey | 2013-07-02 | 1 | -7/+7 |
| | | | | | | | | supported in django 1.4 | ||||
* | | Add 'people' option to DatabaseReset.py, to read in just the folk list after ↵ | wookey | 2013-07-02 | 1 | -0/+2 |
|/ | | | | | | update. Not sure that it actually works mind... | ||||
* | Add help command and usage info to databaseReset.py | wookey | 2013-06-24 | 1 | -2/+21 |
| | |||||
* | Started removing foreignkeys to caves, to achieve greater flexability. Some ↵ | expo | 2012-08-12 | 1 | -0/+10 |
| | | | | 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 Green | 2012-08-10 | 1 | -20/+0 |
| | | | | parsing of underground descriptions to wikis. | ||||
* | 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 |
| | |||||
* | Start to change dataformat for caves, along with there editing. Start to ↵ | Martin Green | 2012-06-10 | 1 | -2/+28 |
| | | | | change survex reader to cope better with equates/tags. | ||||
* | remove all the DOS linefeeds | Wookey | 2011-07-11 | 1 | -217/+217 |
| | |||||
* | Removed conversion to wiki, replaced Surveystation models with text, added ↵ | Martin Green | 2011-07-11 | 1 | -1/+16 |
| | | | | area 1623 to all relevant caves. | ||||
* | edit logbooks, new logbook format, increased database normalisation | Martin Green | 2011-05-01 | 1 | -5/+70 |
| | |||||
* | make 2008 logbook correctly parse | goatchurch | 2009-09-14 | 1 | -1/+1 |
| | |||||
* | able to save sketches up from tunnel | goatchurch | 2009-09-13 | 1 | -1/+1 |
| | |||||
* | tunnelfiles scheme added | goatchurch | 2009-09-11 | 1 | -1/+9 |
| | |||||
* | survey scans features added | goatchurch | 2009-09-10 | 1 | -0/+8 |
| | |||||
* | login required for saving survex files | goatchurch | 2009-08-29 | 1 | -0/+1 |
| | |||||
* | login required for saving survex files | goatchurch | 2009-08-29 | 1 | -0/+1 |
| | |||||
* | login required for saving survex files | goatchurch | 2009-08-29 | 1 | -1/+1 |
| | |||||
* | [svn] latest hacking for various statistics | goatchurch | 2009-08-05 | 1 | -1/+4 |
| | |||||
* | [svn] now with ability to make new svx file | goatchurch | 2009-08-01 | 1 | -1/+7 |
| | |||||
* | [svn] * Make descriptions parser also replace links to descriptions from ↵ | substantialnoninfringinguser | 2009-07-16 | 1 | -0/+1 |
| | | | | | | Cave models' underground_descriptions with wikilinks for valid (existing) links * Make entrances searchable in admin by cave kataster number | ||||
* | [svn] Work on turn html pages into cavedescription models.py. | martin speleo | 2009-07-04 | 1 | -3/+24 |
| | | | | | Moved parser/cavetabs html_to_wiki function to utils.py Added databaseReset.py desc to refresh the cavedescriptions. | ||||
* | [svn] with command option | goatchurch | 2009-06-28 | 1 | -1/+7 |
| | |||||
* | [svn] * Make subcave urls work. | substantialnoninfringinguser | 2009-05-22 | 1 | -1/+7 |
| | | | | * Add json and xml download to admin. | ||||
* | [svn] minor logfile mistake | substantialnoninfringinguser | 2009-05-21 | 1 | -2/+2 |
| | |||||
* | [svn] fix minor logfile error | substantialnoninfringinguser | 2009-05-21 | 1 | -1/+3 |
| | |||||
* | [svn] | substantialnoninfringinguser | 2009-05-21 | 1 | -1/+2 |
| | |||||
* | [svn] Updates to allow subcave tree with nice admin. | substantialnoninfringinguser | 2009-05-21 | 1 | -1/+3 |
| | |||||
* | [svn] - Make control panel downloads (qm.csv for each cave, CAVETAB2.CSV) work. | substantialnoninfringinguser | 2009-05-17 | 1 | -4/+0 |
| | | | | - Fix problems in QM parsing script | ||||
* | [svn] Add: new generic object list template object_list.html, and ↵ | substantialnoninfringinguser | 2009-05-15 | 1 | -0/+1 |
| | | | | convenience filter named "link" for making links from objects, and make expeditions list page using those two. Also, fixed survey parsing in databaseReset.py | ||||
* | [svn] Fixed broken buttons on controlpanel, added CAVETAB2.CSV export and ↵ | substantialnoninfringinguser | 2009-05-14 | 1 | -1/+17 |
| | | | | | | download buttons and made them work too. Changed ordering on PersonExpeditions so that it is based on their expedition. That way, even if we don't have date info on when a user was on expo exactly, pages like personindex work correctly. | ||||
* | [svn] Weeks of local changes. | substantialnoninfringinguser | 2009-05-13 | 1 | -26/+51 |
| | | | | | | | | | | | - Import is now non-destructive - Parsers write output to a log file (path be specified in settings) - databaseReset.py content been divided into separate functions which can be called for varying levels of deletion and importing - control panel (view, template, urlpattern) added for deleting and importing - Logins and signup fixed - CaveArea model updated, view, hierarchical url patterns, and beginning of template added - New site style Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8324 by cucc @ 5/3/2009 5:56 AM | ||||
* | [svn] Further attempts to make troggle work on windows using surveys stored ↵ | substantialnoninfringinguser | 2009-05-13 | 1 | -0/+4 |
| | | | | | | | | | | | on an external server settings.PHOTOS changed to setting.PHOTO_ROOT Made databaseReset.py get info from external server if appropriate (hope this did not break linus disk based scripts) Still needs more work, to get everything working Auto create photos directory if it does not already exist Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8262 by julian @ 3/2/2009 1:30 AM | ||||
* | [svn] | substantialnoninfringinguser | 2009-05-13 | 1 | -1/+1 |
| | | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8245 by aaron @ 2/17/2009 1:09 AM | ||||
* | [svn] cave maps to all logbook entry trips done there | substantialnoninfringinguser | 2009-05-13 | 1 | -0/+1 |
| | | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8228 by julian @ 1/24/2009 11:59 PM | ||||
* | [svn] move qm to ;later | substantialnoninfringinguser | 2009-05-13 | 1 | -1/+1 |
| | | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8222 by julian @ 1/24/2009 2:07 PM | ||||
* | [svn] survey block object | substantialnoninfringinguser | 2009-05-13 | 1 | -0/+1 |
| | | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8199 by julian @ 1/19/2009 12:22 AM | ||||
* | [svn] Julian playing with the logbooks and expoyears | substantialnoninfringinguser | 2009-05-13 | 1 | -0/+3 |
| | | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8180 by julian @ 1/18/2009 3:59 PM | ||||
* | [svn] Added a line to call the parser for surveys.csv and the scanned images. | substantialnoninfringinguser | 2009-05-13 | 1 | -1/+2 |
| | | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8156 by aaron @ 1/15/2009 11:25 PM | ||||
* | [svn] Added new photo model. | substantialnoninfringinguser | 2009-05-13 | 1 | -1/+1 |
| | | | | | | | Logbook parser now looks for mugshots when adding people. If it finds an image, it adds a new photo model instance linked to that person. If it finds an html page, it adds the body text of that page as the person's "blurb" and then adds the mugshot. My interface web design isn't working, sorry. Need a blank slate on that one. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8150 by aaron @ 1/4/2009 2:06 PM | ||||
* | [svn] Added QM model and parser. Had to merge models_cave.py and ↵ | substantialnoninfringinguser | 2009-05-13 | 1 | -2/+3 |
| | | | | | | | models_logbooks.py into models.py. This is because logbook entries now have an optional foreign key to caves, and QMs have a required foreign key to a logbook entry of the trip that created them. So, the two files became circularly dependent. Also, the urls for the person model now allow lookups using their actual first and last name in the url instead of the primary key. We should do similar things for all models, maybe even using the url as a search which results in a page with multiple model instance results if the input is ambiguous (e.g. they only enter a first name). Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8093 by aaron @ 12/13/2008 11:17 PM | ||||
* | [svn] add local settings files | substantialnoninfringinguser | 2009-05-13 | 1 | -1/+1 |
| | | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8072 by julian @ 11/7/2008 9:09 AM |