Sam Wenham
|
9df91b221b
|
Support html and wiki logbook entrys
Move nearest_station to nearest_station_name and make nearest_station a foreign
key to SurvexStation
Lots of tidying
|
2019-03-31 15:39:53 +01:00 |
|
Sam Wenham
|
64a4842dcb
|
Remove the redundant render_with_context() as django now does this just with the
render() shortcut
Move from mimetype to content_type, missed in last commit
|
2019-03-30 17:02:07 +00: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 |
|
Wookey
|
705dd51f30
|
Only show unofficial number if it's not already displayed
|
2019-03-27 01:59:09 +00:00 |
|
expoonserver
|
f8be510509
|
Display temporary numbers on main cave index, when they exist.
|
2019-03-26 23:58:27 +00:00 |
|
Sam Wenham
|
121f0a6aac
|
Remove the news section as it never gets updated
Fix logbook entry so the edit link works
Tidy the control panel page
|
2019-03-10 11:05:57 +00:00 |
|
Sam Wenham
|
8932bdc466
|
Remove jquery.min.js from troggle as it busts the footer menu. Yep troggle has a footer menu!!
|
2019-03-09 19:32:00 +00:00 |
|
Sam Wenham
|
b4296f1736
|
Fix people list
Cope with Jimmy McFoo as a name!
Don't set the top expo value in the code whin it is piss easy to calculate
Fix typo from last commit
|
2019-03-09 18:21:10 +00:00 |
|
Sam Wenham
|
1bac650aee
|
There is no point having two functions do basicaly the same thing so make the
load all logbooks call load logbook(expo)
Remove the return message from load logbook as it isn't used
|
2019-03-09 11:18:44 +00:00 |
|
Sam Wenham
|
9fc80bed35
|
Make the logbook parser a little more sane
Move the parser to expo mapping to settings
Set a default parser
Iterate over the expo years rather than the mapping list!
|
2019-03-06 23:20:34 +00:00 |
|
|
|
4148ece133
|
Messing with millenialcaves.html or similar
|
2019-02-26 12:07:45 +00:00 |
|
|
|
53513b812b
|
Messing with millenialcaves.html or similar
|
2019-02-26 12:01:55 +00:00 |
|
|
|
622d523c98
|
Messing with millenialcaves.html or similar
|
2019-02-26 01:12:14 +00:00 |
|
|
|
a397eb9d00
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:48:34 +00:00 |
|
|
|
b2adc285b6
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:45:56 +00:00 |
|
|
|
8af604262d
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:43:46 +00:00 |
|
|
|
b33ca2b290
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:43:05 +00:00 |
|
|
|
5154c0d8e5
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:29:16 +00:00 |
|
|
|
b01fcc3a6d
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:23:23 +00:00 |
|
|
|
e8585bec42
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:22:58 +00:00 |
|
|
|
e5fa636776
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:17:56 +00:00 |
|
|
|
6beaf4afdd
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:17:11 +00:00 |
|
|
|
3254ba1443
|
|
2019-02-26 00:00:34 +00:00 |
|
|
|
4c3d0ce7fa
|
|
2019-02-25 23:55:06 +00:00 |
|
|
|
a99afe07c6
|
|
2019-02-25 23:53:19 +00:00 |
|
|
|
73bb60eff9
|
|
2019-02-25 23:52:47 +00:00 |
|
|
|
0a214c5d4b
|
|
2019-02-25 23:51:26 +00:00 |
|
|
|
3746dab5de
|
|
2019-02-25 23:46:52 +00:00 |
|
|
|
ee2cd0d391
|
trying to add new field
|
2019-02-25 23:40:53 +00:00 |
|
|
|
78a5f656b9
|
added Rad's playground
|
2019-02-25 22:24:33 +00:00 |
|
|
|
becfaa1504
|
change to table
|
2019-02-25 20:58:32 +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 |
|
Sam Wenham
|
a1f02e575f
|
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 |
|
Sam Wenham
|
f58b1db920
|
Don't create years that aren't here yet troggle goes boom
|
2018-06-20 18:14:13 +01:00 |
|
Sam Wenham
|
3d2ac06a72
|
Move the years on a bit
|
2018-06-20 18:11:12 +01:00 |
|
Sam Wenham
|
46124a770f
|
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
|
6f6327d267
|
Merge with django-upgrade
|
2018-04-17 22:19:20 +01:00 |
|
expoonserver
|
6710a469ee
|
Add CaveView spinny caves view to each troggle cave page
|
2018-04-17 21:57:02 +01:00 |
|
Sam Wenham
|
ffb5d7bdda
|
Upgrade to django 1.5, some functions have been changed
url in templates now requires quotes roung the first arg
USE_TZ added
|
2018-04-11 22:02:57 +01:00 |
|
Wookey
|
f0e1406c5f
|
Update old website base URL in template from cucc.survex.com/expo to expo.survex.com
|
2018-02-28 15:55:00 +00:00 |
|
Sam Wenham
|
27fca090fc
|
Bring troggle a little more up to date
|
2016-09-04 13:47:26 +01: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 |
|
Wookey
|
edc6591554
|
Correct typo on cave and entrance template files
('If you edit this files...')
|
2016-01-27 04:24:44 +00:00 |
|
Sam Wenham
|
480541ae54
|
Add a little style
|
2015-06-28 13:52:33 +01:00 |
|
Sam Wenham
|
60303d041c
|
Remove unnecessary escape slashes
|
2015-06-28 13:46:28 +01:00 |
|
expo
|
a4651eaa0a
|
Added warnings that the database will need updating is cave or entrance data files are modified
|
2015-06-21 15:11:51 +01:00 |
|
expo
|
4771f52b20
|
Have different links for system js files and troggle js files
|
2015-06-21 15:06:44 +01:00 |
|
Wookey
|
d29fe2ee1c
|
Merge in Sam's parser debugging
|
2015-04-08 03:27:48 +01:00 |
|
Sam Wenham
|
3010961383
|
Try and ignore files that don't end .html (We really need to change to .xml) eg .html.orig!!
Change the index on troggle to move on with the year
|
2015-01-19 21:28:35 +00: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 |
|
expo
|
da71cca22f
|
Prospecting guide and images and few minor other things.
|
2013-08-01 17:00:01 +02:00 |
|
Wookey
|
5351108ec1
|
merged in proper CSRF changes from server
|
2013-07-02 20:23:55 +01:00 |
|
Wookey
|
d1ad8730d7
|
Add CSRF protection to registration form (and remove annoying second
password)
|
2013-07-02 18:10:45 +01:00 |
|
wookey
|
f3a570a21d
|
Add csrf token to registration forms
|
2013-07-02 17:26:35 +01:00 |
|
wookey
|
7f108f6d9a
|
Set title to show 1976-2013
Put quick link to 2011 back as that one works
|
2013-07-02 00:33:53 +01:00 |
|
wookey
|
ccd80e74f8
|
Change template headers to show 2012/2013 as shortcuts
|
2013-06-23 03:19:41 +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
|
6d5babd331
|
Prospecting template
|
2012-08-10 19:34:44 +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
|
0f5627505f
|
Fix broken markup
|
2012-08-05 21:37:46 +02:00 |
|
expo
|
9654e5da1c
|
FIx base template so admin link, expoweb link work and use consistent base URL
|
2012-08-05 02:33:48 +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
|
c623acf832
|
template changes. Fix link to css.
|
2011-08-08 12:40:47 +01:00 |
|
Martin Green
|
36b1888f46
|
Added 'page not found do you wnat to make this page' page. Minor tweaks
|
2011-08-08 12:18:47 +01:00 |
|
Martin Green
|
e85c386375
|
=Make a common base for expoweb pages. Ignore any header information in expoweb except titles.
|
2011-08-08 10:58:50 +01:00 |
|
Martin Green
|
c66ecc4d7f
|
Allow pages to be rendered when the body tag has attributes. Put an edit link on the homepage.
|
2011-08-08 10:04:59 +01:00 |
|
Martin Green
|
13fe89af9f
|
Allow for editing flatpage titles, and made a common uneditable list of links.
|
2011-08-08 09:51:47 +01:00 |
|
expo
|
9534bd8881
|
Make caveindex link to urls in the original hierachy such that their
hyperlinks and images work.
|
2011-08-07 16:11:35 +02:00 |
|
ExpoOnServer
|
18ccc57f87
|
add /troggle dir (Martin's changes to get main site back as entry point)
|
2011-07-11 23:35:11 +01:00 |
|
Martin Green
|
97c388dba0
|
Moved troggle main page to /troggle added a link in flat pages.
Now / takes you to the expoweb index page
|
2011-07-11 22:38:40 +01:00 |
|
Wookey
|
dc1327674c
|
remove all the DOS linefeeds
|
2011-07-11 02:10:22 +01:00 |
|
Wookey
|
c8ff8e3ef6
|
Add /index.htm to EXPOWEB root URL in main template so that you get
the static stuff
|
2011-07-11 01:55:12 +01:00 |
|
Martin Green
|
5d8a5494cd
|
Split up tags such that they use ajax
|
2011-07-11 00:50:07 +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
|
50545af223
|
Added editing of flat pages. Added slugfields to models to refer to them.
|
2011-06-02 19:16:16 +01:00 |
|
Martin Green
|
f3391a912e
|
Attempt to get CSRF tag not breaking django 1.1
|
2011-05-02 03:13:54 +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
|
cb744ddeef
|
CRCF protection
|
2011-05-02 02:14:15 +01:00 |
|
Martin Green
|
671e946c6d
|
settings.PUBLIC_SITE, login required if public for logbook entry, CRCF middleware
|
2011-05-02 02:12:26 +01:00 |
|
Martin Green
|
3928609c29
|
Bug fix to expedition links
|
2011-05-02 00:56:53 +01:00 |
|
Martin Green
|
e942c839a1
|
Link to expowebsite
|
2011-05-02 00:53:44 +01:00 |
|
Martin Green
|
b001df1f53
|
edit logbooks, new logbook format, increased database normalisation
|
2011-05-01 19:32:41 +01:00 |
|
expo
|
2be3e4ce9d
|
get survey scans into database
|
2009-09-14 23:09:50 +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
|
41eaa06e55
|
login required for saving survex files
|
2009-08-29 18:34:01 +01:00 |
|
goatchurch
|
7429749004
|
login required for saving survex files
|
2009-08-29 18:33:44 +01:00 |
|
expo
|
29adaa03c6
|
get rid of photo
|
2009-08-29 18:08:55 +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
|
68060d6118
|
[svn] some file reading things
|
2009-07-27 13:42:54 +01:00 |
|
