2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-26 09:11:54 +00:00
Commit Graph

143 Commits

Author SHA1 Message Date
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
5ff163efaa Prospecting template 2012-08-10 19:34:44 +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
c221b75afc Fix broken markup 2012-08-05 21:37:46 +02:00
expo
0785455bac FIx base template so admin link, expoweb link work and use consistent base URL 2012-08-05 02:33:48 +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
fe1989001c template changes. Fix link to css. 2011-08-08 12:40:47 +01:00
Martin Green
3205e1752c Added 'page not found do you wnat to make this page' page. Minor tweaks 2011-08-08 12:18:47 +01:00
Martin Green
57ace11427 =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
4c4b6ef11f 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
d75bad22de Allow for editing flatpage titles, and made a common uneditable list of links. 2011-08-08 09:51:47 +01:00
expo
b1b91d3f62 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
0bfcbdc9cc add /troggle dir (Martin's changes to get main site back as entry point) 2011-07-11 23:35:11 +01:00
Martin Green
3b028661f6 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
78cedb2070 remove all the DOS linefeeds 2011-07-11 02:10:22 +01:00
Wookey
cc27334193 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
5cbfa6d8b1 Split up tags such that they use ajax 2011-07-11 00:50:07 +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
f318105a9b Added editing of flat pages. Added slugfields to models to refer to them. 2011-06-02 19:16:16 +01:00
Martin Green
af34cdb498 Attempt to get CSRF tag not breaking django 1.1 2011-05-02 03:13:54 +01:00
Martin Green
289b882a15 Attempt to get csrf tag working in django 1.1- 2011-05-02 03:11:17 +01:00
Martin Green
3f4ba904e2 CRCF protection 2011-05-02 02:14:15 +01:00
Martin Green
f178fff0b9 settings.PUBLIC_SITE, login required if public for logbook entry, CRCF middleware 2011-05-02 02:12:26 +01:00
Martin Green
d49271ddcf Bug fix to expedition links 2011-05-02 00:56:53 +01:00
Martin Green
fe221f40e7 Link to expowebsite 2011-05-02 00:53:44 +01:00
Martin Green
a26310767b edit logbooks, new logbook format, increased database normalisation 2011-05-01 19:32:41 +01:00
expo
df97991143 get survey scans into database 2009-09-14 23:09:50 +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
b80168c099 modelviz added 2009-09-11 09:04:59 +01:00
goatchurch
ece3b79e5d survey scans features added 2009-09-10 22:07:31 +01:00
goatchurch
109e9fe55b login required for saving survex files 2009-08-29 18:34:01 +01:00
goatchurch
636af41017 login required for saving survex files 2009-08-29 18:33:44 +01:00
expo
65cebce198 get rid of photo 2009-08-29 18:08:55 +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
goatchurch
694fe4b4d8 [svn] some file reading things 2009-07-27 13:42:54 +01:00
substantialnoninfringinguser
57ede091c4 [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
6f0be2c492 [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
9d90506e1c [svn] 2009-07-04 18:41:48 +01:00
martin speleo
c5c22562e0 [svn] Initial and poor attempt at a view for cave descriptions. 2009-07-04 18:11:20 +01:00
martin speleo
7dce545b4c [svn] Fixed setContentHeight to work properly for eye candy view, whilst removing it from the non-eyecandy view 2009-07-03 21:29:02 +01:00
substantialnoninfringinguser
83fa1ea9ac [svn] Brief code cleanup. 2009-07-03 05:31:49 +01:00