expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-29 21:31:54 +00:00
Code Issues 19 Projects 3 Activity
1,709 Commits 7 Branches 0 Tags 34 MiB
5fe436e76a
Commit Graph

460 Commits

Author SHA1 Message Date
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