Philip Sargent
44caf35fd8
typo
2020-02-20 14:15:28 +00:00
Philip Sargent
c5055e7f34
backport order of operations in reset() and change logbook parser to do paragraphs differently
2020-02-20 14:13:38 +00:00
Philip Sargent
de14ecea22
Fixing back mistaken chnage
2020-02-20 01:42:52 +00:00
Philip Sargent
f5174a3248
typo
2020-02-19 22:52:00 +00:00
Philip Sargent
f0889ce0f8
typos fix and more description
2020-02-19 22:51:07 +00:00
Philip Sargent
b6dc711c14
making in-code documentation strings match what actually happens
2020-02-19 22:14:00 +00:00
Philip Sargent
04fb2e8701
DOCTYPE update for template for generated files
2020-02-19 21:48:37 +00:00
Philip Sargent
c1439bed8d
Adding <pre> and </pre> to the logbook entry display so that all the paragraphs are not munged into one when displayed. Untested.
2020-02-19 21:47:13 +00:00
Philip Sargent
a88f326ee6
added year 2019 to logbook parsing
2020-02-17 01:39:00 +00:00
56618dbe65
fix CUCC url in template and add years to 2020
2019-12-23 19:40:44 +00:00
Expo on server
71ef710d09
Fix the location of the cave view javascript
2019-12-08 10:53:43 +00:00
Sam Wenham
c74852b60b
Merge branch 'master' of ssh://expo.survex.com/~/troggle
...
# Conflicts:
# README.txt
2019-07-29 11:36:24 +01:00
Sam Wenham
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
2019-07-11 12:29:38 +01:00
Sam Wenham
6b5b9a5315
Merge branch 'master' of ssh://expo.survex.com/~/troggle
2019-07-10 12:37:38 +01:00
Sam Wenham
4ebf3d8a0e
Bring back TinyMCE for editing flatpages
2019-07-10 12:32:04 +01:00
37d02b298d
added ssh git clone command variant
2019-07-09 15:55:27 +01:00
Sam Wenham
d6053322e8
Merge branch 'master' of ssh://expo.survex.com/~/troggle
2019-07-09 10:41:21 +01:00
Expo on server
5b5f385b67
Remove .hgignore Change mode on modelvis.py
2019-07-09 05:23:37 +01:00
Sam Wenham
04428c45c9
Fix description of localsettingsdocker
2019-07-09 05:23:30 +01:00
a7f605ced9
changes because we do not use svn anymore
...
Signed-off-by: psargent <philip.sargent@gmail.com>
2019-07-09 05:23:22 +01:00
Expo on server
0adb8e528d
Add .gitignore file
2019-07-09 05:23:14 +01:00
Expo on server
f4280f9907
Add info to debian instructions on creating troggle logfile (in /var/log)
2019-07-09 05:22:49 +01:00
2d7892e3b1
Merge remote-tracking branch 'troggle/master'
2019-07-02 19:04:13 +01:00
Sam Wenham
8edeb2f622
Merge branch 'master' of ssh://expo.survex.com/~/troggle
2019-07-02 18:15:13 +01:00
Expo on server
d157a081b1
Remove .hgignore
...
Change mode on modelvis.py
2019-07-02 18:14:19 +01:00
Sam Wenham
fcc57cf365
Fix description of localsettingsdocker
2019-07-02 17:52:40 +01:00
12c8ab41bf
changes because we do not use svn anymore
...
Signed-off-by: psargent <philip.sargent@gmail.com>
2019-06-27 01:24:38 +01:00
Expo on server
9266e5460e
Add .gitignore file
2019-06-27 00:23:22 +01:00
Expo on server
ad45859071
Add info to debian instructions on creating troggle logfile (in /var/log)
2019-06-27 00:14:39 +01:00
expo on server
ee759980c4
remove hack in logbook parsing to convert ol to olly and wook to wookey.
...
It broke 'Olaf' as a name, for example.
2019-06-26 21:46:57 +01:00
expo on server
18b371bc15
remove hack in logbook parsing to convert ol to olly and wook to wookey.
...
It broke 'Olaf' as a name, for example.
2019-06-26 21:46:57 +01:00
expo on server
9e77b8bb75
Add server setup instructions/recipie for Debian Stretch
2019-06-26 21:45:17 +01:00
expo on server
e6acd4bdbd
Add server setup instructions/recipie for Debian Stretch
2019-06-26 21:45:17 +01:00
Sam Wenham
424219fb6f
Just commit the logbook parser this time (can we move to git now!!!)
2019-06-26 21:21:37 +01:00
Sam Wenham
2ebb37552f
Just commit the logbook parser this time (can we move to git now!!!)
2019-06-26 21:21:37 +01:00
Sam Wenham
822359fe51
Backed out changeset: 4552f42bdf54
2019-06-26 20:57:24 +01:00
Sam Wenham
97426a0ddb
Backed out changeset: 4552f42bdf54
2019-06-26 20:57:24 +01:00
Sam Wenham
3f78382d45
Remove this stupid hard coded name match
2019-06-26 20:56:08 +01:00
Sam Wenham
8a1be45aac
Remove this stupid hard coded name match
2019-06-26 20:56:08 +01:00
Sam Wenham
b5cca8be3b
Merge
2019-06-26 18:43:42 +01:00
Sam Wenham
4d2f9a2b39
Merge
2019-06-26 18:43:42 +01:00
Sam Wenham
8fe02e5c89
Allow html chars in names
2019-06-26 18:36:08 +01:00
Sam Wenham
b2dd905f0e
Allow html chars in names
2019-06-26 18:36:08 +01:00
expo on server
c06d372984
Add expo.survex.com to ALLOWED_HOSTS in troggle settings
2019-06-26 15:23:20 +01:00
expo on server
7a9aef6faf
Add expo.survex.com to ALLOWED_HOSTS in troggle settings
2019-06-26 15:23:20 +01:00
expo on server
6889ae9fa3
Add SURVEX_TOPNAME (top-level survex file) as a setting item in settings.py so it's not hardcoded.
2019-06-26 03:32:18 +01:00
expo on server
02d3cc84d5
Add SURVEX_TOPNAME (top-level survex file) as a setting item in settings.py so it's not hardcoded.
2019-06-26 03:32:18 +01:00
Sam Wenham
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!
2019-04-19 22:52:54 +01:00
Sam Wenham
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!
2019-04-19 22:52:54 +01:00
Sam Wenham
2f9870644b
missed objects
2019-04-18 19:27:23 +01:00
