Martin Green
|
8463f8947e
|
Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle
|
2023-07-24 23:03:47 +01:00 |
|
Martin Green
|
380565c6f5
|
save connection between cave and entrances, before writing out the cavedata file
|
2023-07-24 23:03:12 +01:00 |
|
|
|
9473b22bd9
|
detect non-ISO dates in JSON and from user and fix
|
2023-07-23 23:30:19 +03:00 |
|
|
|
f76c22e843
|
moving dev configs to _deploy/
|
2023-07-17 19:25:40 +03:00 |
|
|
|
dc06744444
|
fix exception?
|
2023-07-14 11:26:47 +02:00 |
|
|
|
26e96839e4
|
stop crash onloading wallet with blank caveid
|
2023-07-14 11:22:48 +02:00 |
|
|
|
4e4824546a
|
stop crash on live system
|
2023-07-14 11:21:49 +02:00 |
|
|
|
b650095588
|
calendar S T colour >10 per date
|
2023-07-14 11:13:06 +02:00 |
|
|
|
761a71930b
|
hack to stop crash
|
2023-07-13 22:20:01 +02:00 |
|
Martin Green
|
380fe8cc32
|
Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle
|
2023-07-13 12:35:00 +02:00 |
|
Martin Green
|
bdb5e3208b
|
Rotate and reflect images, as specified in EXIF whilst uploading
|
2023-07-13 12:34:52 +02:00 |
|
Martin Green
|
c119c99308
|
removed print statement
|
2023-07-13 12:33:55 +02:00 |
|
Mark Shinwell
|
5f6359694d
|
Update test to reflect change in loser repo
|
2023-07-12 14:12:40 +02:00 |
|
Martin Green
|
67361fa66c
|
Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle
|
2023-07-10 17:00:56 +02:00 |
|
Martin Green
|
b27852c1f3
|
redirect to actual login page
|
2023-07-10 16:55:09 +02:00 |
|
Expo on server
|
086537cb56
|
=Added string to caveslugs so admin interface works. Added explanation for the rational for cave slugs.
|
2023-07-08 23:45:32 +01:00 |
|
Expo on server
|
beab42323b
|
Added CaveSlugs to Admin
|
2023-07-08 23:43:57 +01:00 |
|
Expo on server
|
3d43c0ec12
|
Allow for parent directories to be created when created photos.
|
2023-07-08 22:42:06 +01:00 |
|
Martin Green
|
ad37a82713
|
git comitting allowing files to be comitted in different directories.
|
2023-07-05 21:10:05 +01:00 |
|
Martin Green
|
ffed6e3ba6
|
convert uploaded images to RGB so that it can be saved as jpg
|
2023-07-05 21:08:51 +01:00 |
|
Martin Green
|
63599cb27a
|
Removed ability to add other caves entrances to a cave.
|
2023-07-05 18:22:08 +01:00 |
|
Martin Green
|
410a285085
|
Bug fixes to allow adding of a new cave. No longer ask users about filenames or urls.
|
2023-07-05 17:43:57 +01:00 |
|
Martin Green
|
c4095eb336
|
Have images saved to correct place, when edited in the cave or entrance view. etc
|
2023-07-05 13:18:02 +01:00 |
|
Martin Green
|
929f6732d0
|
Add some sort of orderinng
|
2023-07-03 08:04:26 +01:00 |
|
Martin Green
|
b91223da66
|
Add list of entrances
|
2023-07-03 08:00:03 +01:00 |
|
|
|
969ed6cce5
|
added 1627 caves to 'caves'page
|
2023-05-20 22:47:09 +03:00 |
|
Martin Green
|
43724f1cf6
|
When reloading a cave, do so from cave.filename, rather than inorrectly assuming the cave is named after its slug
|
2023-05-08 23:09:15 +01:00 |
|
Martin Green
|
7d140af87a
|
Do not rename caves when saving
|
2023-05-08 22:34:45 +01:00 |
|
Martin Green
|
f7fca58c57
|
Start of creating kmz file, with entrance photos and links to expo.survex.com
|
2023-05-08 01:10:43 +01:00 |
|
Philip Sargent (laptop)
|
ef467ad481
|
Making the dummy entrance thing clear
|
2023-05-02 17:42:58 +03:00 |
|
Philip Sargent (laptop)
|
175307773b
|
More fixes for laptop
|
2023-05-02 15:28:28 +03:00 |
|
Martin Green
|
783154d24a
|
Restored check of git status after a committ, but only for the one file being committed
|
2023-05-01 22:06:48 +01:00 |
|
Martin Green
|
896af43994
|
kml file output for google earth etc
|
2023-05-01 00:01:41 +01:00 |
|
Martin Green
|
2ee63a9804
|
If a cave is made with no entrances, redirect to a new entrance form for the cave
|
2023-04-30 21:42:03 +01:00 |
|
Martin Green
|
c7b3e8aff0
|
Added an ordering of entrances
|
2023-04-30 21:41:17 +01:00 |
|
Martin Green
|
e8d1265ee4
|
Be more specific about what is being commited and do not check for unadded changes, and then through an error at the user, which they are unlikely to understand.
|
2023-04-30 21:04:05 +01:00 |
|
Martin Green
|
10ff8a5aab
|
Fixed errors when creating new caves and entrances via the website. Moved slug logic to forms (previously checked in). This allows slug uniqueness to be validated in the form
|
2023-04-30 19:05:57 +01:00 |
|
Martin Green
|
374caa0d9a
|
Fixeed spelling error in variable name
|
2023-04-30 19:01:07 +01:00 |
|
Martin Green
|
82aaa2b523
|
Improved cave form, layout text and validations
|
2023-04-30 19:00:22 +01:00 |
|
Martin Green
|
31a60ce85c
|
For a cave, force users to enter are and have a unique URL. Cope better if area not defined
|
2023-04-30 18:58:41 +01:00 |
|
Martin Green
|
ed9f7b03bf
|
Have entrance coordinates displayed to web pages. (Requires expo web entrance survey points to start with 1623 or 1626)
|
2023-04-30 00:59:58 +01:00 |
|
Martin Green
|
0b566575f3
|
Change uploaded images to jpg to png, for much smaller files
|
2023-04-29 22:49:26 +01:00 |
|
|
|
30ef427b90
|
refactor cave import
|
2023-04-22 22:05:12 +01:00 |
|
|
|
94b8b357fb
|
Fix entrance edit too, saving slug now
|
2023-04-22 03:26:53 +01:00 |
|
|
|
2ed66fe3d0
|
edit cave reads from HTML file not just db
|
2023-04-22 01:24:32 +01:00 |
|
|
|
116cfc7c6e
|
bad tests.
|
2023-04-06 00:57:19 +01:00 |
|
|
|
f15555a3bd
|
more tests
|
2023-04-06 00:51:04 +01:00 |
|
|
|
dcfff1ede7
|
tests for QM pages
|
2023-04-06 00:16:44 +01:00 |
|
|
|
d3d983eedb
|
QM check-box report for open leads
|
2023-04-05 23:13:12 +01:00 |
|
|
|
e002a634ff
|
remove obsolete setting, add PHOTOS_ROOT
|
2023-04-05 20:42:09 +01:00 |
|
|
|
489dd157b6
|
context processor documn link
|
2023-04-05 20:41:34 +01:00 |
|
|
|
0a76acd664
|
test checked
|
2023-04-05 12:46:10 +01:00 |
|
|
|
9ffe3f690b
|
tidy up entranceSlug all now deleted
|
2023-03-28 20:30:00 +01:00 |
|
|
|
e7d9e9402a
|
bugfixes
|
2023-03-28 20:05:38 +01:00 |
|
|
|
9a28e93ac6
|
EntranceSlug removed from data model.
|
2023-03-28 19:26:37 +01:00 |
|
|
|
5738da8566
|
cached_slug str now a .slug field & pending fixed
|
2023-03-28 19:08:05 +01:00 |
|
|
|
bbc13c4eb9
|
remove 'primary' concept from entrance slugs. tested.
|
2023-03-28 17:08:55 +01:00 |
|
|
|
6ca5d5bfa8
|
debug ent report
|
2023-03-28 15:37:25 +01:00 |
|
|
|
2091eb8e8b
|
remove unused versionControlForm
|
2023-03-28 14:19:06 +01:00 |
|
|
|
770edd6391
|
Survex editor now parses edited files
|
2023-03-23 19:05:25 +00:00 |
|
|
|
562ef48f19
|
re-parsing survex file when editing
|
2023-03-23 01:17:38 +00:00 |
|
|
|
70d6d9eb77
|
error msgs improved
|
2023-03-22 23:30:05 +00:00 |
|
|
|
2332bfdc57
|
comment to resolve confusion
|
2023-03-22 23:29:40 +00:00 |
|
|
|
1db7c5ffea
|
change on_delete to cascade for blocks in a file
|
2023-03-22 23:29:12 +00:00 |
|
|
|
838b358a4a
|
chnage template comment
|
2023-03-22 23:28:26 +00:00 |
|
|
|
dd32114698
|
delete test upload file after test
|
2023-03-22 17:57:48 +00:00 |
|
|
|
5f46d8fdc5
|
Fix bugs
|
2023-03-22 15:18:16 +00:00 |
|
|
|
ad48851118
|
re-enable login restriction on wallet create
|
2023-03-22 15:04:34 +00:00 |
|
|
|
ead3f8dc8b
|
fix broken tick-lists in wallets
|
2023-03-21 18:23:07 +00:00 |
|
|
|
6b3cb9f02e
|
samedate for all wallets on wallet edit form
|
2023-03-21 14:56:34 +00:00 |
|
|
|
435f3cf00b
|
fixed url glitch, added parent url
|
2023-03-21 14:29:15 +00:00 |
|
|
|
7caf1690c6
|
fix download .3d file
|
2023-03-21 12:56:51 +00:00 |
|
|
|
9489b9209d
|
obviate meaningless error messages
|
2023-03-18 20:32:35 +00:00 |
|
|
|
5a90e7b727
|
fix more twiddly variations of QMs
|
2023-03-18 03:03:06 +00:00 |
|
|
|
7345e3a328
|
Much QM re-engineering
|
2023-03-17 20:01:52 +00:00 |
|
|
|
de54576d11
|
Fix QMs reports, remove V grade
|
2023-03-17 14:33:30 +00:00 |
|
|
|
3011e7b114
|
Adding QM JSON export
|
2023-03-16 21:06:52 +00:00 |
|
|
|
a7660c8ec7
|
QM report updating
|
2023-03-14 16:11:37 +00:00 |
|
|
|
934a19b879
|
updated .svx template
|
2023-03-14 16:10:57 +00:00 |
|
|
|
c247636c4c
|
Working on QMn TICK lines again
|
2023-03-14 03:27:05 +00:00 |
|
|
|
85fab88ac9
|
Fixing inherited *date into sub-blocks
|
2023-03-14 02:12:28 +00:00 |
|
|
|
b428a87f1a
|
Better debug messages
|
2023-03-13 20:27:27 +00:00 |
|
|
|
94dd0fe1fd
|
documn. url reverse() tests
|
2023-03-12 23:40:11 +00:00 |
|
|
|
45fcaac47d
|
test revers() function
|
2023-03-12 16:21:31 +00:00 |
|
|
|
35e9eb558d
|
Identified survey length discrepencies
|
2023-03-12 01:09:17 +00:00 |
|
|
|
b88b142332
|
fixing bad splay detection
|
2023-03-12 00:35:37 +00:00 |
|
|
|
2c36666d41
|
tidy test fior git clean
|
2023-03-08 18:29:14 +00:00 |
|
|
|
301fa1fce1
|
re-enable lookup() on survexblock objects (again)
|
2023-03-08 18:02:00 +00:00 |
|
|
|
e71939fe00
|
restore lookup() function
|
2023-03-06 22:30:36 +00:00 |
|
|
|
432759bfc1
|
Import new survexfile ONLY
|
2023-03-06 16:37:54 +00:00 |
|
|
|
94e145adce
|
CASCADE fixes in data model
|
2023-03-06 16:37:38 +00:00 |
|
|
|
ccfc44a423
|
Saving new survex file parses contents.
|
2023-03-06 04:52:41 +00:00 |
|
|
|
8f3b329552
|
obscure bug empty directory inside empty directory
|
2023-03-05 23:55:00 +00:00 |
|
|
|
63dde36389
|
100th test
|
2023-03-05 23:17:11 +00:00 |
|
|
|
8fc25de794
|
Initial attempts at saving edited survex file
|
2023-03-05 23:06:06 +00:00 |
|
|
|
d5887e8f99
|
bloody bugs
|
2023-03-05 19:53:12 +00:00 |
|
|
|
b086348d38
|
Bugfixes for new survex file
|
2023-03-05 19:09:28 +00:00 |
|
|
|
4a2106183a
|
Bugfix for new survex file
|
2023-03-05 18:20:18 +00:00 |
|
|
|
06ac840dd0
|
Needed for django 4.2 admin pages
|
2023-03-05 17:46:01 +00:00 |
|
|
|
6ab7a340e2
|
Now 99 tests
|
2023-03-03 15:15:17 +00:00 |
|
|
|
5c3927c25d
|
all working, queries improved, date-ordered.
|
2023-02-27 22:23:24 +00:00 |
|
|
|
154722f765
|
logbook trips, and some wallets working.
|
2023-02-27 19:14:08 +00:00 |
|
|
|
6387de038b
|
get events on same date.progress.
|
2023-02-27 16:42:08 +00:00 |
|
|
|
6de4fa66a2
|
Initial add of On This Day links to svx file page
|
2023-02-26 22:13:37 +00:00 |
|
|
|
394d94d5d6
|
Extended test
|
2023-02-24 23:12:44 +00:00 |
|
|
|
a3fc9a17ed
|
New tests for parsing logbooks
|
2023-02-24 22:55:18 +00:00 |
|
|
|
3d38611e4f
|
new test for logbook
|
2023-02-24 20:21:06 +00:00 |
|
|
|
d1dac92034
|
Now using HTTP status codes properly
|
2023-02-24 17:38:06 +00:00 |
|
|
|
709b720be9
|
Update URLs to django documn version
|
2023-02-10 00:05:04 +00:00 |
|
|
|
19d9942676
|
Django 3.0 deprecations removed
|
2023-02-09 20:54:55 +00:00 |
|
|
|
0740f9ea5a
|
More todos
|
2023-02-08 23:37:00 +00:00 |
|
|
|
175e71facf
|
Many many bugs fixed for >1 svx file on a wallet
|
2023-02-03 22:19:51 +00:00 |
|
|
|
c1231ff451
|
refactored and most recent wallet link fixed
|
2023-02-03 17:13:29 +00:00 |
|
|
|
e70d51e52b
|
Made JSON visible on wallet edit page
|
2023-02-03 11:34:38 +00:00 |
|
|
|
f7d91b5929
|
todo updates
|
2023-02-02 22:02:16 +00:00 |
|
|
|
e94a24bbd4
|
to-do lists updates
|
2023-02-02 21:50:40 +00:00 |
|
|
|
e0a198bac5
|
Added 'Notes not needed' checkbox
|
2023-02-02 17:39:56 +00:00 |
|
|
|
25e00e02b7
|
Complete set of todo strings on webpage
|
2023-02-02 16:15:13 +00:00 |
|
|
|
9abfcdd091
|
re enable
|
2023-02-02 14:57:44 +00:00 |
|
|
|
18541de371
|
test file permissions
|
2023-02-02 14:51:20 +00:00 |
|
|
|
578f02db2d
|
Better diagnostics from bad slug error
|
2023-02-02 11:19:46 +00:00 |
|
|
|
3b9695b4f3
|
spiders are asking for weird urls
|
2023-02-02 11:13:02 +00:00 |
|
|
|
9d1c0ac395
|
Setting wallet dates earlier in the import process
|
2023-02-01 23:43:05 +00:00 |
|
|
|
c7d88077ec
|
renamed wallet form file
|
2023-02-01 21:58:48 +00:00 |
|
|
|
5798e8dcd5
|
make nav cope with missing wallets
|
2023-02-01 21:31:07 +00:00 |
|
|
|
5ae37eef82
|
Fix to not create an extra wallet
|
2023-02-01 19:31:29 +00:00 |
|
|
|
587ccff501
|
date handling now working for new wallet
|
2023-02-01 19:10:46 +00:00 |
|
|
|
8e51f3aff8
|
Dedicated 'Create' button for a new wallet
|
2023-02-01 17:21:33 +00:00 |
|
|
|
e38d29f33d
|
menu change to go to latest blank wallet
|
2023-01-31 20:52:22 +00:00 |
|
|
|
3c7661836c
|
New wallet goes to next available slot now
|
2023-01-31 20:28:39 +00:00 |
|
|
|
1f5b56a593
|
Wallet editor into separate file
|
2023-01-31 17:13:41 +00:00 |
|
|
|
3aca0d0c76
|
ruf cleanup imports, bigly.
|
2023-01-30 23:04:11 +00:00 |
|
|
|
e35fccea5d
|
Removed unused properties and moving
|
2023-01-30 22:27:17 +00:00 |
|
|
|
7808005498
|
ran 'black' to reformat all the core files
|
2023-01-30 19:04:36 +00:00 |
|
|
|
a12f666e96
|
Remove unneeded Class ExpeditionDay
|
2023-01-30 16:42:56 +00:00 |
|
|
|
ebe86d73d4
|
Renaming class - step 3 complete
|
2023-01-30 16:27:01 +00:00 |
|
|
|
b29ff61871
|
Renaming class step 2
|
2023-01-30 16:18:19 +00:00 |
|
|
|
58f7cf72d4
|
renaming confusing Class, step 1
|
2023-01-30 16:07:44 +00:00 |
|
|
|
3742e0f367
|
fixing Sunday display on calendar
|
2023-01-30 15:28:11 +00:00 |
|
|
|
7d98980121
|
Fixing dates on expedition table
|
2023-01-29 22:11:00 +00:00 |
|
|
|
89d0e1723e
|
fixing cyclic import problem
|
2023-01-29 21:45:51 +00:00 |
|
|
|
226cbb6b5c
|
Fixed coloured T and S on expo calendar
|
2023-01-29 20:59:56 +00:00 |
|
|
|
a1c34f488d
|
bugfix from rearranged model files
|
2023-01-29 18:17:43 +00:00 |
|
|
|
79bccade02
|
separated out ent locations from survex parser
|
2023-01-29 17:03:50 +00:00 |
|
|
|
5639435058
|
Moved Logbooks to separate model file
|
2023-01-29 16:47:46 +00:00 |
|
|
|
432be660a4
|
separated out Model for wallet to its own file
|
2023-01-29 16:23:58 +00:00 |
|
|
|
f73640522b
|
More public debug reports
|
2023-01-29 12:41:50 +00:00 |
|
|
|
d9d4181dda
|
Add new survex import report
|
2023-01-29 12:11:47 +00:00 |
|
|
|
071f68080c
|
Inherit *team to anonymous survex blocks
|
2023-01-29 01:30:10 +00:00 |
|
|
|
0d9d307490
|
refactor to reduce db hits and fix *team
|
2023-01-28 21:00:38 +00:00 |
|
|
|
9e71be8169
|
refactored, global removed
|
2023-01-28 13:14:54 +00:00 |
|
|
|
e01bd39609
|
refactored logbooks parser
|
2023-01-27 23:21:07 +00:00 |
|
|
|
6565b3f9c4
|
refactored, faster deletion prior to loading
|
2023-01-27 17:41:10 +00:00 |
|
|
|
2fee216e80
|
Remove logdataissues from TROG
|
2023-01-27 17:24:31 +00:00 |
|
|
|
75834902f2
|
new report on tehrion file parsing
|
2023-01-26 23:36:56 +00:00 |
|
|
|
719e0fe918
|
therion issues report
|
2023-01-26 22:36:49 +00:00 |
|
|
|
be9fcc522a
|
sort imports using isort. tested.
|
2023-01-19 18:35:56 +00:00 |
|
|
|
1b70ccea3e
|
consistent tests with logbooks junk removal
|
2023-01-16 19:52:05 +00:00 |
|
|
|
1ab7528f7b
|
Clean up unused templates. All checked.
|
2022-12-29 15:07:58 +00:00 |
|
|
|
de74cd4867
|
tidy up
|
2022-12-29 13:56:46 +00:00 |
|
|
|
9dc1853e10
|
cope with bad wallet name
|
2022-12-29 13:56:09 +00:00 |
|
|
|
78740a1fc0
|
remove logbooksearch, use site-wide search on server
|
2022-12-29 13:54:38 +00:00 |
|
|
|
b131e567b5
|
logbooksearch ?
|
2022-12-29 13:52:37 +00:00 |
|
|
|
5bbb363f12
|
Adding docstrings, deleting unused code
|
2022-12-23 23:32:59 +00:00 |
|
|
|
8374500da5
|
Put colour bar on wallet editor
|
2022-12-23 22:14:00 +00:00 |
|
|
|
a72c2bd96a
|
Using Path() wherever possible in localsettings.py
|
2022-12-22 16:04:16 +00:00 |
|
|
|
ec040824f6
|
fix frontmatter/endmatter
|
2022-12-21 02:05:26 +00:00 |
|
|
|
f24f283a07
|
attempted speedup, explicit dates wallet objects
|
2022-12-20 00:07:55 +00:00 |
|
|
|
bb14c94ab1
|
Updates to make 2018 blog merge work (faster)
|
2022-12-19 20:13:26 +00:00 |
|
|
|
d1b94763b4
|
Fixing wiki-parsing for 2009 logbook
|
2022-12-18 19:33:56 +00:00 |
|
|
|
73b710d53f
|
fix more logbook parsing
|
2022-12-17 17:05:55 +00:00 |
|
|
|
f80e4efed8
|
parse several UK caving blogs per year - working
|
2022-12-16 19:57:56 +00:00 |
|
|
|
cabcada0b8
|
2003 logbook export/re-import as now HTML format
|
2022-12-09 23:45:07 +00:00 |
|
|
|
1eab261b30
|
fix bugs made visible by py 3.11
|
2022-11-23 21:59:42 +00:00 |
|
Philip Sargent
|
b06d1dae42
|
Convert.format() to f-strings with flynt
|
2022-11-23 10:48:39 +00:00 |
|
Philip Sargent
|
1a9e17a7e8
|
remove entry-type and tidy cache bits
|
2022-11-23 00:36:44 +00:00 |
|
Philip Sargent
|
995df16bec
|
bugfix length declaration
|
2022-11-21 16:52:10 +00:00 |
|
Philip Sargent
|
a795707552
|
cache tidy and move settings into parser
|
2022-11-21 16:41:52 +00:00 |
|
Philip Sargent
|
bcb61f9cd9
|
remove cache and setdatesfromlogbook
|
2022-11-21 16:26:30 +00:00 |
|
Philip Sargent
|
2cafa32c7e
|
links to other years wallets
|
2022-10-18 23:28:38 +03:00 |
|
Philip Sargent
|
830150ade6
|
Making page templates autoadjust to the current year
|
2022-10-15 21:28:56 +03:00 |
|
Philip Sargent
|
55ac98ebe1
|
Add survex trips to logbook mentions
|
2022-10-15 19:33:30 +03:00 |
|
Philip Sargent
|
454c2c2830
|
Fix links to scans directly from the master drawings list
|
2022-10-15 18:37:46 +03:00 |
|
Philip Sargent
|
2fa298cae9
|
cures weird bug
|
2022-10-15 17:26:09 +03:00 |
|
Philip Sargent
|
3b106a3803
|
fix PCTEXT better in dis-laying tunnel files
|
2022-10-15 17:25:41 +03:00 |
|
Philip Sargent
|
da09bc7968
|
Render tunnel files as XML in webpage, not just text
|
2022-10-15 14:07:15 +03:00 |
|
Philip Sargent
|
e0ac09d5ec
|
add 'lastvisit' field to entrances, for the date
|
2022-10-12 23:12:55 +03:00 |
|
Philip Sargent
|
45f06293f5
|
Add 'foreign friends' to names alias list
|
2022-10-12 23:10:48 +03:00 |
|
Philip Sargent
|
b81b4ef2ef
|
Add date of update to the generated html file
|
2022-10-12 22:09:58 +03:00 |
|
Philip Sargent
|
52c0ab213a
|
Person twiddles
|
2022-10-11 21:47:18 +03:00 |
|
Philip Sargent
|
39683cc413
|
TIdy and docum of cave entry code
|
2022-10-11 21:01:02 +03:00 |
|
Philip Sargent
|
8c8b6966a7
|
sort output, accept more comma use
|
2022-10-10 00:28:57 +03:00 |
|
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 |
|
