Commit Graph

162 Commits

Author SHA1 Message Date
Sam Wenham 97426a0ddb Backed out changeset: 4552f42bdf54 2019-06-26 20:57:24 +01:00
Sam Wenham 8a1be45aac Remove this stupid hard coded name match 2019-06-26 20:56:08 +01:00
Sam Wenham b42249890e Updating caves and entrances is no longer nuclear!
Big overhaul of people processing, fullname added to the model
lastname is now names -1 unless you only have one (yes you Wookey)
this allows for Jon Arne Toft and Wookey to live it the same DB
names can now have html chars in them, this should be real unicode but that can
only happen when we go to Python 3!
2019-04-19 22:52:54 +01:00
Sam Wenham a4532a29da Update new management command for DB reset
Switch to content_type from mimetype
Make DB reset not nuke so much
Tidy logbook parser
2019-03-30 13:58:38 +00:00
expoonserver ddb62f2897 Add reload_db option to databaseReset.py 2019-03-26 23:59:13 +00:00
Sam Wenham f16b4e3f47 Make the suryeys importer not explode 2019-02-24 14:29:14 +00:00
Sam Wenham 4ad5b68433 Make things more compatiable with newer python
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
2019-02-24 13:03:34 +00:00
expoonserver 6805bcb690 Add 'troggle' namespace to databasereset.py so it runs in django >1.5 2018-06-17 02:41:58 +01:00
expoonserver 10a05d686e django.setup needs to be run before any attempt to use database 2018-06-17 02:23:02 +01:00
expoonserver 89ef5c19ff imports must specify the application name i nlater django versions.
databasereset updated accordingly.
2018-06-16 19:00:26 +01:00
Sam Wenham 798ae591c6 Django 1.7 mostly working. Big refactor so probably bugs 2018-04-15 16:28:13 +01:00
Sam Wenham cebcbeb73a sysadmin to expouser for email 2015-07-01 01:26:04 +01:00
Sam Wenham 057b09dca9 Move expo user settings out of databasereset.py to localsettings where they really belong 2015-07-01 01:18:25 +01:00
expo dcc67fddda Don't put passwords in the repo 2015-06-24 04:41:50 +01:00
Wookey e06be10f7f Change password of 'expo' user created by databasereset script to match that used elsewhere 2015-05-25 21:26:26 +01:00
expo 94c44b0d7b Change databasereset to use 'caves' instead of 'cavesnew' for reloading the cave database 2014-07-28 00:18:10 +01:00
wookey 51a3cecc02 Document 'cavesnew' option in databasereset.py - which just reads in
caves datafiles.
2013-10-07 23:45:59 +01:00
Wookey 5351108ec1 merged in proper CSRF changes from server 2013-07-02 20:23:55 +01:00
Wookey 7759e481d4 Change database syntax to modern format as old style no longer
supported in django 1.4
2013-07-02 18:13:27 +01:00
wookey 9435be0f19 Add 'people' option to DatabaseReset.py, to read in just the folk list after update.
Not sure that it actually works mind...
2013-07-02 00:34:58 +01:00
wookey ea9266ecf9 Add help command and usage info to databaseReset.py 2013-06-24 01:31:14 +01:00
expo ecd5bbcb1d Started removing foreignkeys to caves, to achieve greater flexability. Some log book entries stuff may be broken. Add ability to make new caves and entrances via website. 2012-08-12 19:10:23 +02:00
Martin Green 79b7d32664 Made a prospecting guide and fixed survex station description. Removed parsing of underground descriptions to wikis. 2012-08-10 19:02:13 +02:00
Martin Green 13cb2e9b0f no need to export to cavetab2 anymore 2012-06-10 17:22:50 +01:00
Martin Green 4b269bb234 update caves from new cave file format not cavetab2.csv 2012-06-10 17:16:33 +01:00
Martin Green 711fefb0da Start to change dataformat for caves, along with there editing. Start to change survex reader to cope better with equates/tags. 2012-06-10 14:59:21 +01:00
Wookey dc1327674c remove all the DOS linefeeds 2011-07-11 02:10:22 +01:00
Martin Green 65c55f0f21 Removed conversion to wiki, replaced Surveystation models with text, added area 1623 to all relevant caves. 2011-07-11 00:15:59 +01:00
Martin Green b001df1f53 edit logbooks, new logbook format, increased database normalisation 2011-05-01 19:32:41 +01:00
goatchurch 1294444026 make 2008 logbook correctly parse 2009-09-14 22:52:46 +01:00
goatchurch 7578b65573 able to save sketches up from tunnel 2009-09-13 17:27:46 +01:00
goatchurch ced45c92f7 tunnelfiles scheme added 2009-09-11 23:56:47 +01:00
goatchurch 735b729a41 survey scans features added 2009-09-10 22:07:31 +01:00
goatchurch ce6fe2590d login required for saving survex files 2009-08-29 18:35:02 +01:00
goatchurch 7509a76eb0 login required for saving survex files 2009-08-29 18:34:18 +01:00
goatchurch 709f9954f4 login required for saving survex files 2009-08-29 18:33:28 +01:00
goatchurch c66b5e2dad [svn] latest hacking for various statistics 2009-08-05 11:58:36 +01:00
goatchurch 9077462893 [svn] now with ability to make new svx file 2009-08-01 07:31:27 +01:00
substantialnoninfringinguser b9bbccfe00 [svn] * Make descriptions parser also replace links to descriptions from Cave models' underground_descriptions with wikilinks for valid (existing) links
* Make entrances searchable in admin by cave kataster number
2009-07-16 05:37:33 +01:00
martin speleo 3afb94f5d2 [svn] Work on turn html pages into cavedescription models.py.
Moved parser/cavetabs html_to_wiki function to utils.py
Added databaseReset.py desc to refresh the cavedescriptions.
2009-07-04 16:42:17 +01:00
goatchurch 4c87ce59d3 [svn] with command option 2009-06-28 20:47:11 +01:00
substantialnoninfringinguser c38dfd20a1 [svn] * Make subcave urls work.
* Add json and xml download to admin.
2009-05-22 01:50:16 +01:00
substantialnoninfringinguser 83634fe95a [svn] minor logfile mistake 2009-05-21 22:55:08 +01:00
substantialnoninfringinguser 3ac1169aa7 [svn] fix minor logfile error 2009-05-21 20:24:21 +01:00
substantialnoninfringinguser 3d8a6fb55a [svn] 2009-05-21 20:17:07 +01:00
substantialnoninfringinguser 891b3abb44 [svn] Updates to allow subcave tree with nice admin. 2009-05-21 19:47:19 +01:00
substantialnoninfringinguser 21c39f70de [svn] - Make control panel downloads (qm.csv for each cave, CAVETAB2.CSV) work.
- Fix problems in QM parsing script
2009-05-17 04:31:23 +01:00
substantialnoninfringinguser d8a215a575 [svn] Add: new generic object list template object_list.html, and convenience filter named "link" for making links from objects, and make expeditions list page using those two. Also, fixed survey parsing in databaseReset.py 2009-05-15 03:29:19 +01:00
substantialnoninfringinguser e9e755b517 [svn] Fixed broken buttons on controlpanel, added CAVETAB2.CSV export and 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.
2009-05-14 06:19:46 +01:00
substantialnoninfringinguser 625b2156e3 [svn] Weeks of local changes.
- 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
2009-05-13 06:15:48 +01:00