expoonserver
d7c6676c49
Test whether url is not 'None' before applying 'startswith' test in
...
forms.py entering new caves, otherwise it barfs.
2017-10-25 03:49:03 +01:00
expoonserver
5e9dfc6ea6
Fix Scan scanning, so that 2015#X01 format (with 'X') is accepted in
...
scan directories. Allows 2016 data to be processed.
2017-03-07 15:44:42 +00:00
expo
716131f005
Fix cave pages to have entrances and description on one page.
...
Fixes broken links on description and entrance pages.
Removes need for jquery-ui.
2016-07-02 23:42:47 +01:00
expo
214d887c57
Commit changes made on expo 2015
2015-09-16 01:52:45 +01:00
Sam Wenham
5a911ecec7
I think this is breaking prospecting
2015-06-28 13:39:50 +01:00
expo
7aed3d3b30
Moved notable caves to settings.py, link to a script to fix permissions
2015-06-21 15:08:09 +01:00
Wookey
fe6750e824
Fix up obvious URLs containing subarea names (smkridge)
2015-04-08 03:40:57 +01:00
Wookey
5ff759db93
Fix templates to use system javascript for jquery, jquery-ui and
...
jquery-ui themes
2014-09-11 07:38:45 +01:00
Wookey
7cdb603d75
Add 107 to notable caves (noting that this is hard-coded into
...
core/views_caves.py which is just shoddy)
2014-07-28 01:21:24 +01:00
expo
da71cca22f
Prospecting guide and images and few minor other things.
2013-08-01 17:00:01 +02:00
Wookey
7eb4c89bf0
Don't explode if a master survex file is not found for a directory -
...
that shouldn't cause total failure to read the database in.
2013-07-02 00:47:42 +01:00
wookey
99ea6778ad
Add comment to identifycavedir function
...
and remove now-disused special-case filename
2013-06-24 01:30:17 +01:00
Martin
cfc90deb83
Merge
2012-08-14 23:49:26 +02:00
Martin
1a0e577606
Bug fixing of cave and entrance forms removal of slugs
2012-08-14 22:51:15 +02:00
Martin
8e64062214
added entrance locations
2012-08-14 15:08:08 +02: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
expo
1ef274ec1d
Editing no longer changes files more than nesecary. Removed TinyMCE editing. /Sumbit/Submit
2012-08-06 12:19:48 +02:00
expo
c0782e1cca
Fixed cave order
2012-08-05 19:28:34 +02:00
expo
ed1d273e03
Fixed cave order
2012-08-05 19:26:24 +02: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
Martin Green
fd12e70f78
Editing for entrances along with caves
...
More detailed display of entrances
2012-05-23 09:23:40 +01:00
Martin Green
fac89bae30
Render a cave editing page. Nb it does not do save anything yet.
2012-01-07 19:05:25 +00:00
Martin Green
c09a668620
Fix logbook editing
2011-08-08 12:17:38 +01:00
Martin Green
d8fe39ae86
Allow the viewing of noinfo caves on non public website without login
2011-08-08 08:51:12 +01:00
Wookey
dc1327674c
remove all the DOS linefeeds
2011-07-11 02:10:22 +01:00
Wookey
bab92cb88c
merge martin's tip again
2011-07-11 00:52:58 +01:00
Martin Green
5d8a5494cd
Split up tags such that they use ajax
2011-07-11 00:50:07 +01:00
Wookey
129d93dfa7
Merge from Martin's tip
2011-07-11 00:49:18 +01:00
Martin Green
de5f68e42c
Removed links to removed forms
2011-07-11 00:04:30 +01:00
Martin Green
f44b0be459
slug views, start of cave eidt form, cavelist splitting up by kataster area etc.
2011-07-11 00:03:36 +01:00
Martin Green
a128401d49
Added parsing of all.svx, along side parsing individual caves.
...
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.
2011-07-11 00:01:12 +01:00
Martin Green
5075ded032
Removed modelforms for Caves started to add normal forms
2011-07-10 23:57:31 +01:00
Martin Green
47c2e87979
Removed SurveyStation model (not SurvexStation)
2011-07-10 23:55:54 +01:00
Martin Green
44f86a7d6f
Added url to cave and turned entrances station names and removed the 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.
2011-07-10 23:52:18 +01:00
Wookey
28924db9f8
merge fix from martin's tip.
2011-07-10 23:30:36 +01:00
Martin Green
50545af223
Added editing of flat pages. Added slugfields to models to refer to them.
2011-06-02 19:16:16 +01:00
expo
30829ff9c8
debug
2011-05-02 03:25:43 +01:00
Martin Green
ede9e4a9bd
debug
2011-05-02 03:23:59 +01:00
Martin Green
04d0e80430
debug
2011-05-02 03:22:45 +01:00
Martin Green
366d4736ca
Try to fake crsf tags so site works on djang0 1.1
2011-05-02 03:20:31 +01:00
Martin Green
52eb4030d0
Attempt to get csrf tag working in django 1.1-
2011-05-02 03:11:17 +01:00
Martin Green
b439d40120
Debugging, and make get_name function accessable (should really be renamed)
2011-05-02 02:15:54 +01:00
Martin Green
bff34aafb9
FIX2
2011-05-01 23:21:47 +01:00
Martin Green
7623943f3e
Fix
2011-05-01 23:11:18 +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
f21cddb2d0
modelviz added
2009-09-11 09:04:59 +01:00
goatchurch
735b729a41
survey scans features added
2009-09-10 22:07:31 +01:00
goatchurch
709f9954f4
login required for saving survex files
2009-08-29 18:33:28 +01:00
goatchurch
6b8294d9dc
remove dependence on latest django
2009-08-29 16:23:11 +01:00
goatchurch
0ea70273fe
quick hack to make work in django1.0 Photo to DPhoto
2009-08-23 23:29:05 +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
goatchurch
7158a79a34
[svn] full checkin. animations disabled, sorry
2009-07-27 13:43:43 +01:00
substantialnoninfringinguser
263b640641
[svn] Various bug fixes, using more raw_id fields in admin so it loads faster. I had to put onLoad="contentHeight();" back into the base template. This is a bad solution, I would rather use Martin's, but it wasn't working.
2009-07-22 16:18:00 +01:00
substantialnoninfringinguser
408a4c79aa
[svn]
2009-07-17 01:14:37 +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
substantialnoninfringinguser
05d262e42b
[svn] only logged in users should see the tasks page thing
2009-07-15 01:55:26 +01:00
substantialnoninfringinguser
18e61d19f5
[svn] * wikilink to html for subcaves and cave descriptions
...
* fix header regex
2009-07-12 06:30:24 +01:00
substantialnoninfringinguser
4a073ea161
[svn] Add regex to turn ==headers== into <h2>headers</2>
2009-07-12 05:54:08 +01:00
substantialnoninfringinguser
2993ca74cc
[svn] override save for CaveDescriptions to scan qm wikilinks and add into the manytomany field linked_qms
2009-07-11 01:36:00 +01:00
substantialnoninfringinguser
1566923d5c
[svn] Make QM wikilinks work in new format, and fix cave description parser to output working wikilinks.
2009-07-09 05:08:21 +01:00
substantialnoninfringinguser
b0073caf5f
[svn] not ready for that yet
2009-07-06 08:35:08 +01:00
substantialnoninfringinguser
8ad044cb2c
[svn] * Make Q< wikilinks work again
...
* Add new ajax bit in LogbookEntry admin which checks for QMs not in wikilink format and allows one click fixes. Soon to be expanded to check for wikilinks that aren't in foreignkey.
* Tweaks to admin including using raw_id_fields for PersonExpedition & other foreignkeyed models with lots of instances.
2009-07-06 08:31:24 +01:00
martin speleo
8a9eb32aaf
[svn] wiki_to_html changes.
...
Changes views of qm model.
2009-07-04 19:35:06 +01:00
substantialnoninfringinguser
7f2199405d
[svn]
2009-07-04 19:29:19 +01:00
substantialnoninfringinguser
38a545e174
[svn] Remove old subcave model, along with mptt and feincms. Also move OtherCaveNames admin representation to an inline in Cave.
2009-07-04 19:26:51 +01:00
martin speleo
7fc1602f7a
[svn] Initial and poor attempt at a view for cave descriptions.
2009-07-04 18:11:20 +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
martin speleo
29f084613d
[svn] removed redundant import
2009-07-04 16:39:59 +01:00
substantialnoninfringinguser
dd76a1a0be
[svn] * Adding JS fill in next QM number via ajax.
...
* Slight models cleanup- get rid of TroggleImageModel class, use mixin instead.
* Collect various troggle shared functions into utils.py
2009-07-04 08:27:49 +01:00
martin speleo
c132477f80
[svn] Added cavedescription and new subcave.
...
Changed parsers/survex to read *title into subcave
2009-07-04 00:28:28 +01:00
martin speleo
7db1aae5ee
[svn] Remove broken import search
2009-07-03 21:04:28 +01:00
substantialnoninfringinguser
b4388d838e
[svn]
2009-07-03 20:49:04 +01:00
substantialnoninfringinguser
8446047ab2
[svn] Brief code cleanup.
2009-07-03 05:31:49 +01:00
substantialnoninfringinguser
dc19150eba
[svn] whoops
2009-07-03 00:51:41 +01:00
substantialnoninfringinguser
a89139763f
[svn] Use template block "related" for related objects. Various cleanup, fix personexpedition date views.
2009-07-03 00:50:56 +01:00
substantialnoninfringinguser
dab138c731
[svn] More fallout of renaming expo to core. Also fix
2009-07-02 23:02:42 +01:00
substantialnoninfringinguser
ae3fe8cd42
[svn] Renaming troggle.expo to troggle.core. To do this, used:
...
perl -p -i -e "s/expo(?=[\s\.']+)/core/g" `find -name \*.py`
and then manually checked each change (had to remove a couple)
2009-07-02 20:43:18 +01:00
