expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-12-12 19:42:18 +00:00
Code Issues 19 Projects 3 Activity
2,965 Commits 7 Branches 0 Tags 36 MiB
26eff0172b
Commit Graph

653 Commits

Author SHA1 Message Date
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
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
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
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
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
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
d7fd6b00ae Detect unwriteable file permissions earlier 2022-03-05 17:05:15 +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
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
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
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
9294c8c2f1 remove unneeded LIBDIR 2021-10-24 19:16:01 +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
1ff723554c Northings and Easting report 2021-05-07 22:42:10 +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
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
7368942488 remove unused templatetags code 2021-04-30 23:21:38 +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
942cbdd4b2 clean out broken QM bits 2021-04-27 15:38:20 +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
d43ce1bdb2 rename TUNNEL_DATA as DRAWINGS_DATA 2021-04-26 18:42:10 +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
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
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
eea74406c9 fix template bug for newentrance 2021-04-17 23:59:11 +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
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
0820d7c0dc Docstrings for all modules 2021-04-13 01:37:42 +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
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
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
bf74913486 compatible with Dj2.1.5 2021-04-07 21:53:17 +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
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
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
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