Sam Wenham
7f92a7280d
Prevent troggle adding the menu if there is one in the file
...
Add a Docker compose file to bring up a dev troggle easily
Various PEP improvments
2019-02-23 15:30:58 +00:00
expoonserver
c3300f7c96
FileUploadForm does not work with django 1.7.
...
It tries to use database during class initialisation.
removed it for now - not sure if it's important...
2018-06-17 02:24:00 +01:00
Sam Wenham
af13e84c74
Fix the django for the spinny js cave viewer.
...
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
2018-04-20 20:55:12 +01:00
Sam Wenham
bcaa4b27d2
Merge with django-upgrade
2018-04-17 22:19:20 +01:00
expoonserver
d0e0eee15a
Add CaveView spinny caves view to each troggle cave page
2018-04-17 21:57:02 +01:00
Sam Wenham
e61dffbfea
Add default BooleanField(default=False) for django 1.7 compatibility
2018-04-17 21:51:39 +01:00
Sam Wenham
0633e17d11
missed from last commit
2018-04-15 16:28:52 +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
2c2c815b25
Up to 1.6.11 on stretch. New manage.py. Some tidying
2018-04-15 12:00:59 +01:00
Sam Wenham
3fd805e26c
More cleanup and modernisation
2018-04-14 21:37:12 +01:00
Sam Wenham
1974d0758a
Clean up indenting in models
...
add registration required modules
2018-04-14 21:14:19 +01:00
Sam Wenham
0ef4f7832c
Import Image from PIL to support newer python
...
import the Django registration module rather than the troggle one
2018-04-10 01:34:06 +01:00
expoonserver
86b1e6e577
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
d7b2ddefce
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
0239800ff1
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
73e27355b1
Commit changes made on expo 2015
2015-09-16 01:52:45 +01:00
Sam Wenham
06de254c9e
I think this is breaking prospecting
2015-06-28 13:39:50 +01:00
expo
087a028388
Moved notable caves to settings.py, link to a script to fix permissions
2015-06-21 15:08:09 +01:00
Wookey
412a9dbefe
Fix up obvious URLs containing subarea names (smkridge)
2015-04-08 03:40:57 +01:00
Wookey
814ecf8425
Fix templates to use system javascript for jquery, jquery-ui and
...
jquery-ui themes
2014-09-11 07:38:45 +01:00
Wookey
3daf8d14c9
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
df8618d0f0
Prospecting guide and images and few minor other things.
2013-08-01 17:00:01 +02:00
Wookey
c3bde999c1
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
511c379fe0
Add comment to identifycavedir function
...
and remove now-disused special-case filename
2013-06-24 01:30:17 +01:00
Martin
71289d9b0f
Merge
2012-08-14 23:49:26 +02:00
Martin
25a73c4ab7
Bug fixing of cave and entrance forms removal of slugs
2012-08-14 22:51:15 +02:00
Martin
29c2c5f88d
added entrance locations
2012-08-14 15:08:08 +02: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
expo
44eb3c0caf
Editing no longer changes files more than nesecary. Removed TinyMCE editing. /Sumbit/Submit
2012-08-06 12:19:48 +02:00
expo
b2fc3dd35b
Fixed cave order
2012-08-05 19:28:34 +02:00
expo
2208f0748b
Fixed cave order
2012-08-05 19:26:24 +02: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
Martin Green
52620ea1c5
Editing for entrances along with caves
...
More detailed display of entrances
2012-05-23 09:23:40 +01:00
Martin Green
599c59454a
Render a cave editing page. Nb it does not do save anything yet.
2012-01-07 19:05:25 +00:00
Martin Green
a0df539ca1
Fix logbook editing
2011-08-08 12:17:38 +01:00
Martin Green
c039183137
Allow the viewing of noinfo caves on non public website without login
2011-08-08 08:51:12 +01:00
Wookey
78cedb2070
remove all the DOS linefeeds
2011-07-11 02:10:22 +01:00
Wookey
0183f94780
merge martin's tip again
2011-07-11 00:52:58 +01:00
Martin Green
5cbfa6d8b1
Split up tags such that they use ajax
2011-07-11 00:50:07 +01:00
Wookey
cc8c47f21f
Merge from Martin's tip
2011-07-11 00:49:18 +01:00
Martin Green
4a88493afa
Removed links to removed forms
2011-07-11 00:04:30 +01:00
Martin Green
203719375e
slug views, start of cave eidt form, cavelist splitting up by kataster area etc.
2011-07-11 00:03:36 +01:00
Martin Green
06efab7d73
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
425d38727d
Removed modelforms for Caves started to add normal forms
2011-07-10 23:57:31 +01:00
Martin Green
10351fc65b
Removed SurveyStation model (not SurvexStation)
2011-07-10 23:55:54 +01:00
Martin Green
c4194be5f1
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
1e1d63c768
merge fix from martin's tip.
2011-07-10 23:30:36 +01:00
Martin Green
f318105a9b
Added editing of flat pages. Added slugfields to models to refer to them.
2011-06-02 19:16:16 +01:00
expo
ca6e50b8ab
debug
2011-05-02 03:25:43 +01:00
