expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-06-18 19:15:20 +01:00
Code Issues 18 Projects 3 Activity

Commit Graph

  • 9fd6163704 Have different links for system js files and troggle js files expo 2015-06-21 15:06:44 +01:00
  • 77ad85b05c merge balconhoehle changes from server Wookey 2015-06-19 01:55:51 +01:00
  • 1b875a11a7 merge balconhoehle changes from server Wookey 2015-06-19 01:55:51 +01:00
  • 01d877d26e Use django-registration, not a local copy. This old one is uses deprecated hashcompat. Wookey 2015-06-10 23:52:49 +01:00
  • cad8001bd0 Use django-registration, not a local copy. This old one is uses deprecated hashcompat. Wookey 2015-06-10 23:52:49 +01:00
  • e84d990366 Add in balkon hoehle QM list DWalker 2015-05-25 21:55:54 +01:00
  • 220d5f589d Add in balkon hoehle QM list DWalker 2015-05-25 21:55:54 +01:00
  • e06be10f7f Change password of 'expo' user created by databasereset script to match that used elsewhere Wookey 2015-05-25 21:26:26 +01:00
  • d1ffa6fa1f Change password of 'expo' user created by databasereset script to match that used elsewhere Wookey 2015-05-25 21:26:26 +01:00
  • fe6750e824 Fix up obvious URLs containing subarea names (smkridge) Wookey 2015-04-08 03:40:57 +01:00
  • 412a9dbefe Fix up obvious URLs containing subarea names (smkridge) Wookey 2015-04-08 03:40:57 +01:00
  • d29fe2ee1c Merge in Sam's parser debugging Wookey 2015-04-08 03:27:48 +01:00
  • dc385b52bf Merge in Sam's parser debugging Wookey 2015-04-08 03:27:48 +01:00
  • 1156b1d3ea rename troggle paper.odt to troggle_paper.odt as space in repo are a pain Wookey 2015-04-08 03:24:00 +01:00
  • bc4fa32ce9 rename troggle paper.odt to troggle_paper.odt as space in repo are a pain Wookey 2015-04-08 03:24:00 +01:00
  • 126a10cf94 Rename troggle paper to not have a space in it. Wookey 2015-04-06 02:38:24 +01:00
  • d5d0a24bed Rename troggle paper to not have a space in it. Wookey 2015-04-06 02:38:24 +01:00
  • 4560e0da84 Revert all of this the date is needed and is a not null in the db Sam Wenham 2015-01-26 21:53:32 +00:00
  • 244a6177cf Revert all of this the date is needed and is a not null in the db Sam Wenham 2015-01-26 21:53:32 +00:00
  • f9c2e0e170 One more try Sam Wenham 2015-01-26 21:15:17 +00:00
  • 086bfe61a1 One more try Sam Wenham 2015-01-26 21:15:17 +00:00
  • cf413dd03c Ooops that wasn't right Sam Wenham 2015-01-26 21:13:47 +00:00
  • 187e537f46 Ooops that wasn't right Sam Wenham 2015-01-26 21:13:47 +00:00
  • 4965678443 Don't assert an error on bad date formats Sam Wenham 2015-01-26 21:12:27 +00:00
  • a5e7fcf435 Don't assert an error on bad date formats Sam Wenham 2015-01-26 21:12:27 +00:00
  • 67f94f9436 A little more verbosity Sam Wenham 2015-01-19 22:48:50 +00:00
  • 3bdd1ad737 A little more verbosity Sam Wenham 2015-01-19 22:48:50 +00:00
  • 1186662960 Add a little verbosity Sam Wenham 2015-01-19 22:41:48 +00:00
  • 0ab32ef60a Add a little verbosity Sam Wenham 2015-01-19 22:41:48 +00:00
  • 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 Sam Wenham 2015-01-19 21:28:35 +00:00
  • 9961c31e73 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 Sam Wenham 2015-01-19 21:28:35 +00:00
  • 806fd41130 remove two files accidentally included in last commit Wookey 2014-09-11 07:41:33 +01:00
  • 7bd035f602 remove two files accidentally included in last commit Wookey 2014-09-11 07:41:33 +01:00
  • af07161f05 remove internal copies of jquery, jquiery-forms, jquery-ui+themes, django-feincms and codemirror Wookey 2014-09-11 07:40:58 +01:00
  • 086793c341 remove internal copies of jquery, jquiery-forms, jquery-ui+themes, django-feincms and codemirror Wookey 2014-09-11 07:40:58 +01:00
  • 5ff759db93 Fix templates to use system javascript for jquery, jquery-ui and jquery-ui themes Wookey 2014-09-11 07:38:45 +01:00
  • 814ecf8425 Fix templates to use system javascript for jquery, jquery-ui and jquery-ui themes Wookey 2014-09-11 07:38:45 +01:00
  • 7f292d402b Use REPOS_ROOT_PATH so there is just one place to change paths Wookey 2014-09-11 06:33:34 +01:00
  • 8563edd4a7 Use REPOS_ROOT_PATH so there is just one place to change paths Wookey 2014-09-11 06:33:34 +01:00
  • c180780da9 Update the README file a bit - still needs work. Wookey 2014-09-10 23:46:05 +01:00
  • e72546d4b8 Update the README file a bit - still needs work. Wookey 2014-09-10 23:46:05 +01:00
  • d75862bc41 Merge change of 'cavesnew'->'caves' in databasereset. Wookey 2014-07-28 01:22:52 +01:00
  • 9d3cac41b9 Merge change of 'cavesnew'->'caves' in databasereset. Wookey 2014-07-28 01:22:52 +01:00
  • 7cdb603d75 Add 107 to notable caves (noting that this is hard-coded into core/views_caves.py which is just shoddy) Wookey 2014-07-28 01:21:24 +01:00
  • 3daf8d14c9 Add 107 to notable caves (noting that this is hard-coded into core/views_caves.py which is just shoddy) Wookey 2014-07-28 01:21:24 +01:00
  • 94c44b0d7b Change databasereset to use 'caves' instead of 'cavesnew' for reloading the cave database expo 2014-07-28 00:18:10 +01:00
  • d4750e7ce9 Change databasereset to use 'caves' instead of 'cavesnew' for reloading the cave database expo 2014-07-28 00:18:10 +01:00
  • 4a3d181097 Set potato hut localsettingsfile to have correct URLs expo 2014-07-23 09:47:48 +01:00
  • ea72b68532 Set potato hut localsettingsfile to have correct URLs expo 2014-07-23 09:47:48 +01:00
  • d8863dca48 Fix media url to allow for working in the hut Sam 2014-07-23 09:10:31 +01:00
  • e0c439e850 Add a new config file for the potato hut setup. expo 2014-07-23 09:11:17 +01:00
  • 90fbc05e2d Fix media url to allow for working in the hut Sam 2014-07-23 09:10:31 +01:00
  • 511f0cf515 Add a new config file for the potato hut setup. expo 2014-07-23 09:11:17 +01:00
  • f4f1b3ca6d Allow comma in starcommands (*,fix) (comma is default valid *set blank) Wookey 2014-07-01 02:26:26 +01:00
  • 963259d6e3 Allow comma in starcommands (*,fix) (comma is default valid *set blank) Wookey 2014-07-01 02:26:26 +01:00
  • 4a93790c7e Fix survex parser to allow whitespace between * and command (as survex does). Wookey 2014-07-01 02:12:34 +01:00
  • 9d9fad2ae4 Fix survex parser to allow whitespace between * and command (as survex does). Wookey 2014-07-01 02:12:34 +01:00
  • 5265acd9dc merge in survex parsing changes from server. Wookey 2014-06-26 02:37:55 +01:00
  • 8cad25ecc4 merge in survex parsing changes from server. Wookey 2014-06-26 02:37:55 +01:00
  • 9f69bb5fca Remove spurious real password from example localsettingserver.py file. Add comment on how to use it. expoonserver 2014-06-26 02:35:37 +01:00
  • 01d4efccdd Remove spurious real password from example localsettingserver.py file. Add comment on how to use it. expoonserver 2014-06-26 02:35:37 +01:00
  • b1d6e1c3d5 Replace assert on unrecognised commands with print, so that a minor parsing issue doesn't completely kill a parsing update. Add parsing for requires and alias commands. expoonserver 2014-06-26 02:34:19 +01:00
  • 042507cb91 Replace assert on unrecognised commands with print, so that a minor parsing issue doesn't completely kill a parsing update. Add parsing for requires and alias commands. expoonserver 2014-06-26 02:34:19 +01:00
  • 659703b221 Merge with server version Wookey 2014-06-09 19:30:06 +01:00
  • 011fa3acb3 Merge with server version Wookey 2014-06-09 19:30:06 +01:00
  • 3869bd536e remove humongous troggle_log.txt from repo expoonserver 2014-05-19 03:12:16 +01:00
  • f54f0d9d7f Refer to debian package, not upstream URL expoonserver 2014-05-19 03:11:46 +01:00
  • 408d154d3f Refer to debian package, not upstream URL expoonserver 2014-05-19 03:11:46 +01:00
  • 44e3eb8a18 Tidy up urls file a little Wookey 2014-05-14 20:46:59 +01:00
  • 624c2d96df Tidy up urls file a little Wookey 2014-05-14 20:46:59 +01:00
  • 51a3cecc02 Document 'cavesnew' option in databasereset.py - which just reads in caves datafiles. wookey 2013-10-07 23:45:59 +01:00
  • 4d6f8cb079 Document 'cavesnew' option in databasereset.py - which just reads in caves datafiles. wookey 2013-10-07 23:45:59 +01:00
  • 6b4ea7b83e merge olly 2013-08-08 15:48:10 +02:00
  • 6b84d811a2 merge olly 2013-08-08 15:48:10 +02:00
  • da71cca22f Prospecting guide and images and few minor other things. expo 2013-08-01 17:00:01 +02:00
  • df8618d0f0 Prospecting guide and images and few minor other things. expo 2013-08-01 17:00:01 +02:00
  • 5c945e3431 Put correct user for mysql on seagrass back into config (It was accidentally overwritten in recent changes) wookey 2013-07-06 09:28:39 +01:00
  • 9f5f5fb616 Put correct user for mysql on seagrass back into config (It was accidentally overwritten in recent changes) wookey 2013-07-06 09:28:39 +01:00
  • ba5bc365c1 merge support for django 1.2 location for auth module Wookey 2013-07-02 21:12:59 +01:00
  • 64f4e122a5 merge support for django 1.2 location for auth module Wookey 2013-07-02 21:12:59 +01:00
  • c362b1b529 3rd attempt at getting the right syntax for the CSRF protection in Wookey 2013-07-02 21:11:07 +01:00
  • 9737a09c26 3rd attempt at getting the right syntax for the CSRF protection in Wookey 2013-07-02 21:11:07 +01:00
  • f90b6dc7ab update location of auth module for django 1.4 Wookey 2013-07-02 21:10:30 +01:00
  • b90a311d9c update location of auth module for django 1.4 Wookey 2013-07-02 21:10:30 +01:00
  • a6a9016548 Add support for old and new (1.4 on) location for auth module. wookey 2013-07-02 21:05:48 +01:00
  • a376044fdf Add support for old and new (1.4 on) location for auth module. wookey 2013-07-02 21:05:48 +01:00
  • 5351108ec1 merged in proper CSRF changes from server Wookey 2013-07-02 20:23:55 +01:00
  • ecfa6b19a0 merged in proper CSRF changes from server Wookey 2013-07-02 20:23:55 +01:00
  • 7759e481d4 Change database syntax to modern format as old style no longer supported in django 1.4 Wookey 2013-07-02 18:13:27 +01:00
  • 1471abeda7 Change database syntax to modern format as old style no longer supported in django 1.4 Wookey 2013-07-02 18:13:27 +01:00
  • 69c3a06c98 Remove support for django 1.0 CSRF as we only care about 1.2 or later Wookey 2013-07-02 18:12:18 +01:00
  • 6adcadb97c Remove support for django 1.0 CSRF as we only care about 1.2 or later Wookey 2013-07-02 18:12:18 +01:00
  • d1ad8730d7 Add CSRF protection to registration form (and remove annoying second password) Wookey 2013-07-02 18:10:45 +01:00
  • ed13cca261 Add CSRF protection to registration form (and remove annoying second password) Wookey 2013-07-02 18:10:45 +01:00
  • f3a570a21d Add csrf token to registration forms wookey 2013-07-02 17:26:35 +01:00
  • 0dfbd1c84f Add csrf token to registration forms wookey 2013-07-02 17:26:35 +01:00
  • f626d3304d parsing_log should not be saved in the vcs Wookey 2013-07-02 00:49:07 +01:00
  • ca1a1dfb97 parsing_log should not be saved in the vcs Wookey 2013-07-02 00:49:07 +01:00
  • 7eb4c89bf0 Don't explode if a master survex file is not found for a directory - that shouldn't cause total failure to read the database in. Wookey 2013-07-02 00:47:42 +01:00
  • c3bde999c1 Don't explode if a master survex file is not found for a directory - that shouldn't cause total failure to read the database in. Wookey 2013-07-02 00:47:42 +01:00