Wookey
ded3d58da1
rest of martin's changes, without reverting lineend issues
2011-07-11 23:28:23 +01:00
Martin Green
27e224619e
Do not make an entrance redirect for entrances without there own pages
2011-07-11 22:37:49 +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
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
e8eb877229
Changed to regex to make 2003 expo logbooks parse
2011-07-10 23:45:45 +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
a26310767b
edit logbooks, new logbook format, increased database normalisation
2011-05-01 19:32:41 +01:00
Martin Green
d38a767d7c
Allow survey scans to be scrapped with a file in the top level directory of the year
2011-05-01 19:20:25 +01:00
goatchurch
9043cef847
rolled back a bad update
2009-09-14 23:23:09 +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
8050476c8a
parsing
2009-09-08 23:05:04 +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
b135ab64e7
[svn] full checkin. animations disabled, sorry
2009-07-27 13:43:43 +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
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
84c973f291
[svn] Pareser for cave descriptions
2009-07-04 17:19:30 +01:00
martin speleo
0f8eb4d4e2
[svn] Changed addToArgsSurveyStation such that it does not pass a surveystation model to html_to_wiki. Which was unecessary as html_to_wiki returned it without modification. By removing it html_to_wiki can be cleaned up.
2009-07-04 17:08:48 +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
substantialnoninfringinguser
b816463d1d
[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
96533882c7
[svn] Added cavedescription and new subcave.
...
Changed parsers/survex to read *title into subcave
2009-07-04 00:28:28 +01:00
martin speleo
64db29fa98
[svn] Fixed the following of *includes by adding white space to the end of the regex.
2009-07-03 23:56:39 +01:00
substantialnoninfringinguser
83fa1ea9ac
[svn] Brief code cleanup.
2009-07-03 05:31:49 +01:00
substantialnoninfringinguser
6daf57d8fe
[svn] Fix leftover from expo -> core rename, and add databaseReset.py to README.txt
2009-07-02 22:31:28 +01:00
substantialnoninfringinguser
e565a6b73b
[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
substantialnoninfringinguser
5baddea474
[svn] Add photos wiki syntaxes: e.g.
...
[[display:centre photo:andyc.jpg]] where centre is a class applied to image, and andyc.jpg is the filename of a Photo model instance. Image will be displayed as thumbnail with link to full size image.
[[photo:andyc.jpg]] will produce a link to the admin page for the andyc.jpg Photo model instance.
[[photo:andyc.jpg Title of the link]] will produce a link to the admin page for the andyc.jpg Photo model instance with link text "Title of the link"
2009-07-02 04:10:51 +01:00
substantialnoninfringinguser
504a70f82b
[svn] Whoops, forgot to add the file in last revision.
2009-06-14 04:36:19 +01:00
substantialnoninfringinguser
d71ef45bf8
[svn] Added beginnings subcaves parser. This required importing more information from cavetab, namely the location where the main cave page appeared on the old expo website.
2009-06-14 04:33:19 +01:00
substantialnoninfringinguser
8d374c1761
[svn] Added detection of noinfo in cave parser. It sets the non_public flag to true, and the view then shows nonpublic.html instead of the cave if the user isn't logged in.
2009-06-10 17:47:05 +01:00
goatchurch
91b9d80367
[svn] codemirror
2009-06-09 18:59:54 +01:00
substantialnoninfringinguser
f797dacb47
[svn] Removed redundant fields "date" and "place" from Persontrip model. A PersonTrip's date and place are stored in its parent LogbookEntry. PersonTrips are the people who participate in the trip in a LogbookEntry, so it would make no sense to have different dates and places from the LogbookEntry they are foreignkeyed to.
2009-06-09 00:29:00 +01:00
substantialnoninfringinguser
9006016bfd
[svn] fix imports
2009-05-23 16:51:21 +01:00
substantialnoninfringinguser
b774c42333
[svn] switched from dodgy manually writing to logfile to using python's logging module, which seems great
2009-05-22 06:17:24 +01:00
substantialnoninfringinguser
9f13a58498
[svn] minor logfile mistake
2009-05-21 22:55:08 +01:00
substantialnoninfringinguser
54a62999c0
[svn] Updates to allow subcave tree with nice admin.
2009-05-21 19:47:19 +01:00
substantialnoninfringinguser
9c1e978da2
[svn]
2009-05-19 06:32:42 +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
a4212632b2
[svn] Make the workaround to avoid parsing interlaced pngs actually work (see issue # 14)
2009-05-15 03:56:11 +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
8c68a8a0d7
[svn] Dynamic thumbnail generation for photos and survey scans using imagekit, further improving registration system, other misc.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8336 by cucc @ 5/10/2009 11:05 PM
2009-05-13 06:23:57 +01:00
substantialnoninfringinguser
21204f1bc8
[svn] Fixes to deal with reorganization of expo surveys repository. Now that survey scans and Surveys.csv are in different directories, we have two settings variables, settings.SURVEYS for the root of the survey repo, and settings.SURVEY_SCANS for the surveyscans directory.
...
Fixed tab / indent muck in surveys parser. Commented out some "file abstraction" stuff for the time being.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8335 by cucc @ 5/10/2009 7:26 AM
2009-05-13 06:22:53 +01:00
substantialnoninfringinguser
e2e47e5876
[svn] fix it for real this time
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8327 by cucc @ 5/3/2009 6:18 AM
2009-05-13 06:18:09 +01:00
substantialnoninfringinguser
a19781d7dd
[svn] fix import naming mistake
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8326 by cucc @ 5/3/2009 6:17 AM
2009-05-13 06:17:09 +01:00
