Philip Sargent
|
b2a26be8c8
|
change photo to GPS guide: more useful
|
2022-08-16 15:28:27 +03:00 |
|
Philip Sargent
|
dcc36f3286
|
Docum for creating empty wallet
|
2022-08-16 14:19:25 +03:00 |
|
Philip Sargent
|
284e044a03
|
Fix wallets scan upload faults
|
2022-08-14 22:52:14 +03:00 |
|
Philip Sargent
|
a0a1927437
|
removed outdated text
|
2022-08-11 21:57:23 +03:00 |
|
Philip Sargent
|
3607b9f140
|
enable photo file rename
|
2022-08-11 21:19:52 +03:00 |
|
Philip Sargent
|
61c04a1fb9
|
removing links to most old-style wallets pages
|
2022-08-01 17:46:54 +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
|
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
|
5da1fce41f
|
tidy links
|
2022-07-31 19:33:14 +03: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
|
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
|
c39fb30707
|
new urls and dummy functions and rename
|
2022-07-27 23:24:51 +03:00 |
|
Martin Green
|
7090bab632
|
closed form for search item in right hand menu
|
2022-07-26 15:56:31 +01:00 |
|
Philip Sargent
|
cddcb0e321
|
fix minor bug in setting dummy entrance
|
2022-07-25 11:31:43 +03:00 |
|
Philip Sargent
|
7785843597
|
error msg when no .pos file
|
2022-07-25 04:10:28 +03:00 |
|
Philip Sargent
|
f194126fb5
|
better error description
|
2022-07-22 13:41:47 +03:00 |
|
Philip Sargent
|
31b912f3ca
|
bugfixes
|
2022-07-22 12:40:42 +03:00 |
|
Philip Sargent
|
c747664a26
|
Better links for 2022
|
2022-07-21 19:34:52 +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
|
dd0a448f90
|
fix 3d file download on cave page
|
2022-07-21 01:22:07 +03:00 |
|
Philip Sargent
|
3ab8a5d1ad
|
layout tidy
|
2022-07-21 00:40:03 +03:00 |
|
Philip Sargent
|
0a158db97d
|
Trial QM tick mechanism in survex files
|
2022-07-20 20:47:29 +03:00 |
|
Philip Sargent
|
de37eea167
|
typo 290 instead of 291
|
2022-07-20 17:25:36 +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
|
23462df49c
|
bugfix
|
2022-07-19 19:06:56 +03:00 |
|
Philip Sargent
|
3db9c16082
|
add Homecoming to QMs list
|
2022-07-18 19:19:30 +03:00 |
|
Philip Sargent
|
8484f26ee9
|
Fix URL links and better name display
|
2022-07-18 16:16:58 +03:00 |
|
Philip Sargent
|
b7035f1574
|
more helpful message
|
2022-07-17 16:07:27 +03:00 |
|
Philip Sargent
|
7c82c2d97c
|
rename
|
2022-07-17 15:01:25 +03:00 |
|
Philip Sargent
|
810e058c07
|
new complaints messages for wallet
|
2022-07-17 15:00:37 +03:00 |
|
Martin Green
|
d4c213e0b3
|
Merge branch 'python3-new' of ssh://expo.survex.com/home/expo/troggle into python3-new
|
2022-07-15 14:06:43 +01:00 |
|
Martin Green
|
3748840e23
|
Removed extranious characters where there is one unnnumbered entrance.
|
2022-07-15 14:05:48 +01:00 |
|
Philip Sargent
|
02cf9b1c22
|
fixing Beckas complaint
|
2022-07-15 16:04:07 +03:00 |
|
Martin Green
|
a1560c60c6
|
Added kataster number to cave heading
|
2022-07-15 13:42:58 +01:00 |
|
Philip Sargent
|
d3572e18c3
|
QM reports all working
|
2022-07-06 17:35:08 +03:00 |
|
Philip Sargent
|
ee4237b14c
|
cleaner template pages
|
2022-07-06 13:44:40 +03:00 |
|
Philip Sargent
|
848043f7f4
|
Linkt to QMs on cave page
|
2022-07-06 11:39:19 +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
|
96101252bd
|
Documn link
|
2022-07-05 17:40:31 +03:00 |
|
Philip Sargent
|
9d4a97fc19
|
Tidy HTML output
|
2022-07-05 17:02:43 +03:00 |
|
Philip Sargent
|
c9a33a4010
|
bug fix for forgotten href
|
2022-07-05 16:34:08 +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
|
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
|
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
|
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 |
|
|
64f89be6a9
|
docm .3d file generation for CaveView
|
2021-11-06 23:57:51 +02:00 |
|
|
73ffb509f7
|
CaveView status is now documented
|
2021-11-06 22:59:10 +02:00 |
|
|
5723f57fc5
|
Add crossrefs to handbook UTM pages, laser points
|
2021-11-06 00:15:24 +02:00 |
|
|
bf5d0556fc
|
remove broken and ancient AERW map images
|
2021-10-26 19:00:18 +03:00 |
|
|
c774b14e04
|
remove unused JS code after checking it is redundant
|
2021-10-26 01:02:27 +03:00 |
|
|
b6bbec235c
|
Remove refs to absent and unused JS & CSS
|
2021-10-25 01:00:02 +03:00 |
|
|
5533029072
|
tried old jquery CSS
|
2021-10-25 00:38:24 +03:00 |
|
|
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 |
|
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
|
213ada4ae9
|
unused app pending deletion
|
2021-03-25 16:13:58 +00:00 |
|
Philip Sargent
|
65be64c756
|
type data added to report
|
2021-03-24 21:16:06 +00:00 |
|
Philip Sargent
|
9a91487375
|
pathlib for path management & cavelist fixes
|
2021-03-24 15:46:35 +00:00 |
|
Philip Sargent
|
7f37327bcd
|
Fixing cave list webpage
|
2021-03-24 00:55:36 +00:00 |
|
Philip Sargent
|
a9fa251fee
|
now robust re svx in folders unofficial numbers
|
2021-03-23 17:35:41 +00:00 |
|
Philip Sargent
|
a0c3ef8ea1
|
comments on urls resolution re apache & bugfix
|
2021-03-21 01:37:52 +00:00 |
|
Philip Sargent
|
5836c6ff90
|
Importing old logbooks
|
2021-02-06 00:18:48 +00:00 |
|
Philip Sargent
|
a4d7183260
|
Added link to Kataster list on link to new cave form
|
2020-08-02 23:54:14 +01:00 |
|
Philip Sargent
|
42456e8e98
|
fix server instructions + comment in stats output
|
2020-07-28 01:46:00 +01:00 |
|
Philip Sargent
|
0094cf7054
|
clean troggle menu and drawingfiles layout
|
2020-07-28 01:22:06 +01:00 |
|
Philip Sargent
|
57b8242f7e
|
utf-8 templates .gitignore
|
2020-07-28 00:08:34 +01:00 |
|
Philip Sargent
|
f1ceb38f5f
|
fix for no comma after lat item in django template
|
2020-07-26 21:11:29 +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
|
8530b0643d
|
person attribution of surveyed length working
|
2020-07-06 01:24:43 +01:00 |
|
Philip Sargent
|
3f9971d2ee
|
title and wallet folders working in /survexfile/258
|
2020-07-05 17:22:26 +01:00 |
|
Philip Sargent
|
5be41c8163
|
splays and alias splays implemented
|
2020-07-04 13:31:46 +01:00 |
|
Philip Sargent
|
6cd660982c
|
More informative html in templates
|
2020-07-02 16:24:39 +01:00 |
|
Philip Sargent
|
122cdd7fc8
|
replace GetCaveByReference
|
2020-06-28 01:50:34 +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
|
4a51de95c4
|
Django 1.11.19 runs clean on pre-built db.
|
2020-06-18 22:44:41 +01:00 |
|
Philip Sargent
|
b153fafa9f
|
django 1.8.19
|
2020-06-16 22:16:48 +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
|
d4deea2019
|
remove tinyMCE more
|
2020-06-14 10:05:25 +01:00 |
|
Philip Sargent
|
269b8840ad
|
import fixes & statistics table
|
2020-06-12 18:10:07 +01:00 |
|
Philip Sargent
|
b9a223c049
|
Fix to /caves/ != /caves
|
2020-06-12 14:54:00 +01:00 |
|
Philip Sargent
|
db37710b90
|
fixes: stopped storing survex legs
|
2020-06-12 14:52:00 +01:00 |
|
Philip Sargent
|
092c8bb913
|
stopped storing survex legs
|
2020-06-12 14:06:03 +01:00 |
|
Philip Sargent
|
72fd57ef76
|
Rearranged caveindex page
|
2020-06-07 16:12:52 +01:00 |
|
Philip Sargent
|
ac9ac5e397
|
Remove unused Survey object
|
2020-06-04 23:16:26 +01:00 |
|
Philip Sargent
|
43c6e2f2e1
|
dlete todo page, partly fix other url pages
|
2020-06-04 23:00:58 +01:00 |
|
Philip Sargent
|
b7fea2042f
|
merge exptl & stats, delete millenial & eyecandy
|
2020-06-04 21:57:04 +01:00 |
|
Philip Sargent
|
90dc3dac3b
|
Change troggle horizontal menu items
|
2020-06-01 17:41:41 +01:00 |
|
Philip Sargent
|
f949bb8dc0
|
python3 fixes for djsngo admin pages
|
2020-05-31 22:35:36 +01:00 |
|
Philip Sargent
|
5d89cf9474
|
Delete SURVEYS.CSV code
|
2020-05-31 21:03:40 +01:00 |
|
Philip Sargent
|
09aedecc3b
|
Unicode fix for SVX display and edit page
|
2020-05-31 20:46:12 +01:00 |
|
Philip Sargent
|
d857cc9084
|
format tidy & normalise paths in survex *inlcude
|
2020-05-30 02:35:05 +01:00 |
|
Philip Sargent
|
df3917a677
|
Expunge cavetab
|
2020-05-28 02:20:50 +01:00 |
|
Philip Sargent
|
d4ac28af18
|
Remove PHOTOS_ROOT and DPhoto class
|
2020-05-15 21:32:55 +01:00 |
|
Philip Sargent
|
ccc5813b3f
|
indent recursion and update comments
|
2020-05-14 17:21:34 +01:00 |
|
Expo on server
|
13d3f37f05
|
menu update
|
2020-05-13 19:59:41 +01:00 |
|
Expo on server
|
2918b4b92c
|
Add simple search function to default menu
|
2020-05-02 04:14:32 +01:00 |
|
|
0b85a9d330
|
adding sync to databaseRest and cleaning a template
|
2020-04-19 23:35:41 +01:00 |
|
|
98fd314a62
|
Prevent that annoying popup from Google offering to translate the page from German
|
2020-04-11 18:10:09 +01:00 |
|
|
d71e31417b
|
scanned image files importing
|
2020-04-09 02:40:32 +01:00 |
|
|
fbe6c0c859
|
rearrange main menu
|
2020-04-03 01:11:30 +01:00 |
|
|
867479e05d
|
Fixing my earlier mistake these are xml not html
|
2020-03-02 17:08:49 +00:00 |
|
|
cdef395f89
|
New troggle report on defined directory paths
|
2020-02-27 00:58:09 +00:00 |
|
Philip Sargent
|
d170a3c36e
|
add shortcut for logbooks & note explaining notability metric
|
2020-02-24 21:49:01 +00:00 |
|
Philip Sargent
|
de14ecea22
|
Fixing back mistaken chnage
|
2020-02-20 01:42:52 +00:00 |
|
Philip Sargent
|
04fb2e8701
|
DOCTYPE update for template for generated files
|
2020-02-19 21:48:37 +00:00 |
|
Philip Sargent
|
c1439bed8d
|
Adding <pre> and </pre> to the logbook entry display so that all the paragraphs are not munged into one when displayed. Untested.
|
2020-02-19 21:47:13 +00:00 |
|
|
56618dbe65
|
fix CUCC url in template and add years to 2020
|
2019-12-23 19:40:44 +00:00 |
|
Expo on server
|
71ef710d09
|
Fix the location of the cave view javascript
|
2019-12-08 10:53:43 +00:00 |
|
Sam Wenham
|
4ebf3d8a0e
|
Bring back TinyMCE for editing flatpages
|
2019-07-10 12:32:04 +01:00 |
|
Sam Wenham
|
97426a0ddb
|
Backed out changeset: 4552f42bdf54
|
2019-06-26 20:57:24 +01:00 |
|
Sam Wenham
|
8a1be45aac
|
Remove this stupid hard coded name match
|
2019-06-26 20:56:08 +01:00 |
|
Sam Wenham
|
b2dd905f0e
|
Allow html chars in names
|
2019-06-26 18:36:08 +01:00 |
|
Sam Wenham
|
23df89cf31
|
Fix CSRF issues in svx form
Set date formats
Add DataIssue model and add errors to it to allow us to give people a list of
stuff to fix
|
2019-04-14 22:45:31 +01:00 |
|
Sam Wenham
|
d1d0c24ed8
|
Sort people by notability
Better errors and tidy
Nicer date formats
|
2019-04-02 02:04:38 +01:00 |
|
Sam Wenham
|
9df91b221b
|
Support html and wiki logbook entrys
Move nearest_station to nearest_station_name and make nearest_station a foreign
key to SurvexStation
Lots of tidying
|
2019-03-31 15:39:53 +01:00 |
|
Sam Wenham
|
64a4842dcb
|
Remove the redundant render_with_context() as django now does this just with the
render() shortcut
Move from mimetype to content_type, missed in last commit
|
2019-03-30 17:02:07 +00:00 |
|
Sam Wenham
|
a4532a29da
|
Update new management command for DB reset
Switch to content_type from mimetype
Make DB reset not nuke so much
Tidy logbook parser
|
2019-03-30 13:58:38 +00:00 |
|
Wookey
|
705dd51f30
|
Only show unofficial number if it's not already displayed
|
2019-03-27 01:59:09 +00:00 |
|
expoonserver
|
f8be510509
|
Display temporary numbers on main cave index, when they exist.
|
2019-03-26 23:58:27 +00:00 |
|
Sam Wenham
|
121f0a6aac
|
Remove the news section as it never gets updated
Fix logbook entry so the edit link works
Tidy the control panel page
|
2019-03-10 11:05:57 +00:00 |
|
Sam Wenham
|
8932bdc466
|
Remove jquery.min.js from troggle as it busts the footer menu. Yep troggle has a footer menu!!
|
2019-03-09 19:32:00 +00:00 |
|
Sam Wenham
|
b4296f1736
|
Fix people list
Cope with Jimmy McFoo as a name!
Don't set the top expo value in the code whin it is piss easy to calculate
Fix typo from last commit
|
2019-03-09 18:21:10 +00:00 |
|
Sam Wenham
|
1bac650aee
|
There is no point having two functions do basicaly the same thing so make the
load all logbooks call load logbook(expo)
Remove the return message from load logbook as it isn't used
|
2019-03-09 11:18:44 +00:00 |
|
Sam Wenham
|
9fc80bed35
|
Make the logbook parser a little more sane
Move the parser to expo mapping to settings
Set a default parser
Iterate over the expo years rather than the mapping list!
|
2019-03-06 23:20:34 +00:00 |
|
|
4148ece133
|
Messing with millenialcaves.html or similar
|
2019-02-26 12:07:45 +00:00 |
|
|
53513b812b
|
Messing with millenialcaves.html or similar
|
2019-02-26 12:01:55 +00:00 |
|
|
622d523c98
|
Messing with millenialcaves.html or similar
|
2019-02-26 01:12:14 +00:00 |
|
|
a397eb9d00
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:48:34 +00:00 |
|
|
b2adc285b6
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:45:56 +00:00 |
|
|
8af604262d
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:43:46 +00:00 |
|
|
b33ca2b290
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:43:05 +00:00 |
|
|
5154c0d8e5
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:29:16 +00:00 |
|
|
b01fcc3a6d
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:23:23 +00:00 |
|
|
e8585bec42
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:22:58 +00:00 |
|
|
e5fa636776
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:17:56 +00:00 |
|
|
6beaf4afdd
|
Messing with millenialcaves.html or similar
|
2019-02-26 00:17:11 +00:00 |
|
|
3254ba1443
|
|
2019-02-26 00:00:34 +00:00 |
|
|
4c3d0ce7fa
|
|
2019-02-25 23:55:06 +00:00 |
|
|
a99afe07c6
|
|
2019-02-25 23:53:19 +00:00 |
|
|
73bb60eff9
|
|
2019-02-25 23:52:47 +00:00 |
|
|
0a214c5d4b
|
|
2019-02-25 23:51:26 +00:00 |
|
|
3746dab5de
|
|
2019-02-25 23:46:52 +00:00 |
|
|
ee2cd0d391
|
trying to add new field
|
2019-02-25 23:40:53 +00:00 |
|
|
78a5f656b9
|
added Rad's playground
|
2019-02-25 22:24:33 +00:00 |
|
|
becfaa1504
|
change to table
|
2019-02-25 20:58:32 +00:00 |
|
Sam Wenham
|
4ad5b68433
|
Make things more compatiable with newer python
Fix the expeditions list
Improvements to make it compatiable with django 1.8
Bump the years to add 2018
Update the .hgignore file to ignore junk
|
2019-02-24 13:03:34 +00:00 |
|
Sam Wenham
|
a1f02e575f
|
Prevent troggle adding the menu if there is one in the file
Add a Docker compose file to bring up a dev troggle easily
Various PEP improvments
|
2019-02-23 15:30:58 +00:00 |
|
Sam Wenham
|
f58b1db920
|
Don't create years that aren't here yet troggle goes boom
|
2018-06-20 18:14:13 +01:00 |
|
Sam Wenham
|
3d2ac06a72
|
Move the years on a bit
|
2018-06-20 18:11:12 +01:00 |
|
Sam Wenham
|
46124a770f
|
Fix the django for the spinny js cave viewer.
Make the paths settings (don't hard code things like this!!)
Add " round spinny urls from the late merge (the rest were done for the move off 1.4.2
|
2018-04-20 20:55:12 +01:00 |
|
Sam Wenham
|
6f6327d267
|
Merge with django-upgrade
|
2018-04-17 22:19:20 +01:00 |
|
expoonserver
|
6710a469ee
|
Add CaveView spinny caves view to each troggle cave page
|
2018-04-17 21:57:02 +01:00 |
|
Sam Wenham
|
ffb5d7bdda
|
Upgrade to django 1.5, some functions have been changed
url in templates now requires quotes roung the first arg
USE_TZ added
|
2018-04-11 22:02:57 +01:00 |
|
Wookey
|
f0e1406c5f
|
Update old website base URL in template from cucc.survex.com/expo to expo.survex.com
|
2018-02-28 15:55:00 +00:00 |
|
Sam Wenham
|
27fca090fc
|
Bring troggle a little more up to date
|
2016-09-04 13:47:26 +01:00 |
|
expo
|
716131f005
|
Fix cave pages to have entrances and description on one page.
Fixes broken links on description and entrance pages.
Removes need for jquery-ui.
|
2016-07-02 23:42:47 +01:00 |
|
Wookey
|
edc6591554
|
Correct typo on cave and entrance template files
('If you edit this files...')
|
2016-01-27 04:24:44 +00:00 |
|
Sam Wenham
|
480541ae54
|
Add a little style
|
2015-06-28 13:52:33 +01:00 |
|
Sam Wenham
|
60303d041c
|
Remove unnecessary escape slashes
|
2015-06-28 13:46:28 +01:00 |
|
expo
|
a4651eaa0a
|
Added warnings that the database will need updating is cave or entrance data files are modified
|
2015-06-21 15:11:51 +01:00 |
|
expo
|
4771f52b20
|
Have different links for system js files and troggle js files
|
2015-06-21 15:06:44 +01:00 |
|
Wookey
|
d29fe2ee1c
|
Merge in Sam's parser debugging
|
2015-04-08 03:27:48 +01:00 |
|
Sam Wenham
|
3010961383
|
Try and ignore files that don't end .html (We really need to change to .xml) eg .html.orig!!
Change the index on troggle to move on with the year
|
2015-01-19 21:28:35 +00:00 |
|
Wookey
|
5ff759db93
|
Fix templates to use system javascript for jquery, jquery-ui and
jquery-ui themes
|
2014-09-11 07:38:45 +01:00 |
|
expo
|
da71cca22f
|
Prospecting guide and images and few minor other things.
|
2013-08-01 17:00:01 +02:00 |
|
Wookey
|
5351108ec1
|
merged in proper CSRF changes from server
|
2013-07-02 20:23:55 +01:00 |
|
Wookey
|
d1ad8730d7
|
Add CSRF protection to registration form (and remove annoying second
password)
|
2013-07-02 18:10:45 +01:00 |
|
wookey
|
f3a570a21d
|
Add csrf token to registration forms
|
2013-07-02 17:26:35 +01:00 |
|
wookey
|
7f108f6d9a
|
Set title to show 1976-2013
Put quick link to 2011 back as that one works
|
2013-07-02 00:33:53 +01:00 |
|
wookey
|
ccd80e74f8
|
Change template headers to show 2012/2013 as shortcuts
|
2013-06-23 03:19:41 +01:00 |
|
Martin
|
cfc90deb83
|
Merge
|
2012-08-14 23:49:26 +02:00 |
|
Martin
|
1a0e577606
|
Bug fixing of cave and entrance forms removal of slugs
|
2012-08-14 22:51:15 +02:00 |
|
Martin
|
8e64062214
|
added entrance locations
|
2012-08-14 15:08:08 +02:00 |
|
expo
|
ecd5bbcb1d
|
Started removing foreignkeys to caves, to achieve greater flexability. Some log book entries stuff may be broken. Add ability to make new caves and entrances via website.
|
2012-08-12 19:10:23 +02:00 |
|
Martin Green
|
6d5babd331
|
Prospecting template
|
2012-08-10 19:34:44 +02:00 |
|
Martin Green
|
79b7d32664
|
Made a prospecting guide and fixed survex station description. Removed parsing of underground descriptions to wikis.
|
2012-08-10 19:02:13 +02:00 |
|
expo
|
1ef274ec1d
|
Editing no longer changes files more than nesecary. Removed TinyMCE editing. /Sumbit/Submit
|
2012-08-06 12:19:48 +02:00 |
|
expo
|
0f5627505f
|
Fix broken markup
|
2012-08-05 21:37:46 +02:00 |
|
expo
|
9654e5da1c
|
FIx base template so admin link, expoweb link work and use consistent base URL
|
2012-08-05 02:33:48 +02:00 |
|
Martin Green
|
711fefb0da
|
Start to change dataformat for caves, along with there editing. Start to change survex reader to cope better with equates/tags.
|
2012-06-10 14:59:21 +01:00 |
|
Martin Green
|
fd12e70f78
|
Editing for entrances along with caves
More detailed display of entrances
|
2012-05-23 09:23:40 +01:00 |
|
Martin Green
|
fac89bae30
|
Render a cave editing page. Nb it does not do save anything yet.
|
2012-01-07 19:05:25 +00:00 |
|
Martin Green
|
c623acf832
|
template changes. Fix link to css.
|
2011-08-08 12:40:47 +01:00 |
|
Martin Green
|
36b1888f46
|
Added 'page not found do you wnat to make this page' page. Minor tweaks
|
2011-08-08 12:18:47 +01:00 |
|