expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-28 18:11:52 +00:00
Code Issues 19 Projects 3 Activity
2,839 Commits 7 Branches 0 Tags 34 MiB
5fff060487
Commit Graph

1128 Commits

Author SHA1 Message Date
Philip Sargent
1468c49723 remove unused SCANS_URL 2022-07-27 23:24:52 +03:00
Philip Sargent
c39fb30707 new urls and dummy functions and rename 2022-07-27 23:24:51 +03:00
Martin Green
91568b7151 Allow HTML to be blank and determine the new files need git commiting. 2022-07-26 17:09:15 +01:00
Philip Sargent
039792e320 improve reifying process 2022-07-25 15:03:58 +03:00
Philip Sargent
f9a7ba7927 alias as separate error type 2022-07-25 04:17:06 +03:00
Philip Sargent
3577d8cb68 big rewrite of cave alias lookup system 2022-07-25 02:58:13 +03:00
Philip Sargent
9c090f0383 test now matches model schema 2022-07-25 02:57:31 +03:00
Philip Sargent
de7388bdc5 GetCave:Lookup neeeds work 2022-07-24 21:38:14 +03:00
Philip Sargent
5007393536 better error handling 2022-07-23 20:05:58 +03:00
Philip Sargent
3b1b96c4c8 EXTEND MESSAGE FILED. cRASHES mARIAdb 2022-07-22 13:41:28 +03:00
Philip Sargent
31b912f3ca bugfixes 2022-07-22 12:40:42 +03:00
Philip Sargent
796dbf1438 more dead chicken waving 2022-07-21 21:52:10 +03:00
Philip Sargent
312ecdcfe1 need to see exception with all the renaming going on 2022-07-21 19:51:04 +03:00
Philip Sargent
f895a7e44c wallets now sorted as well as deduplicated 2022-07-21 11:10:04 +03:00
Philip Sargent
5161fce32e remove duplicate lines, add heading link 2022-07-21 10:50:15 +03:00
Philip Sargent
8245ee103e wallets for just one cave 2022-07-21 10:32:11 +03:00
Philip Sargent
3e869ae76a fix variables needed for error message 2022-07-21 09:40:35 +03:00
Philip Sargent
dd0a448f90 fix 3d file download on cave page 2022-07-21 01:22:07 +03:00
Philip Sargent
83bbda7c40 bugfix 2022-07-21 00:07:52 +03:00
Philip Sargent
0a158db97d Trial QM tick mechanism in survex files 2022-07-20 20:47:29 +03:00
Philip Sargent
a215ebd62c fix QM regex for number and rearrange url code 2022-07-20 17:02:38 +03:00
Philip Sargent
549c1649b4 QMs now have working url to survexfile & tick description 2022-07-20 14:44:56 +03:00
Philip Sargent
2a7f1506c9 track down url resoution error 2022-07-20 10:08:23 +03:00
Philip Sargent
9a395eafef aise exception in cave descriptionb rendering 2022-07-20 10:04:00 +03:00
Philip Sargent
6883ff49a0 Add fields to QM model 2022-07-19 20:54:28 +03:00
Philip Sargent
b79eb9a969 better error msg 2022-07-19 19:18:42 +03:00
Philip Sargent
23462df49c bugfix 2022-07-19 19:06:56 +03:00
Philip Sargent
6ec7071ffc Fix display of expoyear 2022-07-18 19:19:06 +03:00
Philip Sargent
4efeefe6c9 git commit when editing survex files online 2022-07-18 18:42:21 +03:00
Philip Sargent
5b7c105c5f missed a bit of refactoring 2022-07-18 18:06:23 +03:00
Philip Sargent
dd00ff69aa refactor to put Martins git stuff in utils 2022-07-18 17:37:22 +03:00
Philip Sargent
ee9b808461 moved writetrogglefile() to core.utils 2022-07-18 16:57:13 +03:00
Philip Sargent
deec330990 test for loser git repo sanity 2022-07-18 15:46:57 +03:00
Philip Sargent
6efbec7750 Date and People checks 2022-07-17 15:41:05 +03:00
Philip Sargent
037a50cf47 read 1623/264 as 1623-264 etc 2022-07-17 15:28:20 +03:00
Philip Sargent
bb65ffaee6 bugfix 2022-07-17 15:22:26 +03:00
Philip Sargent
b20e6c5a58 Complaints now on wallet page 2022-07-17 15:01:53 +03:00
Martin Green
3748840e23 Removed extranious characters where there is one unnnumbered entrance. 2022-07-15 14:05:48 +01:00
Philip Sargent
86a18c3ebc catch nonUTF8 survex files, DataIssues url editor 2022-07-15 14:09:32 +03:00
Martin Green
5582d545a1 Allow QMS to be rendered to a string, if the case that an optional parameter is missing 2022-07-11 23:29:59 +01:00
Martin Green
c416de6e1e Allow user to see a caves edit link even if the user is not logged in. Such that they can be prompted to log in if required. 2022-07-11 21:12:53 +01:00
Philip Sargent
a4b1c7b142 remove getqms 2022-07-08 22:20:29 +03:00
Philip Sargent
d3572e18c3 QM reports all working 2022-07-06 17:35:08 +03:00
Philip Sargent
7dc3cc3b91 fix for individual QM display from survex 2022-07-06 15:38:53 +03:00
Philip Sargent
0ea3ed1ef2 Not quite so broken QMs from survex files 2022-07-05 22:40:58 +03:00
Philip Sargent
2bd617b543 Fixed QM report for survex-imported QMs 2022-07-05 20:24:51 +03:00
Philip Sargent
9d4a97fc19 Tidy HTML output 2022-07-05 17:02:43 +03:00
Philip Sargent
5d7d2b82b2 Fixing non-null error, even though it should be allowed 2022-07-05 15:57:49 +03:00
Philip Sargent
779afc2f2a QM report pages now not crashing, working.. 2022-07-05 15:38:23 +03:00
Philip Sargent
a11541eb58 prefetch_related initial attempts 2022-07-05 14:14:03 +03:00
Martin Green
dbe6d10fff Revert "Added some test pages showing different ways pages could be edited. This probably wants removing soon" 
This reverts commit 2af88353f3.
 2022-06-28 00:24:57 +01:00
