Commit Graph

1226 Commits

Author SHA1 Message Date
9aa91bf3e2 remove EMAIL_HOST global name 2020-03-09 16:48:51 +00:00
867479e05d Fixing my earlier mistake these are xml not html 2020-03-02 17:08:49 +00:00
bb1f69dd90 stuff generated on server 2020-02-29 12:08:22 +00:00
d219f7b966 another missing code 2020-02-27 01:35:12 +00:00
3f812e5275 comment out missing code 2020-02-27 01:33:19 +00:00
cdef395f89 New troggle report on defined directory paths 2020-02-27 00:58:09 +00:00
Philip Sargent
66f6a9ce90 Troggle on Windows 10 using WSL 2020-02-25 14:31:52 +00:00
Philip Sargent
b07c888c7a debug for crashing tunnel import 2020-02-25 14:22:50 +00:00
Philip Sargent
d170a3c36e add shortcut for logbooks & note explaining notability metric 2020-02-24 21:49:01 +00:00
429c21a8e9 installing on WSL ubuntu on Windows 10 2020-02-22 00:04:41 +00:00
Philip Sargent
8c10908353 Revert "Merge branch 'RW_rebuild' of ssh://expo@expo.survex.com/home/expo/troggle"
This reverts commit e0963a1c39.
2020-02-21 16:31:54 +00:00
Philip Sargent
e0963a1c39 Merge branch 'RW_rebuild' of ssh://expo@expo.survex.com/home/expo/troggle
# Conflicts:
#	core/models_millenial.py
#	core/views_caves.py
#	databaseResetM.py
#	parsers/cavesM.py
#	urls.py
2020-02-21 16:27:34 +00:00
Sam Wenham
e77aa9fb84 Changes needed to stop the survex parser having to go through the data twice
Taken from the Django 1.10 upgrade branch
2020-02-21 15:57:07 +00:00
Philip Sargent
f5fe2d9e33 typo 2020-02-21 14:00:33 +00:00
Philip Sargent
5006342b7b forgot a bit 2020-02-21 13:59:14 +00:00
Philip Sargent
3ce8b67b4f added rebuild command option 2020-02-21 13:57:04 +00:00
Sam Wenham
52cec290d9 We don't want troggle trying to write out the files 2020-02-20 18:42:31 +00:00
Philip Sargent
a559151c57 Merge remote-tracking branch 'origin/master' 2020-02-20 15:29:30 +00:00
Philip Sargent
2fc60f9f74 Fixing logbooks with parse errors 2020-02-20 15:26:33 +00:00
Wookey
3b1fcb7feb Merge branch 'master' of ssh://expo.survex.com/~/troggle 2020-02-20 15:02:14 +00:00
Wookey
2838f540d1 Minor text and whitespace fixes 2020-02-20 15:01:50 +00:00
Wookey
f5ec5a61a9 Move survex parsing later in the process as it tends to run out of memory 2020-02-20 14:57:37 +00:00
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