expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-22 15:21:52 +00:00
Code Issues 19 Projects 3 Activity
2,114 Commits 7 Branches 0 Tags 34 MiB
52a035e4cf
Commit Graph

516 Commits

Author SHA1 Message Date
Martin Green
48f82aaaca Merge branch 'python3-new' of ssh://expo.survex.com/home/expo/troggle into python3-new 2022-06-24 21:58:21 +01:00
Martin Green
5ac2e24cc2 Removed jQuery 2022-06-24 21:58:00 +01:00
Philip Sargent
d6db942626 Useful datamanagement link 2022-06-24 23:18:10 +03: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
Philip Sargent
6de9181390 Put inside if clause if attribute does not exist 2022-06-23 18:44:53 +03:00
Philip Sargent
b259e43de2 bad CSS from typo 2022-05-19 16:13:35 +03:00
Philip Sargent
a7baf4f3e6 restore Sit Index menu item 2022-05-19 15:58:54 +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
c9931fd45e survey legs calc fixed 2022-04-18 23:33:04 +03:00
Expo on server
fe53b08f35 Update the 'pagenotfound' page to reflect what users see. 2022-04-09 22:59:47 +01:00
Philip Sargent
efeb0efd1e umlauts and edit this page 2022-03-25 02:05:10 +00:00
Philip Sargent
1589188988 enable wallet view even if not logged in 2022-03-24 20:45:15 +00:00
Philip Sargent
70efb10ece reordered main menu 2022-03-23 11:32:36 +00:00
Philip Sargent
f1b206ad34 fixing bugs after wookey session 2022-03-22 02:22:15 +00:00
Philip Sargent
48171ae824 better fix 2022-03-18 20:45:40 +00:00
Philip Sargent
28fb4d1e94 |Another subtle bug 2022-03-18 20:43:01 +00:00
Philip Sargent
1d504e4066 bugfix 2022-03-18 20:09:49 +00:00
Philip Sargent
6a18511dd0 Fixing URLs for cave descriptions 2022-03-18 20:00:15 +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
e4ee4abce8 missing print msg 2022-03-18 10:21:25 +00:00
Philip Sargent
2544bc5f3d extra cross link URL to wallet reports 2022-03-18 02:49:45 +00:00
Philip Sargent
19d017a457 Edit contents.json online 2022-03-17 00:41:29 +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
8e78dd4a2e update menu 2022-03-10 22:59:47 +00:00
Philip Sargent
822f8a1699 Fix URL bug 2022-03-10 18:58:58 +00:00
Philip Sargent
488ce46d73 File upload forms descriptions 2022-03-08 22:59:04 +00:00
Philip Sargent
f32df567f2 Updated troggle menu with 2022 caves 2022-03-08 09:34:52 +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
32377f4e6c Cave import & reports fixes 2022-03-05 12:20:26 +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
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
29c929aba4 Update title to 2022 2022-02-23 22:52:55 +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
928c451040 msg that control panel not working 2021-12-30 00:55:42 +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
64f89be6a9 docm .3d file generation for CaveView 2021-11-06 23:57:51 +02:00
Philip Sargent
73ffb509f7 CaveView status is now documented 2021-11-06 22:59:10 +02:00
Philip Sargent
5723f57fc5 Add crossrefs to handbook UTM pages, laser points 2021-11-06 00:15:24 +02:00
Philip Sargent
bf5d0556fc remove broken and ancient AERW map images 2021-10-26 19:00:18 +03:00
Philip Sargent
c774b14e04 remove unused JS code after checking it is redundant 2021-10-26 01:02:27 +03:00
Philip Sargent
b6bbec235c Remove refs to absent and unused JS & CSS 2021-10-25 01:00:02 +03:00
Philip Sargent
5533029072 tried old jquery CSS 2021-10-25 00:38:24 +03:00
Philip Sargent
5807e4a873 tidying unused and unavailable JSLIB bits 2021-10-25 00:04:02 +03:00
Philip Sargent
e42cb582c7 1988, 1989 still bad 2021-05-09 00:55:37 +01: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
d374779c47 dwg upload and django admin extra search 2021-05-05 00:35:10 +01:00
Philip Sargent
b3fcd7765e renamed to uploadfiles 2021-05-04 20:56:44 +01:00
Philip Sargent
b4abd7b6bc menu update 2021-05-04 15:44:46 +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
e6adced39d removed menu link to edit database object directly 2021-05-03 21:21:28 +01:00
Philip Sargent
3393db0fbc Bigger buttons, phone compatible 2021-05-01 18:35:08 +01:00
Philip Sargent
100209ea16 add cave column to wallets report 2021-05-01 00:19:04 +01:00
Philip Sargent
425b534c30 add wallet column to expo report 2021-05-01 00:18:39 +01:00
Philip Sargent
63640db81f remove unused templatetags load 2021-05-01 00:18:13 +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
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
62799d196b tabs to spaces 2021-04-28 00:50:36 +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
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
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
a656ada67a Fixing cave edit form and cave creation parser 2021-04-25 04:04:53 +01:00
Philip Sargent
4e59c8791f copied comments from the html template file to the xml template too 2021-04-25 01:47:34 +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
74403d28e9 fix field in search box so no need to delete it 2021-04-21 22:09:42 +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
8f0e7435d6 renaming 'tunnel' to 'dwg' in urls and views 2021-04-20 23:57:19 +01:00
Philip Sargent
b4ba3c40eb catch unknown scotsman error 2021-04-20 22:58:41 +01:00
Philip Sargent
a2083c5310 disabling Google FLoC 2021-04-19 01:47:12 +01:00
Philip Sargent
879f6c288e Make troggle compatible with Django 3.1 2021-04-19 01:32:18 +01:00
Philip Sargent
eea74406c9 fix template bug for newentrance 2021-04-17 23:59:11 +01:00
Philip Sargent
d4317b5fd3 better error pages 2021-04-17 21:24:37 +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
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
9695e49024 add link to all expedition pages back to expoweb /year/ page 2021-04-16 01:56:43 +01:00
Philip Sargent
27491c933a enabled mugshots & blurb in people pages 2021-04-15 17:51:01 +01:00
Philip Sargent
0fee2bb165 add labels to templates to help debugging 2021-04-15 12:55:13 +01:00
Philip Sargent
3e50d0edca renaming CSS files for clarity 2021-04-15 12:34:51 +01:00
Philip Sargent
5c4a33873f cull old CSS 2021-04-15 01:51:42 +01:00
Philip Sargent
c2c7de4c59 more cave parsing data fixes 2021-04-14 22:50:47 +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
54d98f58f3 docum and defaults in template cave-data xml 2021-04-14 01:52:42 +01:00
Philip Sargent
ba0f573618 restored cave edit capability 2021-04-14 00:11:59 +01:00
Philip Sargent
5024abc812 add url field to DataIssue 2021-04-12 01:28:54 +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
a7e59b2bb0 clear cache on parsing & 2.2.19 notes 2021-04-10 02:12:13 +01:00
Philip Sargent
f16d9a5848 Therion renaming missed one 2021-04-08 01:22:09 +01:00
Philip Sargent
b7d54111ba Import Therion files too 2021-04-07 21:53:43 +01:00
Philip Sargent
e3a341eb22 chnage maintenance menus & move tests 2021-04-07 16:04:27 +01:00
Philip Sargent
05ed8af158 remove 'register' bad link 2021-04-06 01:19:50 +01:00
Philip Sargent
d1cd72c5f8 New user login/logoff system using standard Dj 2021-04-06 00:49:09 +01:00
Philip Sargent
c08356876d missed a wiki_markup ref 2021-04-03 21:59:18 +01:00
Philip Sargent
f6ae46e352 3d CaveView regeneates .3d file in cache 2021-04-03 20:52:35 +01:00
Philip Sargent
7ee7a05ea1 typos in templates 2021-04-03 00:35:31 +01:00
Philip Sargent
e559a1dabd commentary in prospecting guide 2021-04-03 00:35:10 +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
ea221281a3 remove unused {% load link %} 2021-04-02 20:54:18 +01:00
Philip Sargent
cc5b4fa650 remove {% load wiki_markup %} 2021-04-02 20:41:42 +01:00
Philip Sargent
4c0ad53b3a culling unused JS 2021-04-01 02:44:49 +01:00
Philip Sargent
2690203912 new method for /site-media/, /static/, /photos/ 2021-03-31 23:19:48 +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
b75baffdcf delete unused profiles app 2021-03-30 21:09:01 +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
e7947069a2 should all be working, but isn't 2021-03-26 23:40:34 +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
1c7e99e91b attempting to enable csrf cookie robustly 2021-03-26 17:33:58 +00:00
Philip Sargent
3487c22da3 Survex 1624, 1626, 1627 now displayed robustly 2021-03-26 02:01:29 +00:00