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

• 2fc60f9f74 Fixing logbooks with parse errors Philip Sargent 2020-02-20 15:26:33 +00:00
• 3b1fcb7feb Merge branch 'master' of ssh://expo.survex.com/~/troggle Wookey 2020-02-20 15:02:14 +00:00
• 2838f540d1 Minor text and whitespace fixes Wookey 2020-02-20 15:01:50 +00:00
• f5ec5a61a9 Move survex parsing later in the process as it tends to run out of memory Wookey 2020-02-20 14:57:37 +00:00
• 44caf35fd8 typo Philip Sargent 2020-02-20 14:15:28 +00:00
• c5055e7f34 backport order of operations in reset() and change logbook parser to do paragraphs differently Philip Sargent 2020-02-20 14:13:38 +00:00
• eb5406f325 Add django migrations. These are needed on newer django installs to maintain the database Sam Wenham 2020-02-20 11:55:35 +00:00
• de14ecea22 Fixing back mistaken chnage Philip Sargent 2020-02-20 01:42:52 +00:00
• f5174a3248 typo Philip Sargent 2020-02-19 22:52:00 +00:00
• f0889ce0f8 typos fix and more description Philip Sargent 2020-02-19 22:51:07 +00:00
• b6dc711c14 making in-code documentation strings match what actually happens Philip Sargent 2020-02-19 22:14:00 +00:00
• 04fb2e8701 DOCTYPE update for template for generated files Philip Sargent 2020-02-19 21:48:37 +00:00
• c1439bed8d Adding <pre> and </pre> to the logbook entry display so that all the paragraphs are not munged into one when displayed. Untested. Philip Sargent 2020-02-19 21:47:13 +00:00
• a88f326ee6 added year 2019 to logbook parsing Philip Sargent 2020-02-17 01:39:00 +00:00
• 56618dbe65 fix CUCC url in template and add years to 2020 PhilipSargent 2019-12-23 19:40:44 +00:00
• 71ef710d09 Fix the location of the cave view javascript Expo on server 2019-12-08 10:53:43 +00:00
• c74852b60b Merge branch 'master' of ssh://expo.survex.com/~/troggle Sam Wenham 2019-07-29 11:36:24 +01:00
• de22b071b0 Improve README Make new style QMs from survexfiles work Sam Wenham 2019-07-19 01:04:18 +01:00
• 08a41941f9 Part one of getting troggle to work with django 1.10 Major rework of how survex is processed Sam Wenham 2019-07-16 00:07:37 +01:00
• a26109cb30 Allow comments against names in logbooks in brackets Convert accent chars in names into simple chars as this is what people enter in the logbook Sam Wenham 2019-07-11 12:29:38 +01:00
• 6b5b9a5315 Merge branch 'master' of ssh://expo.survex.com/~/troggle Sam Wenham 2019-07-10 12:37:38 +01:00
• 4ebf3d8a0e Bring back TinyMCE for editing flatpages Sam Wenham 2019-07-10 12:32:04 +01:00
• 37d02b298d added ssh git clone command variant PhilipSargent 2019-07-09 15:55:27 +01:00
• d6053322e8 Merge branch 'master' of ssh://expo.survex.com/~/troggle Sam Wenham 2019-07-09 10:41:21 +01:00
• 5b5f385b67 Remove .hgignore Change mode on modelvis.py Expo on server 2019-07-02 18:14:19 +01:00
• 04428c45c9 Fix description of localsettingsdocker Sam Wenham 2019-07-02 17:52:40 +01:00
• a7f605ced9 changes because we do not use svn anymore PhilipSargent 2019-06-27 01:24:38 +01:00
• 0adb8e528d Add .gitignore file Expo on server 2019-06-27 00:23:22 +01:00
• f4280f9907 Add info to debian instructions on creating troggle logfile (in /var/log) Expo on server 2019-06-27 00:14:39 +01:00
• 2d7892e3b1 Merge remote-tracking branch 'troggle/master' PhilipSargent 2019-07-02 19:04:13 +01:00
• 8edeb2f622 Merge branch 'master' of ssh://expo.survex.com/~/troggle Sam Wenham 2019-07-02 18:15:13 +01:00
• d157a081b1 Remove .hgignore Change mode on modelvis.py Expo on server 2019-07-02 18:14:19 +01:00
• fcc57cf365 Fix description of localsettingsdocker Sam Wenham 2019-07-02 17:52:40 +01:00
• 12c8ab41bf changes because we do not use svn anymore PhilipSargent 2019-06-27 01:24:38 +01:00
• 9266e5460e Add .gitignore file Expo on server 2019-06-27 00:23:22 +01:00
• ad45859071 Add info to debian instructions on creating troggle logfile (in /var/log) Expo on server 2019-06-27 00:14:39 +01:00
• ee759980c4 remove hack in logbook parsing to convert ol to olly and wook to wookey. It broke 'Olaf' as a name, for example. expo on server 2019-06-26 21:46:57 +01:00
• 18b371bc15 remove hack in logbook parsing to convert ol to olly and wook to wookey. It broke 'Olaf' as a name, for example. expo on server 2019-06-26 21:46:57 +01:00
• 9e77b8bb75 Add server setup instructions/recipie for Debian Stretch expo on server 2019-06-26 21:45:17 +01:00
• e6acd4bdbd Add server setup instructions/recipie for Debian Stretch expo on server 2019-06-26 21:45:17 +01:00
• 424219fb6f Just commit the logbook parser this time (can we move to git now!!!) Sam Wenham 2019-06-26 21:21:37 +01:00
• 2ebb37552f Just commit the logbook parser this time (can we move to git now!!!) Sam Wenham 2019-06-26 21:21:37 +01:00
• 822359fe51 Backed out changeset: 4552f42bdf54 Sam Wenham 2019-06-26 20:57:24 +01:00
• 97426a0ddb Backed out changeset: 4552f42bdf54 Sam Wenham 2019-06-26 20:57:24 +01:00
• 3f78382d45 Remove this stupid hard coded name match Sam Wenham 2019-06-26 20:56:08 +01:00
• 8a1be45aac Remove this stupid hard coded name match Sam Wenham 2019-06-26 20:56:08 +01:00
• b5cca8be3b Merge Sam Wenham 2019-06-26 18:43:42 +01:00
• 4d2f9a2b39 Merge Sam Wenham 2019-06-26 18:43:42 +01:00
• 8fe02e5c89 Allow html chars in names Sam Wenham 2019-06-26 18:36:08 +01:00
• b2dd905f0e Allow html chars in names Sam Wenham 2019-06-26 18:36:08 +01:00
• c06d372984 Add expo.survex.com to ALLOWED_HOSTS in troggle settings expo on server 2019-06-26 15:23:20 +01:00
• 7a9aef6faf Add expo.survex.com to ALLOWED_HOSTS in troggle settings expo on server 2019-06-26 15:23:20 +01:00
• 6889ae9fa3 Add SURVEX_TOPNAME (top-level survex file) as a setting item in settings.py so it's not hardcoded. expo on server 2019-06-26 03:32:18 +01:00
• 02d3cc84d5 Add SURVEX_TOPNAME (top-level survex file) as a setting item in settings.py so it's not hardcoded. expo on server 2019-06-26 03:32:18 +01:00
• 768ec83037 Updating caves and entrances is no longer nuclear! Big overhaul of people processing, fullname added to the model lastname is now names -1 unless you only have one (yes you Wookey) this allows for Jon Arne Toft and Wookey to live it the same DB names can now have html chars in them, this should be real unicode but that can only happen when we go to Python 3! Sam Wenham 2019-04-19 22:52:54 +01:00
• b42249890e Updating caves and entrances is no longer nuclear! Big overhaul of people processing, fullname added to the model lastname is now names -1 unless you only have one (yes you Wookey) this allows for Jon Arne Toft and Wookey to live it the same DB names can now have html chars in them, this should be real unicode but that can only happen when we go to Python 3! Sam Wenham 2019-04-19 22:52:54 +01:00
• 2f9870644b missed objects Sam Wenham 2019-04-18 19:27:23 +01:00
• cc313246bb missed objects Sam Wenham 2019-04-18 19:27:23 +01:00
• 4e187581b3 Clear data issues for logbooks before reloading Sam Wenham 2019-04-18 19:26:09 +01:00
• bfe018cde6 Clear data issues for logbooks before reloading Sam Wenham 2019-04-18 19:26:09 +01:00
• dc479b33c5 Add ordering to the data issues model Sam Wenham 2019-04-18 19:01:29 +01:00
• ae284a1f30 Add ordering to the data issues model Sam Wenham 2019-04-18 19:01:29 +01:00
• f1736c53c4 Fix CSRF issues in svx form Set date formats Add DataIssue model and add errors to it to allow us to give people a list of stuff to fix Sam Wenham 2019-04-14 22:45:31 +01:00
• 23df89cf31 Fix CSRF issues in svx form Set date formats Add DataIssue model and add errors to it to allow us to give people a list of stuff to fix Sam Wenham 2019-04-14 22:45:31 +01:00
• 05c5e26e99 Sort people by notability Better errors and tidy Nicer date formats Sam Wenham 2019-04-02 02:04:38 +01:00
• d1d0c24ed8 Sort people by notability Better errors and tidy Nicer date formats Sam Wenham 2019-04-02 02:04:38 +01:00
• c4301cf6df Merge lots of troggle fixes Wookey 2019-04-02 00:57:54 +01:00
• b3089fafe9 Merge lots of troggle fixes Wookey 2019-04-02 00:57:54 +01:00
• de7d68b1eb folk.csv has moved into 'folk' dir out of 'noinfo' Wookey 2019-04-02 00:57:13 +01:00
• e913a56a6b folk.csv has moved into 'folk' dir out of 'noinfo' Wookey 2019-04-02 00:57:13 +01:00
• bb8dbb381f Move cave and entrance data out of 'noinfo' expoonserver 2019-04-01 23:03:45 +01:00
• 39c61bd526 Move cave and entrance data out of 'noinfo' expoonserver 2019-04-01 23:03:45 +01:00
• 144610d6c2 Better error messages Sam Wenham 2019-03-31 16:44:58 +01:00
• 10f1cdb458 Better error messages Sam Wenham 2019-03-31 16:44:58 +01:00
• 40f413ba47 Ooops shouldn't of commited the DateTime change, yet... Sam Wenham 2019-03-31 16:43:21 +01:00
• a588221524 Ooops shouldn't of commited the DateTime change, yet... Sam Wenham 2019-03-31 16:43:21 +01:00
• 9cd8734947 Support html and wiki logbook entrys Move nearest_station to nearest_station_name and make nearest_station a foreign key to SurvexStation Lots of tidying Sam Wenham 2019-03-31 15:39:53 +01:00
• 9df91b221b Support html and wiki logbook entrys Move nearest_station to nearest_station_name and make nearest_station a foreign key to SurvexStation Lots of tidying Sam Wenham 2019-03-31 15:39:53 +01:00
• c8551991b2 Remove the redundant render_with_context() as django now does this just with the render() shortcut Move from mimetype to content_type, missed in last commit Sam Wenham 2019-03-30 17:02:07 +00:00
• 64a4842dcb Remove the redundant render_with_context() as django now does this just with the render() shortcut Move from mimetype to content_type, missed in last commit Sam Wenham 2019-03-30 17:02:07 +00:00
• f666b9c396 Update new management command for DB reset Switch to content_type from mimetype Make DB reset not nuke so much Tidy logbook parser Sam Wenham 2019-03-30 13:58:38 +00:00
• a4532a29da Update new management command for DB reset Switch to content_type from mimetype Make DB reset not nuke so much Tidy logbook parser Sam Wenham 2019-03-30 13:58:38 +00:00
• 5469794159 Only show unofficial number if it's not already displayed Wookey 2019-03-27 01:59:09 +00:00
• 705dd51f30 Only show unofficial number if it's not already displayed Wookey 2019-03-27 01:59:09 +00:00
• 1e26578305 Add reload_db option to databaseReset.py expoonserver 2019-03-26 23:59:13 +00:00
• ddb62f2897 Add reload_db option to databaseReset.py expoonserver 2019-03-26 23:59:13 +00:00
• 8b5f81c8f8 Display temporary numbers on main cave index, when they exist. expoonserver 2019-03-26 23:58:27 +00:00
• f8be510509 Display temporary numbers on main cave index, when they exist. expoonserver 2019-03-26 23:58:27 +00:00
• 27af84da65 Remove the news section as it never gets updated Fix logbook entry so the edit link works Tidy the control panel page Sam Wenham 2019-03-10 11:05:57 +00:00
• 121f0a6aac Remove the news section as it never gets updated Fix logbook entry so the edit link works Tidy the control panel page Sam Wenham 2019-03-10 11:05:57 +00:00
• 9646c32819 Remove jquery.min.js from troggle as it busts the footer menu. Yep troggle has a footer menu!! Sam Wenham 2019-03-09 19:32:00 +00:00
• 8932bdc466 Remove jquery.min.js from troggle as it busts the footer menu. Yep troggle has a footer menu!! Sam Wenham 2019-03-09 19:32:00 +00:00
• c3ab5c6096 Fix person chronology to get the date from te logbook entry Sam Wenham 2019-03-09 18:43:58 +00:00
• 9fa93fdd15 Fix person chronology to get the date from te logbook entry Sam Wenham 2019-03-09 18:43:58 +00:00
• 7a7433bc84 Fix people list Cope with Jimmy McFoo as a name! Don't set the top expo value in the code whin it is piss easy to calculate Fix typo from last commit Sam Wenham 2019-03-09 18:21:10 +00:00
• b4296f1736 Fix people list Cope with Jimmy McFoo as a name! Don't set the top expo value in the code whin it is piss easy to calculate Fix typo from last commit Sam Wenham 2019-03-09 18:21:10 +00:00
• ff8c5ef0c1 There is no point having two functions do basicaly the same thing so make the load all logbooks call load logbook(expo) Remove the return message from load logbook as it isn't used Sam Wenham 2019-03-09 11:18:44 +00:00
• 1bac650aee There is no point having two functions do basicaly the same thing so make the load all logbooks call load logbook(expo) Remove the return message from load logbook as it isn't used Sam Wenham 2019-03-09 11:18:44 +00:00
• a22b42e832 Make the logbook parser a little more sane Move the parser to expo mapping to settings Set a default parser Iterate over the expo years rather than the mapping list! Sam Wenham 2019-03-06 23:20:34 +00:00
• 9fc80bed35 Make the logbook parser a little more sane Move the parser to expo mapping to settings Set a default parser Iterate over the expo years rather than the mapping list! Sam Wenham 2019-03-06 23:20:34 +00:00