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

• 18ccc57f87 add /troggle dir (Martin's changes to get main site back as entry point) ExpoOnServer 2011-07-11 23:35:11 +01:00
• 0bfcbdc9cc add /troggle dir (Martin's changes to get main site back as entry point) ExpoOnServer 2011-07-11 23:35:11 +01:00
• c23fcc5b06 rest of martin's changes, without reverting lineend issues Wookey 2011-07-11 23:28:23 +01:00
• ded3d58da1 rest of martin's changes, without reverting lineend issues Wookey 2011-07-11 23:28:23 +01:00
• 21ff3b8b5d Add changes from martin Wookey 2011-07-11 23:19:48 +01:00
• b6a1503c7a Add changes from martin Wookey 2011-07-11 23:19:48 +01:00
• 97c388dba0 Moved troggle main page to /troggle added a link in flat pages. Martin Green 2011-07-11 22:38:40 +01:00
• 3b028661f6 Moved troggle main page to /troggle added a link in flat pages. Martin Green 2011-07-11 22:38:40 +01:00
• 10799e2ce3 Do not make an entrance redirect for entrances without there own pages Martin Green 2011-07-11 22:37:49 +01:00
• 27e224619e Do not make an entrance redirect for entrances without there own pages Martin Green 2011-07-11 22:37:49 +01:00
• 7ef6b1fcc2 implemented mimetypes, index.htm(l) and fixed edit view Martin Green 2011-07-11 22:36:48 +01:00
• 8c2cf48195 implemented mimetypes, index.htm(l) and fixed edit view Martin Green 2011-07-11 22:36:48 +01:00
• 7a220b4c87 Change absolute url for caves to there expoweb url, such that links work Martin Green 2011-07-11 22:35:32 +01:00
• d3fb0352be Change absolute url for caves to there expoweb url, such that links work Martin Green 2011-07-11 22:35:32 +01:00
• dc1327674c remove all the DOS linefeeds Wookey 2011-07-11 02:10:22 +01:00
• 78cedb2070 remove all the DOS linefeeds Wookey 2011-07-11 02:10:22 +01:00
• c8ff8e3ef6 Add /index.htm to EXPOWEB root URL in main template so that you get the static stuff Wookey 2011-07-11 01:55:12 +01:00
• cc27334193 Add /index.htm to EXPOWEB root URL in main template so that you get the static stuff Wookey 2011-07-11 01:55:12 +01:00
• f766df597c undosify lineends Wookey 2011-07-11 01:49:03 +01:00
• a2e1882d91 undosify lineends Wookey 2011-07-11 01:49:03 +01:00
• bab92cb88c merge martin's tip again Wookey 2011-07-11 00:52:58 +01:00
• 0183f94780 merge martin's tip again Wookey 2011-07-11 00:52:58 +01:00
• 5d8a5494cd Split up tags such that they use ajax Martin Green 2011-07-11 00:50:07 +01:00
• 5cbfa6d8b1 Split up tags such that they use ajax Martin Green 2011-07-11 00:50:07 +01:00
• 129d93dfa7 Merge from Martin's tip Wookey 2011-07-11 00:49:18 +01:00
• cc8c47f21f Merge from Martin's tip Wookey 2011-07-11 00:49:18 +01:00
• 65c55f0f21 Removed conversion to wiki, replaced Surveystation models with text, added area 1623 to all relevant caves. Martin Green 2011-07-11 00:15:59 +01:00
• 861daee66f Removed conversion to wiki, replaced Surveystation models with text, added area 1623 to all relevant caves. Martin Green 2011-07-11 00:15:59 +01:00
• 8578a3097a Added flat pages for entrance and special flatpage redirects. Martin Green 2011-07-11 00:13:06 +01:00
• db2d954b1d Added flat pages for entrance and special flatpage redirects. Martin Green 2011-07-11 00:13:06 +01:00
• de5f68e42c Removed links to removed forms Martin Green 2011-07-11 00:04:30 +01:00
• 4a88493afa Removed links to removed forms Martin Green 2011-07-11 00:04:30 +01:00
• f44b0be459 slug views, start of cave eidt form, cavelist splitting up by kataster area etc. Martin Green 2011-07-11 00:03:36 +01:00
• 203719375e slug views, start of cave eidt form, cavelist splitting up by kataster area etc. Martin Green 2011-07-11 00:03:36 +01:00
• a128401d49 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. Martin Green 2011-07-11 00:01:12 +01:00
• 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. Martin Green 2011-07-11 00:01:12 +01:00
• 5075ded032 Removed modelforms for Caves started to add normal forms Martin Green 2011-07-10 23:57:31 +01:00
• 425d38727d Removed modelforms for Caves started to add normal forms Martin Green 2011-07-10 23:57:31 +01:00
• 47c2e87979 Removed SurveyStation model (not SurvexStation) Martin Green 2011-07-10 23:55:54 +01:00
• 10351fc65b Removed SurveyStation model (not SurvexStation) Martin Green 2011-07-10 23:55:54 +01:00
• 53352e7987 Added THREEDTOPOS setting for survexs 3dtopos program Martin Green 2011-07-10 23:53:32 +01:00
• b70995d314 Added THREEDTOPOS setting for survexs 3dtopos program Martin Green 2011-07-10 23:53:32 +01:00
• 44f86a7d6f Added url to cave and turned entrances station names and removed the previous SurveyStation model. Martin Green 2011-07-10 23:52:18 +01:00
• c4194be5f1 Added url to cave and turned entrances station names and removed the previous SurveyStation model. Martin Green 2011-07-10 23:52:18 +01:00
• c37124d9c4 Add ability to views caves via their cave slug. Not recommended until links are fixed. Martin Green 2011-07-10 23:48:13 +01:00
• 85318ac666 Add ability to views caves via their cave slug. Not recommended until links are fixed. Martin Green 2011-07-10 23:48:13 +01:00
• 69ab1e0249 Changed to regex to make 2003 expo logbooks parse Martin Green 2011-07-10 23:45:45 +01:00
• e8eb877229 Changed to regex to make 2003 expo logbooks parse Martin Green 2011-07-10 23:45:45 +01:00
• 2fd8052ac2 Added redmund style for jquery-ui Martin Green 2011-07-10 23:40:52 +01:00
• 514169ec58 Added redmund style for jquery-ui Martin Green 2011-07-10 23:40:52 +01:00
• 28924db9f8 merge fix from martin's tip. Wookey 2011-07-10 23:30:36 +01:00
• 1e1d63c768 merge fix from martin's tip. Wookey 2011-07-10 23:30:36 +01:00
• 50545af223 Added editing of flat pages. Added slugfields to models to refer to them. Martin Green 2011-06-02 19:16:16 +01:00
• f318105a9b Added editing of flat pages. Added slugfields to models to refer to them. Martin Green 2011-06-02 19:16:16 +01:00
• 30829ff9c8 debug expo 2011-05-02 03:25:43 +01:00
• ca6e50b8ab debug expo 2011-05-02 03:25:43 +01:00
• ede9e4a9bd debug Martin Green 2011-05-02 03:23:59 +01:00
• 12df0d417a debug Martin Green 2011-05-02 03:23:59 +01:00
• 04d0e80430 debug Martin Green 2011-05-02 03:22:45 +01:00
• 8f7e416327 debug Martin Green 2011-05-02 03:22:45 +01:00
• 366d4736ca Try to fake crsf tags so site works on djang0 1.1 Martin Green 2011-05-02 03:20:31 +01:00
• 326af86b84 Try to fake crsf tags so site works on djang0 1.1 Martin Green 2011-05-02 03:20:31 +01:00
• f3391a912e Attempt to get CSRF tag not breaking django 1.1 Martin Green 2011-05-02 03:13:54 +01:00
• af34cdb498 Attempt to get CSRF tag not breaking django 1.1 Martin Green 2011-05-02 03:13:54 +01:00
• 52eb4030d0 Attempt to get csrf tag working in django 1.1- Martin Green 2011-05-02 03:11:17 +01:00
• 289b882a15 Attempt to get csrf tag working in django 1.1- Martin Green 2011-05-02 03:11:17 +01:00
• 835680f0ee Get CSRF middleware to work on django 1.1- and 1.2+ Martin Green 2011-05-02 02:51:14 +01:00
• 925ed4635b Get CSRF middleware to work on django 1.1- and 1.2+ Martin Green 2011-05-02 02:51:14 +01:00
• cdf54e0f9b Added ability to host website not at the root, eg. http://m.com/troggle/ Martin Green 2011-05-02 02:37:33 +01:00
• 9becad0d9a Added ability to host website not at the root, eg. http://m.com/troggle/ Martin Green 2011-05-02 02:37:33 +01:00
• b439d40120 Debugging, and make get_name function accessable (should really be renamed) Martin Green 2011-05-02 02:15:54 +01:00
• 4a3ccc728b Debugging, and make get_name function accessable (should really be renamed) Martin Green 2011-05-02 02:15:54 +01:00
• cb744ddeef CRCF protection Martin Green 2011-05-02 02:14:15 +01:00
• 3f4ba904e2 CRCF protection Martin Green 2011-05-02 02:14:15 +01:00
• 872ffe5882 decorator to check if user is logged in if settings.PUBLIC_SITE Martin Green 2011-05-02 02:13:27 +01:00
• 9dd5d2ad16 decorator to check if user is logged in if settings.PUBLIC_SITE Martin Green 2011-05-02 02:13:27 +01:00
• 671e946c6d settings.PUBLIC_SITE, login required if public for logbook entry, CRCF middleware Martin Green 2011-05-02 02:12:26 +01:00
• f178fff0b9 settings.PUBLIC_SITE, login required if public for logbook entry, CRCF middleware Martin Green 2011-05-02 02:12:26 +01:00
• 3928609c29 Bug fix to expedition links Martin Green 2011-05-02 00:56:53 +01:00
• d49271ddcf Bug fix to expedition links Martin Green 2011-05-02 00:56:53 +01:00
• e942c839a1 Link to expowebsite Martin Green 2011-05-02 00:53:44 +01:00
• fe221f40e7 Link to expowebsite Martin Green 2011-05-02 00:53:44 +01:00
• bff34aafb9 FIX2 Martin Green 2011-05-01 23:21:47 +01:00
• 254f028575 FIX2 Martin Green 2011-05-01 23:21:47 +01:00
• 7623943f3e Fix Martin Green 2011-05-01 23:11:18 +01:00
• 5ade60e0cf Fix Martin Green 2011-05-01 23:11:18 +01:00
• 6d7691791a Added settings hooks for TinyMCE. On debian apt-get install tinymce python-django-tinymce Martin Green 2011-05-01 19:58:38 +01:00
• 79562d8e6d Added settings hooks for TinyMCE. On debian apt-get install tinymce python-django-tinymce Martin Green 2011-05-01 19:58:38 +01:00
• b001df1f53 edit logbooks, new logbook format, increased database normalisation Martin Green 2011-05-01 19:32:41 +01:00
• a26310767b edit logbooks, new logbook format, increased database normalisation Martin Green 2011-05-01 19:32:41 +01:00
• 1cc7f2d92e Allow survey scans to be scrapped with a file in the top level directory of the year Martin Green 2011-05-01 19:20:25 +01:00
• d38a767d7c Allow survey scans to be scrapped with a file in the top level directory of the year Martin Green 2011-05-01 19:20:25 +01:00
• 7a0a898bc6 Added variables to configure TinyMCE Martin Green 2011-05-01 19:17:57 +01:00
• 4b2d18be69 Added variables to configure TinyMCE Martin Green 2011-05-01 19:17:57 +01:00
• 41aca4e2d7 Added files for jQuery to allow for UI and dynamic formsets. Martin Green 2011-05-01 19:15:34 +01:00
• 135b1bd2c5 Added files for jQuery to allow for UI and dynamic formsets. Martin Green 2011-05-01 19:15:34 +01:00
• 7e89b12004 Setup files for hg to ignore (*.pyc, db*, localsettings.py) Martin Green 2011-05-01 19:13:07 +01:00
• f65b6dbf11 Setup files for hg to ignore (*.pyc, db*, localsettings.py) Martin Green 2011-05-01 19:13:07 +01:00
• 7bac9f829e Renaming main branch from 'svn' to 'default' per mercurial convention. Hopefully this will keep the main branch as the active one, so the Erebus branch is only used if requested. Aaron Curtis 2009-09-27 00:43:01 -06:00
• 9043cef847 rolled back a bad update goatchurch 2009-09-14 23:23:09 +01:00