summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Changes needed to stop the survex parser having to go through the data twiceFaster-survex-parserSam Wenham2020-02-213-79/+186
| | | | Taken from the Django 1.10 upgrade branch
* typoPhilip Sargent2020-02-211-1/+2
|
* forgot a bitPhilip Sargent2020-02-211-1/+2
|
* added rebuild command optionPhilip Sargent2020-02-211-0/+10
|
* We don't want troggle trying to write out the filesSam Wenham2020-02-201-9/+0
|
* Merge remote-tracking branch 'origin/master'Philip Sargent2020-02-201-7/+3
|\
| * Merge branch 'master' of ssh://expo.survex.com/~/troggleWookey2020-02-201-2/+2
| |\
| * | Minor text and whitespace fixesWookey2020-02-201-7/+3
| | |
| * | Move survex parsing later in the process as it tends to run out of memoryWookey2020-02-201-1/+1
| | |
* | | Fixing logbooks with parse errorsPhilip Sargent2020-02-202-3/+3
| |/ |/|
* | typoPhilip Sargent2020-02-201-1/+1
| |
* | backport order of operations in reset() and change logbook parser to do ↵Philip Sargent2020-02-202-3/+3
|/ | | | paragraphs differently
* Fixing back mistaken chnagePhilip Sargent2020-02-201-2/+2
|
* typoPhilip Sargent2020-02-191-5/+5
|
* typos fix and more descriptionPhilip Sargent2020-02-191-5/+4
|
* making in-code documentation strings match what actually happensPhilip Sargent2020-02-191-5/+8
|
* DOCTYPE update for template for generated filesPhilip Sargent2020-02-192-2/+2
|
* Adding <pre> and </pre> to the logbook entry display so that all the ↵Philip Sargent2020-02-191-2/+3
| | | | paragraphs are not munged into one when displayed. Untested.
* added year 2019 to logbook parsingPhilip Sargent2020-02-171-0/+1
|
* fix CUCC url in template and add years to 2020Philip Sargent (git for windows)2019-12-231-4/+6
|
* Fix the location of the cave view javascriptExpo on server2019-12-081-2/+2
|
* Merge branch 'master' of ssh://expo.survex.com/~/troggleSam Wenham2019-07-297-14/+28
|\ | | | | | | | | # Conflicts: # README.txt
| * Allow comments against names in logbooks in bracketsSam Wenham2019-07-112-6/+13
| | | | | | | | Convert accent chars in names into simple chars as this is what people enter in the logbook
| * Merge branch 'master' of ssh://expo.survex.com/~/troggleSam Wenham2019-07-101-0/+2
| |\
| | * added ssh git clone command variantPhilipSargent2019-07-091-0/+2
| | |
| * | Bring back TinyMCE for editing flatpagesSam Wenham2019-07-104-8/+13
| |/
| * Merge branch 'master' of ssh://expo.survex.com/~/troggleSam Wenham2019-07-092-5/+5
| |\
| | * Remove .hgignore Change mode on modelvis.pyExpo on server2019-07-092-16/+0
| | |
| | * Fix description of localsettingsdockerSam Wenham2019-07-091-1/+1
| | |
| | * changes because we do not use svn anymorepsargent2019-07-091-4/+4
| | | | | | | | | | | | Signed-off-by: psargent <philip.sargent@gmail.com>
| | * Add .gitignore fileExpo on server2019-07-091-0/+16
| | |
| | * Add info to debian instructions on creating troggle logfile (in /var/log)Expo on server2019-07-091-0/+5
| | |
| | * remove hack in logbook parsing to convert ol to olly and wook to wookey.expo on server2019-06-261-0/+80
| | |\ | | | | | | | | | | | | It broke 'Olaf' as a name, for example.
| | | * Add server setup instructions/recipie for Debian Stretchexpo on server2019-06-261-0/+80
| | | |
| | * | Just commit the logbook parser this time (can we move to git now!!!)Sam Wenham2019-06-261-2/+2
| | | |
| | * | Backed out changeset: 4552f42bdf54Sam Wenham2019-06-2610-331/+201
| | | |
| | * | Remove this stupid hard coded name matchSam Wenham2019-06-2610-201/+331
| | |/
| | * MergeSam Wenham2019-06-263-3/+3
| | |\
| | | * Allow html chars in namesSam Wenham2019-06-263-3/+3
| | | |
| | * | Add expo.survex.com to ALLOWED_HOSTS in troggle settingsexpo on server2019-06-261-1/+1
| | | |
| | * | Add SURVEX_TOPNAME (top-level survex file) as a setting item in settings.py ↵expo on server2019-06-263-5/+8
| | |/ | | | | | | | | | so it's not hardcoded.
| | * Updating caves and entrances is no longer nuclear!Sam Wenham2019-04-195-34/+55
| | | | | | | | | | | | | | | | | | | | | | | | 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!
| | * missed objectsSam Wenham2019-04-181-1/+1
| | |
| | * Clear data issues for logbooks before reloadingSam Wenham2019-04-181-2/+6
| | |
| | * Add ordering to the data issues modelSam Wenham2019-04-181-0/+3
| | |
| | * Fix CSRF issues in svx formSam Wenham2019-04-148-15/+37
| | | | | | | | | | | | | | | | | | Set date formats Add DataIssue model and add errors to it to allow us to give people a list of stuff to fix
| | * Sort people by notabilitySam Wenham2019-04-025-9/+6
| | | | | | | | | | | | | | | Better errors and tidy Nicer date formats
| | * Merge lots of troggle fixesWookey2019-04-0224-255/+239
| | |\
| | | * Move cave and entrance data out of 'noinfo'expoonserver2019-04-011-2/+2
| | | |
| | | * Better error messagesSam Wenham2019-03-311-2/+2
| | | |