Commit Graph

Select branches

Hide Pull Requests

Faster-survex-parser

RW_rebuild

django-1.10

django-upgrade

django-upgrade-pt2

master

old-master

Mono Color

• a4f9f5bb5a ignore files ending in ~ Martin 2012-08-14 15:31:34 +02:00
• 8e64062214 added entrance locations Martin 2012-08-14 15:08:08 +02:00
• 29c2c5f88d added entrance locations Martin 2012-08-14 15:08:08 +02:00
• 8c1882eec8 fixed spelling Martin 2012-08-14 15:06:18 +02:00
• 532b8e064b fixed spelling Martin 2012-08-14 15:06:18 +02:00
• 8dd51096cf allow extensions to be capatalised Martin 2012-08-14 15:05:15 +02:00
• 951f88a59a allow extensions to be capatalised Martin 2012-08-14 15:05:15 +02:00
• 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. expo 2012-08-12 19:10:23 +02:00
• 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. expo 2012-08-12 19:10:23 +02:00
• 6d5babd331 Prospecting template Martin Green 2012-08-10 19:34:44 +02:00
• 5ff163efaa Prospecting template Martin Green 2012-08-10 19:34:44 +02:00
• 79b7d32664 Made a prospecting guide and fixed survex station description. Removed parsing of underground descriptions to wikis. Martin Green 2012-08-10 19:02:13 +02:00
• 52736ca1b3 Made a prospecting guide and fixed survex station description. Removed parsing of underground descriptions to wikis. Martin Green 2012-08-10 19:02:13 +02:00
• dd66ad835a Fixed directory names for the survey scans such that surveys could be found. It did not seem possible to simply change the localsettings.py file to get it to work. expo 2012-08-08 11:29:15 +02:00
• 484f8f76cc Fixed directory names for the survey scans such that surveys could be found. It did not seem possible to simply change the localsettings.py file to get it to work. expo 2012-08-08 11:29:15 +02:00
• a29fd964bd Prevent modification of auto generated files expo 2012-08-06 12:56:20 +02:00
• 70a743f88b Prevent modification of auto generated files expo 2012-08-06 12:56:20 +02:00
• 1ef274ec1d Editing no longer changes files more than nesecary. Removed TinyMCE editing. /Sumbit/Submit expo 2012-08-06 12:19:48 +02:00
• 44eb3c0caf Editing no longer changes files more than nesecary. Removed TinyMCE editing. /Sumbit/Submit expo 2012-08-06 12:19:48 +02:00
• 0f5627505f Fix broken markup expo 2012-08-05 21:37:46 +02:00
• c221b75afc Fix broken markup expo 2012-08-05 21:37:46 +02:00
• c0782e1cca Fixed cave order expo 2012-08-05 19:28:34 +02:00
• b2fc3dd35b Fixed cave order expo 2012-08-05 19:28:34 +02:00
• ed1d273e03 Fixed cave order expo 2012-08-05 19:26:24 +02:00
• 2208f0748b Fixed cave order expo 2012-08-05 19:26:24 +02:00
• 9654e5da1c FIx base template so admin link, expoweb link work and use consistent base URL expo 2012-08-05 02:33:48 +02:00
• 0785455bac FIx base template so admin link, expoweb link work and use consistent base URL expo 2012-08-05 02:33:48 +02:00
• 8040b746b4 Note that the instructions for adding a survey are all wrong. expo 2012-08-05 00:35:02 +02:00
• 742848409b Note that the instructions for adding a survey are all wrong. expo 2012-08-05 00:35:02 +02:00
• 05004aa874 Fix up parser paths so everything is found expo 2012-08-05 00:26:05 +02:00
• 0c20ef2a04 Fix up parser paths so everything is found expo 2012-08-05 00:26:05 +02:00
• 4a21720745 Merge Martin Green 2012-06-10 17:24:10 +01:00
• 833ddeef8b Merge Martin Green 2012-06-10 17:24:10 +01:00
• 13cb2e9b0f no need to export to cavetab2 anymore Martin Green 2012-06-10 17:22:50 +01:00
• d37001962b no need to export to cavetab2 anymore Martin Green 2012-06-10 17:22:50 +01:00
• 0259947cda merge ExpoOnServer 2012-06-10 17:21:26 +01:00
• 6ba6f108ab merge ExpoOnServer 2012-06-10 17:21:26 +01:00
• 080684e56f no need to export cavetab2 anymore ExpoOnServer 2012-06-10 17:20:57 +01:00
• 0fabcaedf8 no need to export cavetab2 anymore ExpoOnServer 2012-06-10 17:20:57 +01:00
• 4b269bb234 update caves from new cave file format not cavetab2.csv Martin Green 2012-06-10 17:16:33 +01:00
• f369f34c8f update caves from new cave file format not cavetab2.csv Martin Green 2012-06-10 17:16:33 +01:00
• 1a62931202 Merge Martin Green 2012-06-10 16:56:44 +01:00
• 0d346c80f7 Merge Martin Green 2012-06-10 16:56:44 +01:00
• c2029df3c9 New parser for new cave format Martin Green 2012-06-10 16:56:12 +01:00
• 19055d01fb New parser for new cave format Martin Green 2012-06-10 16:56:12 +01:00
• 4a074295ad Looks like photos have been added by editing urls.py. ExpoOnServer 2012-06-10 16:19:17 +01:00
• 00c0358855 Looks like photos have been added by editing urls.py. ExpoOnServer 2012-06-10 16:19:17 +01:00
• 711fefb0da Start to change dataformat for caves, along with there editing. Start to change survex reader to cope better with equates/tags. Martin Green 2012-06-10 14:59:21 +01:00
• 9024520184 Start to change dataformat for caves, along with there editing. Start to change survex reader to cope better with equates/tags. Martin Green 2012-06-10 14:59:21 +01:00
• fd12e70f78 Editing for entrances along with caves More detailed display of entrances Martin Green 2012-05-23 09:23:40 +01:00
• 52620ea1c5 Editing for entrances along with caves More detailed display of entrances Martin Green 2012-05-23 09:23:40 +01:00
• fac89bae30 Render a cave editing page. Nb it does not do save anything yet. Martin Green 2012-01-07 19:05:25 +00:00
• 599c59454a Render a cave editing page. Nb it does not do save anything yet. Martin Green 2012-01-07 19:05:25 +00:00
• ab97e367cb merge from upstream Wookey 2011-09-15 12:13:07 +01:00
• 8222ed3b6a merge from upstream Wookey 2011-09-15 12:13:07 +01:00
• ae693ca4c5 Add 2010 and 2011 logbooks to parsing list (can we make this auto somehow - by agreeing a logbook format, or letting it guess)? Wookey 2011-09-15 12:12:18 +01:00
• 58a2f5340b Add 2010 and 2011 logbooks to parsing list (can we make this auto somehow - by agreeing a logbook format, or letting it guess)? Wookey 2011-09-15 12:12:18 +01:00
• 77dea07b40 branch merge expo 2011-09-02 03:39:20 +02:00
• 378ddfe96d branch merge expo 2011-09-02 03:39:20 +02:00
• 77dcf7f759 Remove old ref to goatchurch in localconfig expo 2011-09-01 01:50:51 +02:00
• 4def1aece2 Remove old ref to goatchurch in localconfig expo 2011-09-01 01:50:51 +02:00
• 59e7c4d5df Bug fix Martin Green 2011-08-08 13:11:57 +01:00
• 2145d1187e Bug fix Martin Green 2011-08-08 13:11:57 +01:00
• 0b5e57b85e ignorecase when finding html tags Martin Green 2011-08-08 12:58:02 +01:00
• 9878cf890d ignorecase when finding html tags Martin Green 2011-08-08 12:58:02 +01:00
• c623acf832 template changes. Fix link to css. Martin Green 2011-08-08 12:40:47 +01:00
• fe1989001c template changes. Fix link to css. Martin Green 2011-08-08 12:40:47 +01:00
• 36b1888f46 Added 'page not found do you wnat to make this page' page. Minor tweaks Martin Green 2011-08-08 12:18:47 +01:00
• 3205e1752c Added 'page not found do you wnat to make this page' page. Minor tweaks Martin Green 2011-08-08 12:18:47 +01:00
• c09a668620 Fix logbook editing Martin Green 2011-08-08 12:17:38 +01:00
• a0df539ca1 Fix logbook editing Martin Green 2011-08-08 12:17:38 +01:00
• e85c386375 =Make a common base for expoweb pages. Ignore any header information in expoweb except titles. Martin Green 2011-08-08 10:58:50 +01:00
• 57ace11427 =Make a common base for expoweb pages. Ignore any header information in expoweb except titles. Martin Green 2011-08-08 10:58:50 +01:00
• c66ecc4d7f Allow pages to be rendered when the body tag has attributes. Put an edit link on the homepage. Martin Green 2011-08-08 10:04:59 +01:00
• 4c4b6ef11f Allow pages to be rendered when the body tag has attributes. Put an edit link on the homepage. Martin Green 2011-08-08 10:04:59 +01:00
• 13fe89af9f Allow for editing flatpage titles, and made a common uneditable list of links. Martin Green 2011-08-08 09:51:47 +01:00
• d75bad22de Allow for editing flatpage titles, and made a common uneditable list of links. Martin Green 2011-08-08 09:51:47 +01:00
• d8fe39ae86 Allow the viewing of noinfo caves on non public website without login Martin Green 2011-08-08 08:51:12 +01:00
• c039183137 Allow the viewing of noinfo caves on non public website without login Martin Green 2011-08-08 08:51:12 +01:00
• 5f5359f933 Changed regex for finding head and body of flat pages. Martin Green 2011-08-07 19:17:27 +01:00
• da3efb97ce Changed regex for finding head and body of flat pages. Martin Green 2011-08-07 19:17:27 +01:00
• e820a516de bug fix for edit link for index files Martin Green 2011-08-07 17:30:18 +01:00
• f527bd616a bug fix for edit link for index files Martin Green 2011-08-07 17:30:18 +01:00
• e9fdea80c0 Changed ubuntu local settings to be applicable to the expo machine expo 2011-08-07 16:12:52 +02:00
• 24fdf9be3c Changed ubuntu local settings to be applicable to the expo machine expo 2011-08-07 16:12:52 +02:00
• 9534bd8881 Make caveindex link to urls in the original hierachy such that their hyperlinks and images work. expo 2011-08-07 16:11:35 +02:00
• b1b91d3f62 Make caveindex link to urls in the original hierachy such that their hyperlinks and images work. expo 2011-08-07 16:11:35 +02:00
• 5be508620e update localsettings for server and expo machine ExpoOnServer 2011-07-14 03:50:49 +01:00
• c944fdcf5e update localsettings for server and expo machine ExpoOnServer 2011-07-14 03:50:49 +01:00
• 82e968d5c7 Attempt 17b to end with the right files as tip Wookey 2011-07-12 02:44:07 +01:00
• aa8c35be7b Attempt 17b to end with the right files as tip Wookey 2011-07-12 02:44:07 +01:00
• b4b060a962 Add odt and ods mime types to our list. Maybe this should just be read in from the real list... Wookey 2011-07-12 00:57:48 +01:00
• f60c4cba23 Add odt and ods mime types to our list. Maybe this should just be read in from the real list... Wookey 2011-07-12 00:57:48 +01:00
• 64e5e9d45c merging correct urls.py for /troggle dir in ExpoOnServer 2011-07-12 00:49:24 +01:00
• 9f9fbe33be merging correct urls.py for /troggle dir in ExpoOnServer 2011-07-12 00:49:24 +01:00
• 881215e815 Add empty troggle_log.txt file to save doing it by hand ExpoOnServer 2011-07-12 00:02:01 +01:00
• c7e58eb36d I seem to be going wrong in circles here ExpoOnServer 2011-07-11 23:45:12 +01:00
• 35cd983cc9 I seem to be going wrong in circles here ExpoOnServer 2011-07-11 23:45:12 +01:00
• 0a70039dee really, really get all version the same! Wookey 2011-07-11 23:43:32 +01:00
• 9e5e636d0d really, really get all version the same! Wookey 2011-07-11 23:43:32 +01:00