Martin Green
2af88353f3 Added some test pages showing different ways pages could be edited. This probably wants removing soon 2022-06-28 00:18:24 +01:00
Martin Green
82fe350493 Added HTMLarea widget to the edit entrance form 2022-06-27 00:34:08 +01:00
Martin Green
47d1662033 Added help writing HTML in the cave editing form. Made the HTML previews optional 2022-06-26 21:29:46 +01:00
Martin Green
4e5d8d1d76 Refactored code, with an aim of allowing more than one HTMLarea on a page 2022-06-26 18:29:20 +01:00
Martin Green
f1fcef2a6f Refactorising CodeMirror HTML editor, with an ultimate aim to make it reusable. However more work if required... 2022-06-26 14:16:42 +01:00
Martin Green
8f0ea8ed82 Fix for adding images whilst editing, for where the t directory does not exist and at the root directory of expoweb 2022-06-26 11:20:14 +01:00
Martin Green
5fbe0b31c2 Require a login if public and check for CSRF cookies for uploading images 2022-06-26 01:15:00 +01:00
Martin Green
24a016e76a Fixed spelling of a variable name 2022-06-25 23:36:53 +01:00
Martin Green
20583b04c0 Allowed user to select/upload images when editing. When uploaded thumbnails and description pages are automatically created. Git commiting can now handle multiple files at once. 2022-06-25 23:17:19 +01:00
Martin Green
b3d9e81499 Implement redirects after login (using the next parameter) 2022-06-25 16:13:02 +01:00
Martin Green
74a5125cf9 Allow for PosixPaths to work with GetListDir 2022-06-25 16:08:19 +01:00
Martin Green
d607b30953 Do not allow for the main menu to be overriden, instead display old menu at bottom of page. To do this the id of the main menu was changed from links to menulinks 2022-06-25 01:07:17 +01:00
Martin Green
abdea22899 Allow for slightly different wording in git output 2022-06-25 01:05:29 +01:00
Martin Green
5ac2e24cc2 Removed jQuery 2022-06-24 21:58:00 +01:00
Martin Green
7db7c67065 Added link to parent cave in menu 2022-06-24 19:28:31 +01:00
Martin Green
ceb6d2fef1 Added a sub menu when in the handbook directory. Imcreased width of edit preview 2022-06-24 15:48:35 +01:00
Martin Green
b38412b145 Added come mirror for the edit page, including some buttons to make html 2022-06-24 14:39:09 +01:00
Martin Green
ef68db080a Add git commit messages when editing via website. Make sure cust menus are not deleted. 2022-06-23 21:31:57 +01:00
Martin Green
97a9f2aae6 The editing system was accidentally deleting customised sidebar menus. This will stop the happening 2022-06-23 20:03:05 +01:00
Martin Green
2f42f488ab Merge branch 'python3-new' of ssh://expo.survex.com/home/expo/troggle into python3-new 2022-06-23 19:02:10 +01:00
Martin Green
f1e800d8bf Move saving and comitting code to a seperate library 2022-06-23 18:48:29 +01:00
Philip Sargent
16c6aed65f Fix missing images 2022-06-23 19:18:21 +03:00
Philip Sargent
77cf3455a6 Intercept NoReverseMatch eceptions more helpfully 2022-06-23 19:01:57 +03:00
Philip Sargent
4fa8d18621 utf8 encoding checks when reading files in the view 2022-06-23 19:01:25 +03:00
Philip Sargent
7b0d90182b Added utf8 test to test suite 2022-06-23 16:03:50 +03:00
Martin Green
4d8125a2fd removed rest of endocings 2022-06-22 09:10:56 +01:00
Martin Green
ea880915b0 Removed encoding of file paths as encoding now correct 2022-06-22 09:08:01 +01:00
Martin Green
836387057a Now the servers locale is utf8, try opening files spectifying path using a text string 2022-06-22 08:52:04 +01:00
Martin Green
f0a9c33795 bug fix to previous test 2022-06-21 22:45:11 +01:00
Martin Green
843bfa8ba6 test to find out locale set in the WSGI enivroment 2022-06-21 22:43:06 +01:00
Martin Green
654f8e8c6c bug fix to prev commit 2022-06-20 22:12:00 +01:00
Martin Green
c6272e4103 Refactorise saving code. Do not save and git change if there are no changes 2022-06-20 22:09:10 +01:00
Martin Green
3420422f29 bug fix to setting encoding 2022-06-20 21:38:46 +01:00
Martin Green
a664e8ce8c Made it such that opening files for reading and writing when editing to use utf8 encoding 2022-06-20 21:35:51 +01:00
Martin Green
491fba7d64 test 2022-06-19 01:57:08 +01:00
Martin Green
3d35cf713f test 2022-06-19 01:56:28 +01:00
Martin Green
b75a91ed70 test 2022-06-19 01:55:01 +01:00
Martin Green
02a3d6a359 test 2022-06-19 01:53:13 +01:00
Martin Green
8372d9d85c test 2022-06-19 01:52:09 +01:00
Martin Green
945373df67 test 2022-06-19 01:50:05 +01:00
Martin Green
26e952154e test 2022-06-19 01:44:57 +01:00
Martin Green
e33ce724c0 test 2022-06-19 01:41:48 +01:00
Martin Green
86b24c9dfe test 2022-06-19 01:39:30 +01:00
Martin Green
3465e9bd16 test 2022-06-19 01:37:51 +01:00
Martin Green
c9d7931ccb test 2022-06-19 01:35:32 +01:00
Martin Green
aad6b70736 test 2022-06-19 01:33:08 +01:00
Martin Green
d560b17ab6 test 2022-06-19 01:16:53 +01:00
Martin Green
18dbb847e3 test 2022-06-19 01:12:49 +01:00
Martin Green
84693b6524 test 2022-06-19 01:04:47 +01:00
Martin Green
5ac6bfd49a test 2022-06-19 01:03:45 +01:00
Martin Green
5666f1e9a7 test 2022-06-19 01:02:41 +01:00
Martin Green
b39a57786d test 2022-06-19 00:59:54 +01:00
Martin Green
4fe306d35f test 2022-06-19 00:57:04 +01:00
Martin Green
60b2e5e8c7 utf8 edit pages 2022-06-19 00:54:50 +01:00
Martin Green
d9cfbc19ed test 2022-06-19 00:32:25 +01:00
Martin Green
372c7e0804 test 2022-06-19 00:27:10 +01:00
Martin Green
5f34a78d94 test 2022-06-19 00:25:48 +01:00
Martin Green
f0cfed2ef6 Future proof for filesystem encoding changing in the future 2022-06-18 23:43:21 +01:00
Martin Green
59a45871fd utf debugging 2022-06-18 23:37:37 +01:00
Martin Green
328347f8af debugging 2022-06-18 23:26:37 +01:00
Martin Green
845e70465e bug fix 2022-06-18 23:24:21 +01:00
Martin Green
6bcf70bb8b refactorisation to make debugging easier 2022-06-18 23:13:40 +01:00
Martin Green
41dfe08d2a try coverting path from utf8 2022-06-18 22:48:30 +01:00
Martin Green
38d23fd76b Attempting to fix utf8 urls by not type converting to string 2022-06-18 22:41:00 +01:00
Philip Sargent
f0634ff164 specify default encoding explicitly 2022-04-28 00:30:43 +03:00
Philip Sargent
322d454d41 revert 2022-04-27 23:43:15 +03:00
Philip Sargent
cafde67c02 ISO-8859-1 fallback 1 2022-04-27 23:25:37 +03:00
Philip Sargent
362aedc2ac back to how it was 2022-04-27 23:07:02 +03:00
Philip Sargent
b3b10b0db7 ugh 2022-04-27 23:00:42 +03:00
Philip Sargent
3528587890 raise exception on live system 2022-04-27 22:58:43 +03:00
Philip Sargent
3bd308effa more superficial fixings 2022-04-27 22:35:20 +03:00
Philip Sargent
fbffbf0909 hack to make borken file less unreadable 2022-04-27 22:29:50 +03:00
Philip Sargent
f05e885517 workaround security update on distsortreversed 
Due to Django security update CVE-2021-45116 which removed the capability of resolving a method in a template when called dictsortreversed
 2022-04-23 22:42:46 +03:00
Philip Sargent
9ead6b00f9 warning text for broken table in page, pending fix 2022-04-20 23:18:05 +03:00
Philip Sargent
00eb978f5f fixed test broken by recent update 2022-04-20 21:22:38 +03:00
Philip Sargent
c9931fd45e survey legs calc fixed 2022-04-18 23:33:04 +03:00
Philip Sargent
3813b21dcf regularising _URL and _ROOT idiom 2022-04-18 22:48:49 +03:00
Philip Sargent
d29f3030a4 remove redundant and old setting 2022-04-12 21:05:28 +03:00
Philip Sargent
5a64d9d3d0 test checks that localsettings is not out of step with code too 2022-04-07 01:20:44 +03:00
Philip Sargent
ed71fa48f1 cleaning unused settings 2022-04-06 21:01:31 +03:00
Philip Sargent
18c2892967 Make more robust to WSL chmod failures for tests 2022-04-06 20:43:26 +03:00
Philip Sargent
71ed0815cc Revert "update oddity with VS Code and WSL2" 
This reverts commit 41b2bcee4f.

CR LF != LF issue
 2022-04-05 10:38:52 +03:00
