expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-30 05:41:52 +00:00
Code Issues 19 Projects 3 Activity
2,371 Commits 7 Branches 0 Tags 34 MiB
73af227fb3
Commit Graph

868 Commits

Author SHA1 Message Date
Philip Sargent
861980a8e9 More fixes to name resolution checking 2022-10-09 23:50:32 +03:00
Philip Sargent
3c31c333f2 Widen the recognizer capabilities for names 2022-10-09 02:32:34 +03:00
Philip Sargent
e6ca20b1ed new report to make aliases visible 2022-10-09 00:17:53 +03:00
Philip Sargent
b470ab66e2 Now tests that loser repo is clean and survex runs on 1623.svx and 1626.svx 2022-10-08 20:43:01 +03:00
Philip Sargent
bec262bb2d comments 2022-10-07 23:47:45 +03:00
Philip Sargent
74b3147076 fix for running troggle not on master git server 2022-10-07 23:47:30 +03:00
Philip Sargent
f51d1e114e small chnages to name resolution 2022-10-07 23:47:05 +03:00
Philip Sargent
d16226c879 bug patch for duplicate SUrvexFile object 2022-10-06 21:55:31 +03:00
Philip Sargent
1f70b77735 fix crash when people put a list of cave ids in a wallet 2022-10-06 21:37:09 +03:00
Philip Sargent
4a34986598 error msg fix 2022-10-06 21:03:14 +03:00
Philip Sargent
70709c505c Fixing bugs and better error msgs 2022-10-06 21:02:15 +03:00
Philip Sargent
c8163ab0cd fix bug for wallet with empty fpath 2022-10-03 21:18:35 +03:00
Philip Sargent
fe28d9ba39 Add survex files,wallets and same-day LBEs to the logbook entry 2022-09-27 23:59:25 +03:00
Philip Sargent
760dbc588a Make scans in subfolders somewhat visible 2022-09-24 00:34:39 +03:00
Philip Sargent
f3ecdd6d87 Cleaner monitoring output when importing wallets and scans 2022-09-24 00:17:51 +03:00
Philip Sargent
6e3fdd35c1 Replaced maintenance headache with cleaner folder walking 2022-09-23 23:43:34 +03:00
Philip Sargent
c3672b476c test fixed to match new code 2022-09-23 21:23:15 +03:00
Philip Sargent
9d56e467cd fix broken upload form 2022-09-23 21:07:51 +03:00
Philip Sargent
97b0ce8c96 removing technical debt, replace convoluted code 2022-09-23 00:49:40 +03:00
Philip Sargent
aa20692ad6 bugfixes and enabling older wallets to be found and listed 2022-09-22 22:41:42 +03:00
Philip Sargent
b4cf2bac95 more complete list of caves linked to wallets 2022-09-22 01:37:25 +03:00
Philip Sargent
e2b280ccdc fix mistaken error messages 2022-09-22 00:23:47 +03:00
Philip Sargent
1971f51b52 find more wallets than we thought we had 2022-09-22 00:23:22 +03:00
Philip Sargent
86ea33bbce Correct and validate JSON dates when they are read from file 2022-09-20 23:06:45 +03:00
Philip Sargent
71bd07e70e Handling and fixing bad dates in JSON input 2022-09-20 22:52:31 +03:00
Philip Sargent
94b49adc4e added free text field to wallet JSON 2022-09-20 22:05:35 +03:00
Philip Sargent
36995ec051 handling survex files not linked in completely 2022-09-20 02:36:40 +03:00
Philip Sargent
61f9863a06 bug fixes and coping with a list of cave ids in JSON 2022-09-20 01:02:06 +03:00
Philip Sargent
0611c3f00f documn improvements 2022-09-19 21:54:51 +03:00
Philip Sargent
13b57d2bb6 year list for wallets by year 2022-09-19 21:54:32 +03:00
Philip Sargent
2648bada30 remove URL field from wallet as seen and edited 2022-09-19 20:55:34 +03:00
Philip Sargent
9cd009f8ba typo, bugfix 2022-09-16 23:22:45 +03:00
Philip Sargent
ddfc677a1e bugfix for missing dates 2022-09-16 21:26:03 +03:00
Philip Sargent
0ab3a4ff44 comments added 2022-09-15 22:55:45 +03:00
Philip Sargent
9410dda69e List the logbook trips and other svx files of the same date 2022-09-14 00:31:37 +03:00
Philip Sargent
a41cd8eb24 oops. breaking chnage. fixed. 2022-09-12 22:51:33 +03:00
Philip Sargent
29dc99c21f tidy bad git messages in tests 2022-09-12 22:47:31 +03:00
Philip Sargent
beecb4b0ac remove redundant code 2022-09-12 22:46:45 +03:00
Philip Sargent
fd57071411 Fixed test to undo side-effect git commit 2022-09-12 21:28:07 +03:00
Philip Sargent
785845598f catch crashes when no data has been imported 2022-09-12 20:50:57 +03:00
Philip Sargent
6452a7beed fix green block for survex files on table 2022-08-31 12:09:07 +03:00
Philip Sargent
dc2b8ad431 fixes for crashes,svx files in wallets 2022-08-31 09:27:14 +03:00
Philip Sargent
3af1112847 fix wallet date from survexfile 2022-08-30 20:46:17 +03:00
Philip Sargent
9aaadafc13 populate with people 2022-08-25 17:29:57 +03:00
Philip Sargent
6c384492be fix missing .svx as not an error 2022-08-25 17:29:43 +03:00
Philip Sargent
ab184bccf3 comment updates 2022-08-25 16:31:38 +03:00
Philip Sargent
8f03e590cc update test to match new wallet json location 2022-08-25 14:38:14 +03:00
Expo on server
57c4732566 Fix erroring code in core/views/caves.py 2022-08-25 03:31:54 +01:00
Philip Sargent
17bbbd6eab get the survexfile path when editing a naked wallet 2022-08-24 19:08:08 +03:00
Philip Sargent
7e9fd0f353 Better display of wallet names copied from svx files 2022-08-24 18:28:15 +03:00
Philip Sargent
8ca50d8fd4 bugfix which was deleting metadata 2022-08-24 17:01:20 +03:00
Philip Sargent
43b6b590e8 fix bleed through of previous metadata onto another wallet 2022-08-24 16:22:15 +03:00
Philip Sargent
a30a2b9ef9 bugfix 2022-08-20 09:45:28 +03:00
Philip Sargent
e195497829 better commit msg 2022-08-16 21:58:13 +03:00
Philip Sargent
13e3da8d26 bugfix 2022-08-16 20:57:34 +03:00
Philip Sargent
ee7e3b6d41 make field longer 2022-08-16 20:54:27 +03:00
Philip Sargent
f1aa6a9794 better hint for svx file name input 2022-08-16 20:47:24 +03:00
Philip Sargent
41c68aef26 detecting empty wallets where we only have JSON and no files 2022-08-16 20:02:28 +03:00
Philip Sargent
aaba4fd2a9 minor refactoring 2022-08-16 17:42:37 +03:00
Philip Sargent
51f5261bfc bad bug in not clearing out previous data. fixed 2022-08-16 16:48:19 +03:00
Philip Sargent
3c13f62bd1 re-fettled scan upload, creates Wallet object earlier 2022-08-14 23:40:56 +03:00
Philip Sargent
284e044a03 Fix wallets scan upload faults 2022-08-14 22:52:14 +03:00
Philip Sargent
8fa25c815a fix apparent error when running on dev system 2022-08-13 23:57:37 +03:00
Philip Sargent
edfba8d355 git commit edits to wallet data 2022-08-13 23:56:56 +03:00
Philip Sargent
1eadc931cb Bugfix for git add for uploaded drawings 2022-08-13 21:14:57 +03:00
Philip Sargent
5149cf1ece add test for renaming single photo 2022-08-11 23:44:19 +03:00
Philip Sargent
1bbfd1e517 bugfix in photo upload, untidy 2022-08-11 23:35:53 +03:00
Philip Sargent
e35616a611 look in filesystem not database for file location 2022-08-11 22:18:58 +03:00
Philip Sargent
3607b9f140 enable photo file rename 2022-08-11 21:19:52 +03:00
Philip Sargent
25c425cff8 QMs grayed out for survex files 2014 and earlier 2022-08-07 23:41:45 +03:00
Philip Sargent
7f335e082c prevent error message repetition in DataIssues 2022-08-07 23:26:31 +03:00
Philip Sargent
9220dbf2e6 bugfix 2022-08-07 22:52:29 +03:00
Philip Sargent
f33c6cc057 bugfix in new wallet 2022-08-06 22:23:39 +03:00
Philip Sargent
186eb20fb3 Make drawings repo the MASTER for contents.json 2022-08-06 21:27:36 +03:00
Philip Sargent
0fd3cf43e8 formatting 2022-08-01 17:32:49 +03:00
Martin Green
c1aaf07885 Merge branch 'python3-new' of ssh://expo.survex.com/home/expo/troggle into python3-new 2022-08-01 16:05:17 +02:00
Martin Green
f491264b9e Allow entrances to be edited with the correct parent url. Commit changes to caves when adding a new entrance. Order entrances alphabetically 2022-08-01 16:04:22 +02:00
Philip Sargent
eed35d01a8 tick lists now on 3 wallets reports 2022-08-01 15:55:20 +03:00
Philip Sargent
df42b1ccb3 remove debugging print 2022-08-01 03:10:07 +03:00
Philip Sargent
129ea3cc5b debugging ticklist 2022-08-01 02:50:19 +03:00
Martin Green
fa6758b9a0 edit entrances within the correct url parent 2022-07-31 21:29:17 +02:00
Philip Sargent
a2a5e9200e wallets per person - slow implementation 2022-07-31 18:58:46 +03:00
Martin Green
94252a94fe Edit caves in the same parent URL as the final file 2022-07-31 17:08:28 +02:00
Philip Sargent
c1ba6a39a5 Wallets by year and by cave 2022-07-31 01:02:02 +03:00
Philip Sargent
724234949f Populate blank wallet fields with survex data 2022-07-29 20:55:19 +03:00
Philip Sargent
c29e240c2b creating new wallet now copies nd commits 2022-07-28 18:36:40 +03:00
Philip Sargent
93622b111f obscure bug fixed for lines ;*include 2022-07-28 15:15:11 +03:00
Philip Sargent
9a461c31a8 adding people 2022-07-28 02:37:44 +03:00
Philip Sargent
fea69c0371 Extend wallets by cave report 2022-07-28 01:48:22 +03:00
Philip Sargent
dd0fcc28dd update todo strings 2022-07-27 23:24:53 +03:00
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