summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Just removing dud whitespacedjango-1.10Sam Wenham2020-02-2424-365/+365
|
* Merge branch 'django-1.10' of ssh://expo.survex.com/~/troggle into django-1.10Sam Wenham2020-02-2215-107/+651
|\
| * Whitespace cleanupSam Wenham2020-02-215-35/+32
| |
| * Remove dud settingsSam Wenham2020-02-215-43/+14
| | | | | | | | allow any site for dev
| * Get media working (at least in development)Sam Wenham2020-02-212-28/+29
| |
| * Add django migrations. These are needed on newer django installs to maintain ↵Sam Wenham2020-02-203-2/+577
| | | | | | | | the database
* | Show coordinates for entranceSam Wenham2020-02-225-12/+22
|/ | | | Use filter to find coordinates
* Improve READMESam Wenham2019-07-1913-112/+179
| | | | Make new style QMs from survexfiles work
* Part one of getting troggle to work with django 1.10Sam Wenham2019-07-1638-919/+451
| | | | Major rework of how survex is processed
* 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
| | |
| | * Ooops shouldn't of commited the DateTime change, yet...Sam Wenham2019-03-311-1/+1
| | |
| | * Support html and wiki logbook entrysSam Wenham2019-03-318-73/+73
| | | | | | | | | | | | | | | | | | Move nearest_station to nearest_station_name and make nearest_station a foreign key to SurvexStation Lots of tidying
| | * Remove the redundant render_with_context() as django now does this just with theSam Wenham2019-03-3012-93/+78
| | | | | | | | | | | | | | | render() shortcut Move from mimetype to content_type, missed in last commit
| | * Update new management command for DB resetSam Wenham2019-03-306-86/+85
| | | | | | | | | | | | | | | | | | Switch to content_type from mimetype Make DB reset not nuke so much Tidy logbook parser
| * | folk.csv has moved into 'folk' dir out of 'noinfo'Wookey2019-04-022-2/+2
| |/
| * Only show unofficial number if it's not already displayedWookey2019-03-271-3/+4
| |
| * Add reload_db option to databaseReset.pyexpoonserver2019-03-261-0/+2
| |
| * Display temporary numbers on main cave index, when they exist.expoonserver2019-03-261-1/+1
| |
| * Remove the news section as it never gets updatedSam Wenham2019-03-103-28/+37
| | | | | | | | | | Fix logbook entry so the edit link works Tidy the control panel page
| * Remove jquery.min.js from troggle as it busts the footer menu. Yep troggle ↵Sam Wenham2019-03-091-1/+1
| | | | | | | | has a footer menu!!
| * Fix person chronology to get the date from te logbook entrySam Wenham2019-03-091-2/+1
| |
| * Fix people listSam Wenham2019-03-095-6/+11
| | | | | | | | | | | | 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
| * There is no point having two functions do basicaly the same thing so make theSam Wenham2019-03-093-42/+5
| | | | | | | | | | load all logbooks call load logbook(expo) Remove the return message from load logbook as it isn't used