Sam Wenham
8f66837f6f
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
01f17dc1cc
Add 'troggle' namespace to databasereset.py so it runs in django >1.5
2018-06-17 02:41:58 +01:00
expoonserver
94c232c775
django.setup needs to be run before any attempt to use database
2018-06-17 02:23:02 +01:00
expoonserver
4f665070d7
imports must specify the application name i nlater django versions.
...
databasereset updated accordingly.
2018-06-16 19:00:26 +01:00
Sam Wenham
758259be4d
Django 1.7 mostly working. Big refactor so probably bugs
2018-04-15 16:28:13 +01:00
Sam Wenham
467ec2bcc3
sysadmin to expouser for email
2015-07-01 01:26:04 +01:00
Sam Wenham
a70621609b
Move expo user settings out of databasereset.py to localsettings where they really belong
2015-07-01 01:18:25 +01:00
expo
4e57af79d4
Don't put passwords in the repo
2015-06-24 04:41:50 +01:00
Wookey
d1ffa6fa1f
Change password of 'expo' user created by databasereset script to match that used elsewhere
2015-05-25 21:26:26 +01:00
expo
d4750e7ce9
Change databasereset to use 'caves' instead of 'cavesnew' for reloading the cave database
2014-07-28 00:18:10 +01:00
wookey
4d6f8cb079
Document 'cavesnew' option in databasereset.py - which just reads in
...
caves datafiles.
2013-10-07 23:45:59 +01:00
Wookey
ecfa6b19a0
merged in proper CSRF changes from server
2013-07-02 20:23:55 +01:00
Wookey
1471abeda7
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
97c7a2fd87
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
261ff3cdae
Add help command and usage info to databaseReset.py
2013-06-24 01:31:14 +01:00
expo
28047277f1
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
52736ca1b3
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
d37001962b
no need to export to cavetab2 anymore
2012-06-10 17:22:50 +01:00
Martin Green
f369f34c8f
update caves from new cave file format not cavetab2.csv
2012-06-10 17:16:33 +01:00
Martin Green
9024520184
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
78cedb2070
remove all the DOS linefeeds
2011-07-11 02:10:22 +01:00
Martin Green
861daee66f
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
a26310767b
edit logbooks, new logbook format, increased database normalisation
2011-05-01 19:32:41 +01:00
goatchurch
24d90bae75
make 2008 logbook correctly parse
2009-09-14 22:52:46 +01:00
goatchurch
517d291636
able to save sketches up from tunnel
2009-09-13 17:27:46 +01:00
goatchurch
12cf3a6d53
tunnelfiles scheme added
2009-09-11 23:56:47 +01:00
goatchurch
ece3b79e5d
survey scans features added
2009-09-10 22:07:31 +01:00
goatchurch
b9d2f01b0d
login required for saving survex files
2009-08-29 18:35:02 +01:00
goatchurch
e6191e0852
login required for saving survex files
2009-08-29 18:34:18 +01:00
goatchurch
362cb463b8
login required for saving survex files
2009-08-29 18:33:28 +01:00
goatchurch
e4496e4cd8
[svn] latest hacking for various statistics
2009-08-05 11:58:36 +01:00
goatchurch
60dcb82ef6
[svn] now with ability to make new svx file
2009-08-01 07:31:27 +01:00
substantialnoninfringinguser
5b3a951be3
[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
c377d0376f
[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
a9c22a3cff
[svn] with command option
2009-06-28 20:47:11 +01:00
substantialnoninfringinguser
49ed6495ad
[svn] * Make subcave urls work.
...
* Add json and xml download to admin.
2009-05-22 01:50:16 +01:00
substantialnoninfringinguser
9f13a58498
[svn] minor logfile mistake
2009-05-21 22:55:08 +01:00
substantialnoninfringinguser
a24becd004
[svn] fix minor logfile error
2009-05-21 20:24:21 +01:00
substantialnoninfringinguser
2dfcfb6ffa
[svn]
2009-05-21 20:17:07 +01:00
substantialnoninfringinguser
54a62999c0
[svn] Updates to allow subcave tree with nice admin.
2009-05-21 19:47:19 +01:00
substantialnoninfringinguser
4a42396774
[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
5f93301493
[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
57a972fae7
[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
substantialnoninfringinguser
e8da6b9b8b
[svn] Further attempts to make troggle work on windows using surveys stored 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
2009-05-13 05:58:18 +01:00
substantialnoninfringinguser
25b695e53d
[svn]
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8245 by aaron @ 2/17/2009 1:09 AM
2009-05-13 05:52:59 +01:00
substantialnoninfringinguser
cdd4e685ee
[svn] cave maps to all logbook entry trips done there
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8228 by julian @ 1/24/2009 11:59 PM
2009-05-13 05:46:12 +01:00
substantialnoninfringinguser
b6f1f182f5
[svn] move qm to ;later
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8222 by julian @ 1/24/2009 2:07 PM
2009-05-13 05:43:43 +01:00
substantialnoninfringinguser
0ba4dd4ef4
[svn] survey block object
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8199 by julian @ 1/19/2009 12:22 AM
2009-05-13 05:39:52 +01:00
substantialnoninfringinguser
f229ff35f9
[svn] Julian playing with the logbooks and expoyears
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8180 by julian @ 1/18/2009 3:59 PM
2009-05-13 05:35:59 +01:00
