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

• 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 +0100
• 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 +0100
• 659703b221 Merge with server version Wookey 2014-06-09 19:30:06 +0100
• 011fa3acb3 Merge with server version Wookey 2014-06-09 19:30:06 +0100
• 3869bd536e remove humongous troggle_log.txt from repo expoonserver 2014-05-19 03:12:16 +0100
• f54f0d9d7f Refer to debian package, not upstream URL expoonserver 2014-05-19 03:11:46 +0100
• 408d154d3f Refer to debian package, not upstream URL expoonserver 2014-05-19 03:11:46 +0100
• 44e3eb8a18 Tidy up urls file a little Wookey 2014-05-14 20:46:59 +0100
• 624c2d96df Tidy up urls file a little Wookey 2014-05-14 20:46:59 +0100
• 51a3cecc02 Document 'cavesnew' option in databasereset.py - which just reads in caves datafiles. wookey 2013-10-07 23:45:59 +0100
• 4d6f8cb079 Document 'cavesnew' option in databasereset.py - which just reads in caves datafiles. wookey 2013-10-07 23:45:59 +0100
• 6b4ea7b83e merge olly 2013-08-08 15:48:10 +0200
• 6b84d811a2 merge olly 2013-08-08 15:48:10 +0200
• da71cca22f Prospecting guide and images and few minor other things. expo 2013-08-01 17:00:01 +0200
• df8618d0f0 Prospecting guide and images and few minor other things. expo 2013-08-01 17:00:01 +0200
• 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 +0100
• 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 +0100
• ba5bc365c1 merge support for django 1.2 location for auth module Wookey 2013-07-02 21:12:59 +0100
• 64f4e122a5 merge support for django 1.2 location for auth module Wookey 2013-07-02 21:12:59 +0100
• c362b1b529 3rd attempt at getting the right syntax for the CSRF protection in Wookey 2013-07-02 21:11:07 +0100
• 9737a09c26 3rd attempt at getting the right syntax for the CSRF protection in Wookey 2013-07-02 21:11:07 +0100
• f90b6dc7ab update location of auth module for django 1.4 Wookey 2013-07-02 21:10:30 +0100
• b90a311d9c update location of auth module for django 1.4 Wookey 2013-07-02 21:10:30 +0100
• a6a9016548 Add support for old and new (1.4 on) location for auth module. wookey 2013-07-02 21:05:48 +0100
• a376044fdf Add support for old and new (1.4 on) location for auth module. wookey 2013-07-02 21:05:48 +0100
• 5351108ec1 merged in proper CSRF changes from server Wookey 2013-07-02 20:23:55 +0100
• ecfa6b19a0 merged in proper CSRF changes from server Wookey 2013-07-02 20:23:55 +0100
• 7759e481d4 Change database syntax to modern format as old style no longer supported in django 1.4 Wookey 2013-07-02 18:13:27 +0100
• 1471abeda7 Change database syntax to modern format as old style no longer supported in django 1.4 Wookey 2013-07-02 18:13:27 +0100
• 69c3a06c98 Remove support for django 1.0 CSRF as we only care about 1.2 or later Wookey 2013-07-02 18:12:18 +0100
• 6adcadb97c Remove support for django 1.0 CSRF as we only care about 1.2 or later Wookey 2013-07-02 18:12:18 +0100
• d1ad8730d7 Add CSRF protection to registration form (and remove annoying second password) Wookey 2013-07-02 18:10:45 +0100
• ed13cca261 Add CSRF protection to registration form (and remove annoying second password) Wookey 2013-07-02 18:10:45 +0100
• f3a570a21d Add csrf token to registration forms wookey 2013-07-02 17:26:35 +0100
• 0dfbd1c84f Add csrf token to registration forms wookey 2013-07-02 17:26:35 +0100
• f626d3304d parsing_log should not be saved in the vcs Wookey 2013-07-02 00:49:07 +0100
• ca1a1dfb97 parsing_log should not be saved in the vcs Wookey 2013-07-02 00:49:07 +0100
• 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 +0100
• 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 +0100
• 9435be0f19 Add 'people' option to DatabaseReset.py, to read in just the folk list after update. Not sure that it actually works mind... wookey 2013-07-02 00:34:58 +0100
• 97c7a2fd87 Add 'people' option to DatabaseReset.py, to read in just the folk list after update. Not sure that it actually works mind... wookey 2013-07-02 00:34:58 +0100
• 7f108f6d9a Set title to show 1976-2013 Put quick link to 2011 back as that one works wookey 2013-07-02 00:33:53 +0100
• ce249ab957 Set title to show 1976-2013 Put quick link to 2011 back as that one works wookey 2013-07-02 00:33:53 +0100
• 3f98470af8 Add a function for running people parser And comments on how logbooks can't be read in until 'year' exists in database wookey 2013-06-25 15:59:19 +0100
• 81d9d7533e Add a function for running people parser And comments on how logbooks can't be read in until 'year' exists in database wookey 2013-06-25 15:59:19 +0100
• e58b69782c Add note on how to create a new year in troggle. wookey 2013-06-25 15:56:19 +0100
• badb93fcde Add note on how to create a new year in troggle. wookey 2013-06-25 15:56:19 +0100
• e49e22b37c Removed asserts which meant that if any 'odd' .svx files, or directories with no obvious 'controlling' svx file, were added to the dataset then the survex viewer code exploded and the website didn't work. wookey 2013-06-24 23:32:12 +0100
• 8badd8b556 Removed asserts which meant that if any 'odd' .svx files, or directories with no obvious 'controlling' svx file, were added to the dataset then the survex viewer code exploded and the website didn't work. wookey 2013-06-24 23:32:12 +0100
• 82e69b4f05 Add parsing_log.txt to the files ignored by the VCS. wookey 2013-06-24 23:29:14 +0100
• 00bd49ef2c Add parsing_log.txt to the files ignored by the VCS. wookey 2013-06-24 23:29:14 +0100
• ea9266ecf9 Add help command and usage info to databaseReset.py wookey 2013-06-24 01:31:14 +0100
• 261ff3cdae Add help command and usage info to databaseReset.py wookey 2013-06-24 01:31:14 +0100
• 99ea6778ad Add comment to identifycavedir function and remove now-disused special-case filename wookey 2013-06-24 01:30:17 +0100
• 511c379fe0 Add comment to identifycavedir function and remove now-disused special-case filename wookey 2013-06-24 01:30:17 +0100
• ccd80e74f8 Change template headers to show 2012/2013 as shortcuts wookey 2013-06-23 03:19:41 +0100
• 25c951b250 Change template headers to show 2012/2013 as shortcuts wookey 2013-06-23 03:19:41 +0100
• 3057d2a232 Add checking for compass too Only print filenames on error by default Wookey 2013-05-22 02:33:47 +0100
• 7437ac1d38 Add checking for compass too Only print filenames on error by default Wookey 2013-05-22 02:33:47 +0100
• d1ac659d4f Add error check in place where parser died Wookey 2013-05-22 02:10:58 +0100
• b002ca6cc7 Add error check in place where parser died Wookey 2013-05-22 02:10:58 +0100
• bb1989d0f0 Add some exception checking to parsers/caves.py so that missing entrance slugs don't blow up the import. Also reduce the noise, so you just get a warning about missing slugs printed out wookey 2012-09-24 23:23:38 +0100
• fb495119ab Add some exception checking to parsers/caves.py so that missing entrance slugs don't blow up the import. Also reduce the noise, so you just get a warning about missing slugs printed out wookey 2012-09-24 23:23:38 +0100
• 418e5e1d3f Add debug for which entrance file was being read so we get a clue where to look when 'databasereset newcaves' falls over wookey 2012-09-24 22:38:35 +0100
• 631ac20c12 Add debug for which entrance file was being read so we get a clue where to look when 'databasereset newcaves' falls over wookey 2012-09-24 22:38:35 +0100
• 3b12e6d975 Add some debug to cave parser as it's easy to make it fail e.g. by referring to slugs that don't exist. Wookey 2012-09-24 22:29:18 +0100
• 6060ae1c08 Add some debug to cave parser as it's easy to make it fail e.g. by referring to slugs that don't exist. Wookey 2012-09-24 22:29:18 +0100
• 54d7f1d097 Remove jgtfile URLs (presumably no longer needed) expoonserver 2012-09-08 01:12:17 +0100
• e2c6845ae0 Remove jgtfile URLs (presumably no longer needed) expoonserver 2012-09-08 01:12:17 +0100
• cfc90deb83 Merge Martin 2012-08-14 23:49:26 +0200
• 71289d9b0f Merge Martin 2012-08-14 23:49:26 +0200
• 1a0e577606 Bug fixing of cave and entrance forms removal of slugs Martin 2012-08-14 22:51:15 +0200
• 25a73c4ab7 Bug fixing of cave and entrance forms removal of slugs Martin 2012-08-14 22:51:15 +0200
• a05fe94d90 ignore files ending in ~ Martin 2012-08-14 15:31:34 +0200
• a4f9f5bb5a ignore files ending in ~ Martin 2012-08-14 15:31:34 +0200
• 8e64062214 added entrance locations Martin 2012-08-14 15:08:08 +0200
• 29c2c5f88d added entrance locations Martin 2012-08-14 15:08:08 +0200
• 8c1882eec8 fixed spelling Martin 2012-08-14 15:06:18 +0200
• 532b8e064b fixed spelling Martin 2012-08-14 15:06:18 +0200
• 8dd51096cf allow extensions to be capatalised Martin 2012-08-14 15:05:15 +0200
• 951f88a59a allow extensions to be capatalised Martin 2012-08-14 15:05:15 +0200
• 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 +0200
• 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 +0200
• 6d5babd331 Prospecting template Martin Green 2012-08-10 19:34:44 +0200
• 5ff163efaa Prospecting template Martin Green 2012-08-10 19:34:44 +0200
• 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 +0200
• 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 +0200
• 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 +0200
• 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 +0200
• a29fd964bd Prevent modification of auto generated files expo 2012-08-06 12:56:20 +0200
• 70a743f88b Prevent modification of auto generated files expo 2012-08-06 12:56:20 +0200
• 1ef274ec1d Editing no longer changes files more than nesecary. Removed TinyMCE editing. /Sumbit/Submit expo 2012-08-06 12:19:48 +0200
• 44eb3c0caf Editing no longer changes files more than nesecary. Removed TinyMCE editing. /Sumbit/Submit expo 2012-08-06 12:19:48 +0200
• 0f5627505f Fix broken markup expo 2012-08-05 21:37:46 +0200
• c221b75afc Fix broken markup expo 2012-08-05 21:37:46 +0200
• c0782e1cca Fixed cave order expo 2012-08-05 19:28:34 +0200
• b2fc3dd35b Fixed cave order expo 2012-08-05 19:28:34 +0200
• ed1d273e03 Fixed cave order expo 2012-08-05 19:26:24 +0200
• 2208f0748b Fixed cave order expo 2012-08-05 19:26:24 +0200
• 9654e5da1c FIx base template so admin link, expoweb link work and use consistent base URL expo 2012-08-05 02:33:48 +0200