Philip Sargent
41b2bcee4f update oddity with VS Code and WSL2 2022-04-02 00:03:53 +03:00
Philip Sargent
1f3f60a6a3 Now easier to fix by hand 2022-03-31 00:21:42 +01:00
Philip Sargent
a9ef96f84e whackety whack 2022-03-31 00:07:47 +01:00
Philip Sargent
3390a62020 whack, whack.. 2022-03-31 00:06:54 +01:00
Philip Sargent
9461eed380 mole whacking 2022-03-30 23:56:40 +01:00
Philip Sargent
aeb210bd30 typo 2022-03-30 23:54:38 +01:00
Philip Sargent
d7246cbb98 UTF-8 failure thing 2022-03-30 23:53:57 +01:00
Philip Sargent
785500241e better debug 2022-03-30 21:29:52 +01:00
Philip Sargent
7f16bca7f7 Better error messaged and url 2022-03-29 15:31:25 +01:00
Philip Sargent
efeb0efd1e umlauts and edit this page 2022-03-25 02:05:10 +00:00
Philip Sargent
406259a8a2 make 1999 work like other years 2022-03-25 02:04:44 +00:00
Philip Sargent
7fd9497d5c bugfix 2022-03-24 21:20:53 +00:00
Philip Sargent
3617f9b6d9 bugfix and docum 2022-03-24 20:59:36 +00:00
Philip Sargent
1589188988 enable wallet view even if not logged in 2022-03-24 20:45:15 +00:00
Philip Sargent
4c7deadb9a documenting fossils 2022-03-23 22:55:43 +00:00
Philip Sargent
f1b206ad34 fixing bugs after wookey session 2022-03-22 02:22:15 +00:00
Philip Sargent
6a18511dd0 Fixing URLs for cave descriptions 2022-03-18 20:00:15 +00:00
Philip Sargent
6f32364675 fixed get_absolute_url error 2022-03-18 14:18:16 +00:00
Philip Sargent
3b997a32bf bugfix if no svx file 2022-03-18 12:55:08 +00:00
Philip Sargent
8b889ade5f Fix scanned walletindex pages 2022-03-18 12:26:32 +00:00
Philip Sargent
af7fc8f243 use new upload page for most wallets 2022-03-18 11:28:35 +00:00
Philip Sargent
19d017a457 Edit contents.json online 2022-03-17 00:41:29 +00:00
Philip Sargent
e34f162688 Test photo upload 2022-03-16 12:43:39 +00:00
Philip Sargent
d3ddcba313 bug fixes 2022-03-15 23:00:23 +00:00
Philip Sargent
251e3bf844 Bug fixes 2022-03-15 20:53:55 +00:00
Philip Sargent
6bdd9be092 contnets.json now visible on form 2022-03-15 19:15:45 +00:00
Philip Sargent
3390f51049 Form creates wallet folder and contents.json 2022-03-15 17:04:43 +00:00
Philip Sargent
fac748d2e2 Better table titles 2022-03-13 23:48:22 +00:00
Philip Sargent
b65639df05 Upload form for Photos 2022-03-13 01:01:00 +00:00
Philip Sargent
f99ebf84e9 running cavern on svx files improved 2022-03-11 16:22:37 +00:00
Philip Sargent
488ce46d73 File upload forms descriptions 2022-03-08 22:59:04 +00:00
Philip Sargent
3ac617431f Make .3d files in same dir as .svx 2022-03-06 01:29:45 +00:00
Philip Sargent
7a58aac08e Drawings uploads git works 2022-03-05 22:16:03 +00:00
Philip Sargent
a3a65524b8 better errors for drawings parsing & upload 2022-03-05 20:29:01 +00:00
Philip Sargent
88f5df0f19 More detailed debug output 2022-03-05 18:02:01 +00:00
Philip Sargent
5fe436e76a Add git status test for 3 repos 2022-03-05 17:42:12 +00:00
Philip Sargent
d7fd6b00ae Detect unwriteable file permissions earlier 2022-03-05 17:05:15 +00:00
Philip Sargent
02d58d440e WORKING both py3.9.10 & 3.8.10 (dj2.2.25) 2022-03-02 23:19:48 +00:00
Philip Sargent
601fc2cffc WORKING Dj2.2.24 & 2.2.25 py3.7 2022-03-02 21:15:24 +00:00
Philip Sargent
8bd20f9600 Prospecting guide disabled - 100s bad URLs 2022-02-28 15:46:19 +00:00
Philip Sargent
6d435ee473 more comments 2022-02-26 23:20:59 +00:00
Philip Sargent
7f542b8936 LIBDIR automatically gets right python version 2022-02-25 18:33:34 +00:00
Philip Sargent
2c13c1b5f3 remove 'testing' from menu template too 2022-02-23 23:04:00 +00:00
Philip Sargent
a87ef54492 remove 'testing' in search field 2022-02-23 22:51:37 +00:00
Philip Sargent
ab8813e389 capture git subprocess errors 2021-12-30 23:27:42 +00:00
Philip Sargent
21ad6ecffb New debug page for subprocess runs 2021-12-30 22:46:34 +00:00
Philip Sargent
b359937eab remove chmod attempt 2021-12-30 21:13:34 +00:00
Philip Sargent
c0545b8777 separate chmod from context 2021-12-30 20:21:47 +00:00
Philip Sargent
4470c5abbd chmod after write 2021-12-30 20:08:24 +00:00
Philip Sargent
c3a54858d5 chmod with context handler 2021-12-30 20:03:34 +00:00
Philip Sargent
0a3037f077 let exceptions bubble up 2021-12-30 19:46:44 +00:00
Philip Sargent
84e165b8fc Move exception handling to calling View 2021-12-30 19:28:33 +00:00
Philip Sargent
5bad82b4f0 bug fix 2021-12-30 19:10:13 +00:00
Philip Sargent
d1e6125d15 add git commit to file saving in 3 places 2021-12-30 19:07:17 +00:00
Philip Sargent
26454bf6c6 first attempt EtP fix for cave pages 2021-12-30 14:15:08 +00:00
Philip Sargent
928c451040 msg that control panel not working 2021-12-30 00:55:42 +00:00
Philip Sargent
02e475642a fix final \n on edited files 2021-12-07 23:46:55 +00:00
Philip Sargent
406b4590a9 fix tests to match new error messages 2021-12-05 21:45:06 +00:00
Philip Sargent
b3aa99f008 Better error msgs for bad slugs 2021-12-05 21:23:06 +00:00
Philip Sargent
bb97b7c862 Catch permissions error. 2021-12-05 17:45:45 +00:00
Philip Sargent
2391b5a504 Django 'command' system docm 2021-11-11 19:34:59 +02:00
Philip Sargent
e61bc7416e to-do list updates 2021-11-07 00:36:44 +02:00
Philip Sargent
73ffb509f7 CaveView status is now documented 2021-11-06 22:59:10 +02:00
Philip Sargent
7575e8c16f fix old comments 2021-10-31 19:42:06 +02:00
Philip Sargent
2869f228d4 fix side effects in tests: git and file upload 2021-10-31 19:25:45 +02:00
Philip Sargent
252fcc4716 git install test and tidying 2021-10-31 18:01:14 +02:00
Philip Sargent
9294c8c2f1 remove unneeded LIBDIR 2021-10-24 19:16:01 +03:00
Philip Sargent (laptop)
9130160bd6 new tests for CAVERN and SURVEXPORT 2021-05-13 23:15:30 +03:00
Philip Sargent (laptop)
6410cc1090 , replace raise with error msg 2021-05-13 21:46:29 +03:00
Philip Sargent
39cd616c90 survexstations also tabulated 2021-05-07 23:46:11 +01:00
Philip Sargent
8c5fdf5021 Entrance locations new report - url to cave 2021-05-07 23:21:57 +01:00
Philip Sargent
1ff723554c Northings and Easting report 2021-05-07 22:42:10 +01:00
Philip Sargent
c6bcb5fde9 wgs84 lat long for entrances 2021-05-07 20:44:58 +01:00
Philip Sargent
4cd7367a7e remove commented out bits 2021-05-07 19:38:26 +01:00
Philip Sargent
d374779c47 dwg upload and django admin extra search 2021-05-05 00:35:10 +01:00
Philip Sargent
44b6770b6a oops. finished update on rename 2021-05-04 21:03:04 +01:00
Philip Sargent
1638f97d0c moved functions between files 2021-05-04 20:57:16 +01:00
Philip Sargent
b3fcd7765e renamed to uploadfiles 2021-05-04 20:56:44 +01:00
Philip Sargent
dc3379c186 fix end slash issue 2021-05-04 15:48:11 +01:00
Philip Sargent
6d341a3cfe removed field from model 2021-05-04 15:43:10 +01:00
Philip Sargent
56c3517328 fixed url ambiguity by rename 2021-05-04 14:16:48 +01:00
Philip Sargent
90bb0759a0 Drawing files upload form 2021-05-04 02:46:56 +01:00
Philip Sargent
9ae2e18fe6 delete redundant logbook dump 2021-05-03 23:45:02 +01:00
Philip Sargent
fd95bb8198 split surveys->scans + drawings 2021-05-03 20:36:29 +01:00
Philip Sargent
9b9f6720e0 not found now does 404 & moved login 2021-05-03 20:35:35 +01:00
Philip Sargent
254b465755 git integration with Save this page 2021-05-03 00:52:51 +01:00
Philip Sargent
5a085ba7ba another todo quote 2021-05-02 22:48:25 +01:00
Philip Sargent
4782f3b184 fixed test mistake & bug in Edit This 2021-05-02 22:47:59 +01:00
Philip Sargent
51da26564f chnage img fix to import, not display 2021-05-02 15:50:20 +01:00
Philip Sargent
a9ffae9b87 Fix images in single logbook entries 2021-05-02 14:50:46 +01:00
Philip Sargent
3393db0fbc Bigger buttons, phone compatible 2021-05-01 18:35:08 +01:00
Philip Sargent
63640db81f remove unused templatetags load 2021-05-01 00:18:13 +01:00
Philip Sargent
03160f3863 Fix upload file test 2021-04-30 23:22:33 +01:00
Philip Sargent
7368942488 remove unused templatetags code 2021-04-30 23:21:38 +01:00
Philip Sargent
9a69ce50f9 remove unused templatetag code 2021-04-30 22:48:53 +01:00
Philip Sargent
b545f8ed40 cleaned & removed defunct wiki_to_html 2021-04-30 22:44:03 +01:00
Philip Sargent
be0148d146 removing cruft, renaming badly named things 2021-04-30 21:32:53 +01:00
Philip Sargent
8f1d6e2cc2 file upload integration test working 2021-04-30 18:02:05 +01:00
Philip Sargent
fde30685a8 bugfix 2021-04-30 03:52:30 +01:00
Philip Sargent
bdf535fcbf Scan Upload working nicely 2021-04-30 03:44:53 +01:00
Philip Sargent
03a5f5989e chipping away bug in personexpedition, remove role 2021-04-30 00:24:36 +01:00
Philip Sargent
e5cf1b5289 download logbook in standard HTML works 2021-04-28 02:43:09 +01:00
Philip Sargent
cb6619a90a buxfixes 2021-04-28 00:50:26 +01:00
Philip Sargent
b9fad1f4fb new path() interacts badly with include(). fixed 2021-04-28 00:48:20 +01:00
Philip Sargent
5e478c7eb0 Imports in control panel work again 2021-04-27 20:44:24 +01:00
Philip Sargent
821aaa1f66 Changing to new path() url function (initial) 2021-04-27 19:02:11 +01:00
Philip Sargent
942cbdd4b2 clean out broken QM bits 2021-04-27 15:38:20 +01:00
Philip Sargent
13f3057185 bugfixes 2021-04-27 14:51:04 +01:00
Philip Sargent
81d58f1275 delete: never implemented properly 2021-04-27 14:50:26 +01:00
Philip Sargent
e236e792ec todo: parsing caves 2021-04-27 00:32:01 +01:00
Philip Sargent
49b9225b6e rename scansfolder to wallet 2021-04-26 19:50:03 +01:00
Philip Sargent
7f64670f36 reanme manyscansfolders to manywallets 2021-04-26 19:22:29 +01:00
Philip Sargent
7dd5840353 reanem tunnelcontains to dwgcontains 2021-04-26 18:54:17 +01:00
Philip Sargent
d43ce1bdb2 rename TUNNEL_DATA as DRAWINGS_DATA 2021-04-26 18:42:10 +01:00
Philip Sargent
bd647b99ec rename tunnelname as dwgname 2021-04-26 18:37:59 +01:00
Philip Sargent
0997fd0901 rename ScansFolder class as Wallet 2021-04-26 18:18:16 +01:00
Philip Sargent
dc840c9bc7 tunnelpath to dwgpath 2021-04-26 18:11:14 +01:00
Philip Sargent
37403a7234 renamed tunnel to drawing or dwg 2021-04-26 18:08:42 +01:00
Philip Sargent
f0d291f527 rename surveyscansfolder(s) to scanwallet(s) 2021-04-26 17:46:23 +01:00
Philip Sargent
b8803c8e5b rename surveyscansingle 2021-04-26 17:40:48 +01:00
Philip Sargent
72fa8a5883 Making entrances work for pending caves 2021-04-26 02:10:45 +01:00
Philip Sargent
a656ada67a Fixing cave edit form and cave creation parser 2021-04-25 04:04:53 +01:00
Philip Sargent
8128870d57 more robust logbooks parsing 2021-04-24 01:23:55 +01:00
Philip Sargent
b979bdb560 slug too long for field 2021-04-23 16:31:52 +01:00
Philip Sargent
b7659a477c Deep fix, nonunique ids in logbookentries fixed 2021-04-23 16:11:50 +01:00
Philip Sargent
343d6cf350 delete old forms, templates. fix logdataissues 2021-04-23 11:43:25 +01:00
Philip Sargent
dbd186e299 make ?reload private and clean old error msgs 2021-04-23 03:07:21 +01:00
Philip Sargent
1a4be0f02e stop file logging from tests 2021-04-23 03:05:22 +01:00
Philip Sargent
8f89b022c7 drawing file upload form working 2021-04-22 02:45:28 +01:00
Philip Sargent
1968db62ad archeology on the logbook entry editing forms 2021-04-21 22:09:20 +01:00
Philip Sargent
bcdb3572fa Add new per-module ToDo texts 2021-04-21 19:08:42 +01:00
Philip Sargent
18938c9fca more attempts to recognise scotsmen 2021-04-20 23:57:51 +01:00
Philip Sargent
8f0e7435d6 renaming 'tunnel' to 'dwg' in urls and views 2021-04-20 23:57:19 +01:00
Philip Sargent
bad5484d12 fix for missing scotsmen 2021-04-20 23:14:10 +01:00
Philip Sargent
b4ba3c40eb catch unknown scotsman error 2021-04-20 22:58:41 +01:00
Philip Sargent
3b0c6ef2ea Better labels for objects in admin console 2021-04-20 19:47:08 +01:00
Philip Sargent
e17a21defd Tests work on cave, person, expedition pages 2021-04-18 01:58:24 +01:00
Philip Sargent
eea74406c9 fix template bug for newentrance 2021-04-17 23:59:11 +01:00
Philip Sargent
25b8fc2e1d test suite with users logins 2021-04-17 20:45:38 +01:00
Philip Sargent
f8b613e0aa prospect and moving code to better places 2021-04-17 01:41:06 +01:00
Philip Sargent
4ad7033285 working, but very faint 2021-04-16 21:47:40 +01:00
Philip Sargent
eca0bcc6d8 oops 2021-04-16 21:29:32 +01:00
Philip Sargent
fa1df39923 stopo prospecting map crashing 2021-04-16 21:28:44 +01:00
Philip Sargent
49277216ba Fixed cave sort-order in cave index 2021-04-16 16:01:35 +01:00
Philip Sargent
16ef4fa9fb split out prospecting guide code 2021-04-16 03:05:39 +01:00
Philip Sargent
27491c933a enabled mugshots & blurb in people pages 2021-04-15 17:51:01 +01:00
Philip Sargent
3e50d0edca renaming CSS files for clarity 2021-04-15 12:34:51 +01:00
Philip Sargent
d598a6d0f5 better integration of svx file DatIssues 2021-04-14 21:08:06 +01:00
Philip Sargent
d8b1d59b12 Cave and Entrance forms tuned to user needs 2021-04-14 16:28:30 +01:00
Philip Sargent
ba0f573618 restored cave edit capability 2021-04-14 00:11:59 +01:00
Philip Sargent
daf58e9e45 replace assert() with message logging 2021-04-13 22:27:01 +01:00
Philip Sargent
2467065ac3 actually needed it seems. 2021-04-13 02:29:24 +01:00
Philip Sargent
0820d7c0dc Docstrings for all modules 2021-04-13 01:37:42 +01:00
Philip Sargent
267741fa8b fixing typos and changes in importing 2021-04-13 01:13:08 +01:00
Philip Sargent
7bc73d1ca8 move models_survex to models/survex.py 2021-04-13 00:50:12 +01:00
Philip Sargent
957169d9aa move models_caves to models/caves.py 2021-04-13 00:47:17 +01:00
Philip Sargent
5b3b0e67e9 create core/models/ directroy 2021-04-13 00:43:57 +01:00
Philip Sargent
304bbd230a deprecated non-raw regex 2021-04-13 00:18:30 +01:00
Philip Sargent
ca1df94be5 moved clever slash middleware & unused.py 2021-04-13 00:14:15 +01:00
Philip Sargent
2a1710596a moving save_carefully() 2021-04-13 00:11:08 +01:00
Philip Sargent
b602f3ae13 creating core/utils.py 2021-04-12 23:58:48 +01:00
Philip Sargent
5024abc812 add url field to DataIssue 2021-04-12 01:28:54 +01:00
Philip Sargent
dbd9b1a095 Enable svx view if url just misses off .svx 2021-04-12 01:16:49 +01:00
Philip Sargent
f6f83c6f70 data issues much easier to read 2021-04-12 01:00:47 +01:00
Philip Sargent
bc9b4f508b Public Import Errors webpage 2021-04-11 20:00:09 +01:00
Philip Sargent
7f5ac93cc6 url dispatcher tidying 2021-04-11 03:02:06 +01:00
Philip Sargent
5d4ad93c51 Better FileNotFound in expofiles 2021-04-10 15:30:29 +01:00
Philip Sargent
876868506f tidy obsolete troggle/code/reset_db 2021-04-10 01:14:23 +01:00
Philip Sargent
6dc54adec8 Cache enabled for 'expedition' pages 2021-04-10 01:07:49 +01:00
Philip Sargent
cb5b80353d Therion files now handled 2021-04-08 01:09:06 +01:00
Philip Sargent
b7d54111ba Import Therion files too 2021-04-07 21:53:43 +01:00
Philip Sargent
bf74913486 compatible with Dj2.1.5 2021-04-07 21:53:17 +01:00
Philip Sargent
e3a341eb22 chnage maintenance menus & move tests 2021-04-07 16:04:27 +01:00
Philip Sargent
785d6360cd Now compat with Dj2.0.13 & 1.11.29 2021-04-06 22:50:57 +01:00
Philip Sargent
d1cd72c5f8 New user login/logoff system using standard Dj 2021-04-06 00:49:09 +01:00
Philip Sargent
6d6bec35f2 fix incorrect folder when showing index.html 2021-04-05 15:48:48 +01:00
Philip Sargent
9db1a8490c fix bug in parsing bad HTML pages e.g.expo 82 2021-04-05 14:49:06 +01:00
Philip Sargent
409037bdf3 tiny tidyings 2021-04-05 14:01:15 +01:00
Philip Sargent
4d7e3d6866 no permission for this on expo server 2021-04-03 21:09:16 +01:00
Philip Sargent
ab5512e9d6 bugger, missed this edit 2021-04-03 20:54:33 +01:00
Philip Sargent
f6ae46e352 3d CaveView regeneates .3d file in cache 2021-04-03 20:52:35 +01:00
Philip Sargent
52c1dabd0e survex_file field inconsistency detection & edit 2021-04-02 23:21:23 +01:00
Philip Sargent
bd8d59b343 restoring wiki_markup where still used 2021-04-02 23:17:54 +01:00
Philip Sargent
663d4a2a02 JSLIB and tidy path settings 2021-04-02 19:22:53 +01:00
Philip Sargent
d841faa057 login decorator moved into views & .gitignore 2021-04-02 15:51:14 +01:00
Philip Sargent
c8cc1673e0 enable non-cave html and images redirection 2021-04-01 21:44:03 +01:00
Philip Sargent
f752f934b6 fix cave description view 2021-04-01 20:08:57 +01:00
Philip Sargent
8f790309ce tests for new /site_media/ management 2021-03-31 23:41:46 +01:00
Philip Sargent
2690203912 new method for /site-media/, /static/, /photos/ 2021-03-31 23:19:48 +01:00
Philip Sargent
9d8a44696b remove garbage & duplicated code 2021-03-31 22:13:51 +01:00
Philip Sargent
7cccf4daf1 move *_views files to /views/* 2021-03-31 21:51:17 +01:00
Philip Sargent
e1cf43c260 trailing slashes fixed 2021-03-31 20:18:46 +01:00
Philip Sargent
a6ed0a964e making flat files delivery more robust 2021-03-31 17:57:43 +01:00
Philip Sargent
3452c2c5d4 flatpages to expopages 2021-03-31 16:14:36 +01:00
Philip Sargent
b3b2356a7e expopages now troggle/core/views_expo 2021-03-30 21:48:36 +01:00
Philip Sargent
cacae6a9cd rename flatpages as expopages to reduce confusion 2021-03-30 21:05:27 +01:00
Philip Sargent
0f024b27f0 Replace assert() with DataIssue message 2021-03-29 02:06:19 +01:00
Philip Sargent
c81f17c24b more tests for files served from several places 2021-03-28 23:48:36 +01:00
Philip Sargent
623483f3b1 Fixing multiple caves with same kataser no 2021-03-28 23:47:47 +01:00
Philip Sargent
a99020078c tidy render() calls 2021-03-28 03:48:24 +01:00
Philip Sargent
a4c892b696 fixed serving expofiles from test server 2021-03-28 03:48:04 +01:00
Philip Sargent
c7475cda83 merge expeditions and statistics pages 2021-03-27 20:05:15 +00:00
Philip Sargent
ffaaea497c re-ordering middleware and logon system 2021-03-27 18:22:07 +00:00
Philip Sargent
0abd8aedff layout tidying 2021-03-26 21:20:08 +00:00
Philip Sargent
dba0fd8b20 remove survexblock webpage - redundant 2021-03-26 21:19:31 +00:00
Philip Sargent
ec83c1ff12 csrf continued 2021-03-26 19:42:58 +00:00
Philip Sargent
f5e799d632 new remote expofiles option 2021-03-26 13:51:00 +00:00
Philip Sargent
2e068d3fbb move mistake to expoweb 2021-03-26 13:30:40 +00:00
Philip Sargent
713db304e2 deleting unused old utilities 2021-03-26 13:14:52 +00:00
Philip Sargent
3487c22da3 Survex 1624, 1626, 1627 now displayed robustly 2021-03-26 02:01:29 +00:00
Philip Sargent
65c3cb31d7 improved display of survex files for a cave 2021-03-25 20:23:25 +00:00
Philip Sargent
80874887cc 404 fix attempt 2021-03-25 16:15:58 +00:00
Philip Sargent
8723d62add Survex files subdirectories displayed differently 2021-03-25 16:15:26 +00:00
Philip Sargent
65be64c756 type data added to report 2021-03-24 21:16:06 +00:00
Philip Sargent
2fe2c0515f update push procedure and fix order in pathsreport 2021-03-24 20:38:43 +00:00
Philip Sargent
39194704f5 pathlib updates 2021-03-24 17:32:45 +00:00
Philip Sargent
9a91487375 pathlib for path management & cavelist fixes 2021-03-24 15:46:35 +00:00
Philip Sargent
a9fa251fee now robust re svx in folders unofficial numbers 2021-03-23 17:35:41 +00:00
Philip Sargent
4e00645851 fix if empty directory present & display 144, 40 2021-03-23 16:36:55 +00:00
Philip Sargent
18b570d750 remote /expofiles/ now for runserver dev 2021-03-21 01:33:59 +00:00
Philip Sargent
6ac65cf893 Buxfix for cave search not finding any cave file 2021-03-17 20:58:25 +00:00
Philip Sargent
5836c6ff90 Importing old logbooks 2021-02-06 00:18:48 +00:00
Philip Sargent
d61c2b20c8 Deleted archaisms and new comments 2020-08-02 23:53:35 +01:00
Philip Sargent
95b9daca80 remove commented out code, more comments 2020-07-29 22:54:09 +01:00
Philip Sargent
0094cf7054 clean troggle menu and drawingfiles layout 2020-07-28 01:22:06 +01:00
Philip Sargent
0cf3b869af First implementation of html API, both TSV and JSON 2020-07-26 20:48:25 +01:00
Philip Sargent
69b843a824 Removing editLogbookEntry capability 2020-07-26 03:22:37 +01:00
Philip Sargent
924c5a3bf8 Delete commented-out code 2020-07-26 02:26:04 +01:00
Philip Sargent
809633bdd3 Fixed QMs in Admin control panel &remv. OtherCave 2020-07-23 02:16:08 +01:00
Philip Sargent
64727e0d3a Commented-out unused CaveDescription object 2020-07-23 01:24:06 +01:00
Philip Sargent
2a0aee5bf5 remove NewSubCave 2020-07-23 01:08:45 +01:00
Philip Sargent
427afa9ebd Removing foissil: subcave and flatpages-redirects 2020-07-22 23:14:09 +01:00
Expo on server
92de606bc6 removing files which are generated 2020-07-22 23:14:02 +01:00
Philip Sargent
5aed96c5a6 mistake 2020-07-21 00:18:02 +01:00
Philip Sargent
5bc2c132fa fix makes prospecting_guide work 2020-07-21 00:15:53 +01:00
Expo on server
f7db908cb2 generated files should be in gitignore 2020-07-20 23:51:15 +01:00
Philip Sargent
1bc82dea15 make survexblock titles 200 chars 2020-07-20 23:25:49 +01:00
Philip Sargent
f131509c56 3dtopos to survexpos + comments 2020-07-20 22:53:26 +01:00
Expo on server
8e77a70ad6 remove unused SVX_URL variable 2020-07-20 20:11:07 +01:00
Philip Sargent
28130de9cb avoiding problem with WSGI populate() error 2020-07-20 18:31:50 +01:00
Expo on server
d7838e2a42 migraitons files should be in gitign9ore 2020-07-20 12:54:32 +01:00
Philip Sargent
eb923af44f webpage tests created (no database) 2020-07-19 01:23:07 +01:00
Philip Sargent
d2833d26cc fix schema and try cache caves import 2020-07-06 20:27:31 +01:00
Philip Sargent
8530b0643d person attribution of surveyed length working 2020-07-06 01:24:43 +01:00
Philip Sargent
5be41c8163 splays and alias splays implemented 2020-07-04 13:31:46 +01:00
Philip Sargent
df434cd399 SurvexBlocks now importing in deatil 2020-07-01 22:49:38 +01:00
Philip Sargent
5feb07e3f6 Creates folders as needed on editing new svx file 2020-07-01 00:20:27 +01:00
Philip Sargent
6b0275d035 CASCADE on delete removed from key foregin keys 2020-06-30 15:26:03 +01:00
Philip Sargent
be2b17ea85 More debugging and warnings 2020-06-30 15:24:42 +01:00
Philip Sargent
39f042240d Fix SurvexDirectory import 2020-06-29 21:16:13 +01:00
Philip Sargent
a60a495c83 Creating forgotten caves & better GetCaveLookup() 2020-06-29 21:15:42 +01:00
Philip Sargent
459ed11b58 avoiding problem in KH QMs import 2020-06-28 15:57:40 +01:00
Philip Sargent
bf1c683fd0 fixing parent blocks & titles 2020-06-28 14:42:26 +01:00
Philip Sargent
122cdd7fc8 replace GetCaveByReference 2020-06-28 01:50:34 +01:00
Philip Sargent
4716eaa4b6 Working. More fault checking. 2020-06-27 17:55:59 +01:00
Philip Sargent
ca6f7ed587 move function 2020-06-27 12:04:34 +01:00
Philip Sargent
bb69cc073a start refactor survex import 2020-06-24 14:10:13 +01:00
Philip Sargent
dc5a53376d exploring recusrive behaviour 2020-06-24 02:33:43 +01:00
Philip Sargent
6bf762b72f bin Makesurvexstation, survextitle, survexEquate 2020-06-24 01:57:20 +01:00
Philip Sargent
d6c4ffca5a tunnelfile.scans name change for compatibility 2020-06-24 00:36:32 +01:00
Philip Sargent
c91aa4be47 Simple renaming too-similar variables 2020-06-24 00:18:01 +01:00
Philip Sargent
9cd70b31ac simple rename survexscansfolder to scansfolder 2020-06-23 23:46:33 +01:00
Philip Sargent
b64c779a58 rename SurvexScansFolders and tidy survex parser 2020-06-23 23:34:08 +01:00
Philip Sargent
2e7cf188af cosmetic and moving a funciton 2020-06-23 22:44:06 +01:00
Philip Sargent
674cea629d clean up import statements: more specific 2020-06-22 00:03:23 +01:00
Philip Sargent
7b260006bf dj.-reg. 2.5.2 all tested. 2020-06-20 23:26:50 +01:00
Philip Sargent
f3232cc5df More security, middleware upgrade, dj-reg.2.5 2020-06-20 23:08:34 +01:00
Philip Sargent
77c80d1a69 remove in-memory phase of data import 2020-06-20 19:55:23 +01:00
Philip Sargent
f608fc186e Fixup after rebase and pre- scripts fixed 2020-06-20 17:19:50 +01:00
Philip Sargent
e697466557 Cleanup secrets management, pre-run checks. 2020-06-20 16:51:07 +01:00
Philip Sargent
b35a0b0d26 Fully working dj 1.11.29 2020-06-19 16:39:05 +01:00
Philip Sargent
4a51de95c4 Django 1.11.19 runs clean on pre-built db. 2020-06-18 22:44:41 +01:00
Philip Sargent
d9c6986a89 static files redone 2020-06-18 21:50:16 +01:00
Philip Sargent
640e1e3b5e cleaner warnings but site_media still not ok 2020-06-18 12:10:42 +01:00
Philip Sargent
ee92182163 n_delete=... soon to be required 2020-06-18 00:20:47 +01:00
Philip Sargent
55dd577275 New url dispatcher OK 1.9.13 2020-06-17 22:55:51 +01:00
Philip Sargent
4941d230e2 TEMPLATES done for dj 1.9.13 2020-06-17 21:27:01 +01:00
Philip Sargent
660479d692 django 1.9.13 initial 2020-06-17 01:00:50 +01:00
Philip Sargent
b153fafa9f django 1.8.19 2020-06-16 22:16:48 +01:00
Philip Sargent
f6bd08029f remove useless nulls on ManyToMany 2020-06-16 19:28:24 +01:00
Philip Sargent
94e5a06a15 clean up survexlegs 2020-06-16 19:27:32 +01:00
Philip Sargent
8fc0ba136f removed jgtfileupload 2020-06-16 16:48:19 +01:00
Philip Sargent
9f5e779b5e remove Survey & virtual survey wallet - never used 2020-06-16 16:17:35 +01:00
Philip Sargent
1b693da5ed break recursive import cycle 2020-06-16 16:07:36 +01:00
Philip Sargent
453af2851b Stop storing all SurvexStations 2020-06-15 03:28:51 +01:00
Philip Sargent
d4deea2019 remove tinyMCE more 2020-06-14 10:05:25 +01:00
Philip Sargent
38fa552c00 Disable TinyMCE 2020-06-13 23:16:19 +01:00
Philip Sargent
38beb34a38 cleaner import statements 2020-06-13 01:26:59 +01:00
Philip Sargent
269b8840ad import fixes & statistics table 2020-06-12 18:10:07 +01:00
Philip Sargent
092c8bb913 stopped storing survex legs 2020-06-12 14:06:03 +01:00
Philip Sargent
538a3b6ca8 fixed circular ref on setup & in-memory db 2020-06-08 00:11:09 +01:00
Philip Sargent
9237a6262e Make import robust against duplicate kataster numbers 2020-06-07 17:49:58 +01:00
Philip Sargent
75bac01f3a Fix bad pages for clashing kataster numbers 2020-06-07 16:13:59 +01:00
Philip Sargent
fda50ed570 attempt to simplify wnt horribly wrong 2020-06-06 22:51:55 +01:00
Philip Sargent
681bfcb4c4 removing redundant functions 2020-06-04 23:53:36 +01:00
Philip Sargent
27816724f8 moved 2 funct, deletion of FileAbstraction pending 2020-06-04 23:38:57 +01:00
Philip Sargent
ac9ac5e397 Remove unused Survey object 2020-06-04 23:16:26 +01:00
Philip Sargent
43c6e2f2e1 dlete todo page, partly fix other url pages 2020-06-04 23:00:58 +01:00
Philip Sargent
b7fea2042f merge exptl & stats, delete millenial & eyecandy 2020-06-04 21:57:04 +01:00
Philip Sargent
c6d68749e0 Comment-out all ScannedImage objects 2020-06-04 19:32:26 +01:00
Philip Sargent
ae89a707ec Unit tests outline implemented 2020-06-03 21:57:05 +01:00
Philip Sargent
973c6f4ef8 update svx template & fix CRLF 2020-06-02 21:38:29 +01:00
Philip Sargent
4dd0a5ddf2 import syntax fix 2020-06-02 21:38:01 +01:00
Philip Sargent
f949bb8dc0 python3 fixes for djsngo admin pages 2020-05-31 22:35:36 +01:00
Philip Sargent
5d89cf9474 Delete SURVEYS.CSV code 2020-05-31 21:03:40 +01:00
Philip Sargent
09aedecc3b Unicode fix for SVX display and edit page 2020-05-31 20:46:12 +01:00
Philip Sargent
3088727fd4 unicode fix for python3 2020-05-31 19:00:44 +01:00
Philip Sargent
b33ad5833e delete duplication 2020-05-30 20:48:17 +01:00
Philip Sargent
01e098339e Imposrt mad more specific 2020-05-30 12:35:15 +01:00
Philip Sargent
0776978c9c Import rejigging to fix circular refs 2020-05-30 01:11:02 +01:00
Philip Sargent
6568cb8900 import fix to allow manage.py to run 2020-05-28 22:42:50 +01:00
Philip Sargent
6a755598b2 Moved classes to models_caves and fixed imports 2020-05-28 04:54:53 +01:00
Philip Sargent
df3917a677 Expunge cavetab 2020-05-28 02:20:50 +01:00
Philip Sargent
d2192ffd21 delete duplication 2020-05-28 02:09:36 +01:00
Philip Sargent
cb4128436c expung imagekit and clean import lists 2020-05-28 01:38:35 +01:00
Philip Sargent
6cc578435c Refactor to avoid loading unused surveystations 2020-05-28 01:16:45 +01:00
Philip Sargent
c9657aeb8c preparing to clean up LoadPos 2020-05-26 16:41:11 +01:00
Expo on server
dfb7cc88cd Allow being unable to open local LOGFILE. 2020-05-26 02:26:51 +01:00
Philip Sargent
8b74ff4bb6 __unicode__ to __str__ 2to3 conversion 2020-05-26 02:21:36 +01:00
Philip Sargent
44d190e91c partial fix to make OK on python3.8 2020-05-25 01:49:02 +01:00
Philip Sargent
0a864c7f87 2to3 sort comparison key change 2020-05-25 01:46:52 +01:00
Philip Sargent
50d753a87b Convert codebase for python3 usage 2020-05-24 20:56:27 +01:00
Philip Sargent
49d5857b36 tabs and spaces format fix 2020-05-24 13:31:38 +01:00
Philip Sargent
d4ac28af18 Remove PHOTOS_ROOT and DPhoto class 2020-05-15 21:32:55 +01:00
Philip Sargent
e4290c4ab0 adding *ref to troggle svx parser 2020-05-13 19:57:07 +01:00
Philip Sargent
39c622d5bf dbReset now loads into memory first (fast err checking), then into db 2020-04-30 23:15:57 +01:00
Expo on server
59633d94f5 Remove mention of obsolete EMAIL_HOST_USER to correspond with change made in pathreport.py 2020-03-09 17:44:29 +00:00
Philip Sargent
53206ad1d7 Removed EMAIL_HOST entirely 2020-03-09 16:52:51 +00:00
Philip Sargent
9aa91bf3e2 remove EMAIL_HOST global name 2020-03-09 16:48:51 +00:00
Philip Sargent
cdef395f89 New troggle report on defined directory paths 2020-02-27 00:58:09 +00:00
Philip Sargent
429c21a8e9 installing on WSL ubuntu on Windows 10 2020-02-22 00:04:41 +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
Sam Wenham
97426a0ddb Backed out changeset: 4552f42bdf54 2019-06-26 20:57:24 +01:00
Sam Wenham
8a1be45aac Remove this stupid hard coded name match 2019-06-26 20:56:08 +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
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
ae284a1f30 Add ordering to the data issues model 2019-04-18 19:01:29 +01:00
Sam Wenham
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
 2019-04-14 22:45:31 +01:00
Sam Wenham
a588221524 Ooops shouldn't of commited the DateTime change, yet... 2019-03-31 16:43:21 +01:00
Sam Wenham
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
 2019-03-31 15:39:53 +01:00
Sam Wenham
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
 2019-03-30 17:02:07 +00:00
Sam Wenham
a4532a29da Update new management command for DB reset 
Switch to content_type from mimetype
Make DB reset not nuke so much
Tidy logbook parser
 2019-03-30 13:58:38 +00:00
Sam Wenham
9fa93fdd15 Fix person chronology to get the date from te logbook entry 2019-03-09 18:43:58 +00:00
Sam Wenham
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
 2019-03-09 18:21:10 +00:00
Sam Wenham
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
 2019-03-09 11:18:44 +00:00
Sam Wenham
42d10cf43d Revert (I hate hg!!!) 2019-02-26 20:43:18 +00:00
Sam Wenham
2226aa34d5 merge 2019-02-26 20:41:47 +00:00
Sam
0268ff46b3 Add docker readme, settings and update compose file 
Fix views_logbooks.py
 2019-02-26 19:19:01 +00:00
Rad
1d7cf3f41a Messing with millenialcaves.html or similar 2019-02-26 14:07:45 +00:00
Rad
32c186afd7 Messing with millenialcaves.html or similar 2019-02-26 14:05:41 +00:00
Rad
8703ed5d94 Messing with millenialcaves.html or similar 2019-02-26 12:30:20 +00:00
Rad
a4118261e1 Messing with millenialcaves.html or similar 2019-02-26 12:29:46 +00:00
Rad
6392c1f238 Messing with millenialcaves.html or similar 2019-02-26 12:23:12 +00:00
Rad
c724f292ca Messing with millenialcaves.html or similar 2019-02-26 12:03:17 +00:00
Rad
beffdbd89d Messing with millenialcaves.html or similar 2019-02-26 12:01:30 +00:00
Rad
da88771fd4 Messing with millenialcaves.html or similar 2019-02-26 09:45:17 +00:00
Rad
b6b7d2aa12 Messing with millenialcaves.html or similar 2019-02-26 09:41:02 +00:00
Rad
9712bf6dfd Messing with millenialcaves.html or similar 2019-02-26 02:01:09 +00:00
Rad
5e4c1493a1 Messing with millenialcaves.html or similar 2019-02-26 01:56:39 +00:00
Rad
41b1334257 Messing with millenialcaves.html or similar 2019-02-26 01:48:52 +00:00
Rad
a2fcbae129 Messing with millenialcaves.html or similar 2019-02-26 01:46:54 +00:00
Rad
e9077542c9 Messing with millenialcaves.html or similar 2019-02-26 01:46:05 +00:00
Rad
79595521a9 Messing with millenialcaves.html or similar 2019-02-26 01:45:03 +00:00
Rad
38b658fd3f Messing with millenialcaves.html or similar 2019-02-26 01:43:54 +00:00
Rad
a89123755c Messing with millenialcaves.html or similar 2019-02-26 01:43:28 +00:00
Rad
0fb9accd05 Messing with millenialcaves.html or similar 2019-02-26 01:41:15 +00:00
Rad
f87df707ab Messing with millenialcaves.html or similar 2019-02-26 01:37:52 +00:00
Rad
a2cb771fc1 Messing with millenialcaves.html or similar 2019-02-26 01:35:55 +00:00
Rad
c888f59ff0 Messing with millenialcaves.html or similar 2019-02-26 01:34:09 +00:00
Rad
43ff6e09be Messing with millenialcaves.html or similar 2019-02-26 01:30:32 +00:00
Rad
466e667e14 Messing with millenialcaves.html or similar 2019-02-26 01:04:09 +00:00
Rad
19a061efa8 Messing with millenialcaves.html or similar 2019-02-26 00:56:46 +00:00
Rad
e5d864359a Messing with millenialcaves.html or similar 2019-02-26 00:47:35 +00:00
Rad
b2adc285b6 Messing with millenialcaves.html or similar 2019-02-26 00:45:56 +00:00
Rad
b33ca2b290 Messing with millenialcaves.html or similar 2019-02-26 00:43:05 +00:00
Rad
c4455168c6 Messing with millenialcaves.html or similar 2019-02-26 00:35:28 +00:00
Rad
1b4674acde Messing with millenialcaves.html or similar 2019-02-26 00:33:37 +00:00
Rad
4fac4317a3 Messing with millenialcaves.html or similar 2019-02-26 00:33:04 +00:00
Rad
78bf9986b7 Messing with millenialcaves.html or similar 2019-02-26 00:30:09 +00:00
Rad
5154c0d8e5 Messing with millenialcaves.html or similar 2019-02-26 00:29:16 +00:00
Rad
521f0241f8 Messing with millenialcaves.html or similar 2019-02-26 00:21:54 +00:00
Rad
0394becdac Messing with millenialcaves.html or similar 2019-02-26 00:21:27 +00:00
Rad
6beaf4afdd Messing with millenialcaves.html or similar 2019-02-26 00:17:11 +00:00
Rad
a4a92483bd Messing with millenialcaves.html or similar 2019-02-26 00:04:27 +00:00
Rad
3254ba1443 2019-02-26 00:00:34 +00:00
Rad
4c3d0ce7fa 2019-02-25 23:55:06 +00:00
Rad
0a214c5d4b 2019-02-25 23:51:26 +00:00
Rad
29c53f35ab 2019-02-25 23:48:58 +00:00
Rad
3746dab5de 2019-02-25 23:46:52 +00:00
Rad
18dbadd675 space/tab 2019-02-25 23:42:56 +00:00
Rad
ee2cd0d391 trying to add new field 2019-02-25 23:40:53 +00:00
Rad
0cc4e7c7d3 2019-02-25 23:37:12 +00:00
Sam Wenham
478065786f Merge 2019-02-25 23:34:10 +00:00
Sam Wenham
e64d82cd92 Start of moving databasereset to django management 2019-02-25 23:10:24 +00:00
Sam Wenham
12a991920a Get get_absolute_url in the correct place 2019-02-25 23:07:20 +00:00
Rad
78a5f656b9 added Rad's playground 2019-02-25 22:24:33 +00:00
Sam Wenham
77a6015ad6 Fix the All Survex page to work with 1623 area 2019-02-25 20:13:28 +00:00
Sam Wenham
7c15a7439d Decode the url encoded # when looking at wallets 2019-02-24 19:50:45 +00:00
Sam Wenham
b4f4db5754 Deal better with the wallet letter number combo of 2019#X01 2019-02-24 18:55:30 +00:00
Sam Wenham
e6fa54d0e5 Fix survey scans 
Remove the assert for folders in survey wallets, this does mean currently they
will be ignored by troggle.
 2019-02-24 16:46:02 +00:00
Sam Wenham
4ad5b68433 Make things more compatiable with newer python 
Fix the expeditions list
Improvements to make it compatiable with django 1.8
Bump the years to add 2018
Update the .hgignore file to ignore junk
 2019-02-24 13:03:34 +00:00
Sam Wenham
a1f02e575f Prevent troggle adding the menu if there is one in the file 
Add a Docker compose file to bring up a dev troggle easily
Various PEP improvments
 2019-02-23 15:30:58 +00:00
expoonserver
c162411f0b FileUploadForm does not work with django 1.7. 
It tries to use database during class initialisation.
removed it for now - not sure if it's important...
 2018-06-17 02:24:00 +01:00
Sam Wenham
46124a770f Fix the django for the spinny js cave viewer. 
Make the paths settings (don't hard code things like this!!)
Add " round spinny urls from the late merge (the rest were done for the move off 1.4.2
 2018-04-20 20:55:12 +01:00
Sam Wenham
6f6327d267 Merge with django-upgrade 2018-04-17 22:19:20 +01:00
expoonserver
6710a469ee Add CaveView spinny caves view to each troggle cave page 2018-04-17 21:57:02 +01:00
Sam Wenham
174c475ec7 Add default BooleanField(default=False) for django 1.7 compatibility 2018-04-17 21:51:39 +01:00
Sam Wenham
760fa3114f missed from last commit 2018-04-15 16:28:52 +01:00
Sam Wenham
798ae591c6 Django 1.7 mostly working. Big refactor so probably bugs 2018-04-15 16:28:13 +01:00
Sam Wenham
7877efba0a Up to 1.6.11 on stretch. New manage.py. Some tidying 2018-04-15 12:00:59 +01:00
Sam Wenham
cfa888fde6 More cleanup and modernisation 2018-04-14 21:37:12 +01:00
Sam Wenham
cedcb0988a Clean up indenting in models 
add registration required modules
 2018-04-14 21:14:19 +01:00
Sam Wenham
242cf4741a Import Image from PIL to support newer python 
import the Django registration module rather than the troggle one
 2018-04-10 01:34:06 +01:00
expoonserver
d7c6676c49 Test whether url is not 'None' before applying 'startswith' test in 
forms.py entering new caves, otherwise it barfs.
 2017-10-25 03:49:03 +01:00
expoonserver
5e9dfc6ea6 Fix Scan scanning, so that 2015#X01 format (with 'X') is accepted in 
scan directories. Allows 2016 data to be processed.
 2017-03-07 15:44:42 +00:00
expo
716131f005 Fix cave pages to have entrances and description on one page. 
Fixes broken links on description and entrance pages.
Removes need for jquery-ui.
 2016-07-02 23:42:47 +01:00
expo
214d887c57 Commit changes made on expo 2015 2015-09-16 01:52:45 +01:00