2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-24 16:21:53 +00:00
Commit Graph

2597 Commits

Author SHA1 Message Date
Martin Green
66ee96cd63 Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle 2023-07-05 21:11:04 +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
Expo laptop Crowley
7b8e93cdb5 menus and logbook 2023-07-05 21:54:25 +02:00
Expo laptop Crowley
4158f5ba63 add 2023 2023-07-05 20:17:08 +02:00
Martin Green
a70cf6cad3 Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle 2023-07-05 18:27:49 +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
a0fcb78e95 Removed kataster area for unoffical numbers of pending caves. Added .html to urls of pending caves. 2023-07-05 18:21:15 +01:00
Expo laptop Crowley
745ccd7f88 Show when running locally 2023-07-05 19:05:07 +02:00
Martin Green
2b30b7b624 Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle 2023-07-05 17:45:21 +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
Expo laptop Crowley
d2bcef6e36 Turn menu bar magenta if running on localserver 2023-07-05 18:35:40 +02:00
Martin Green
067fcd9892 Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle 2023-07-05 13:19:11 +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
Expo laptop Crowley
020a083afa more fix 2023-07-05 13:09:49 +02:00
Expo laptop Crowley
fd9f21de2e more local fixups 2023-07-05 12:49:30 +02:00
Expo laptop Crowley
7268eb4f30 synch localsettings variants 2023-07-05 12:11:44 +02:00
Expo laptop Crowley
910e0e3123 updating requirements for testing 2023-07-05 11:22:31 +02:00
Expo laptop Crowley
7db17154ad ugh stage problem 2023-07-05 11:22:31 +02:00
Expo laptop Crowley
ebcc0db665 ugh stage problem 2023-07-05 11:22:31 +02:00
Expo on server
73675ca1b9 Radost fiux for narrow screens 2023-07-05 10:22:30 +01:00
Martin Green
973d05f9fb Modification to templates to make them more suitable on a stand alone website. 2023-07-03 21:35:00 +01:00
Martin Green
52299fb6fd Add links to entrances page 2023-07-03 09:32:34 +01:00
Martin Green
01964e7cf6 Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle 2023-07-03 08:06:45 +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
a04d9ef056 capitalisation fix 2023-06-28 20:37:06 +01:00
Martin Green
e4fe5eaf5d removed extranius bracket from html 2023-06-08 01:10:07 +01:00
Martin Green
c7494fe379 bug fix 2023-06-07 23:49:19 +01:00
Martin Green
e4112431be bug fix 2023-06-07 23:47:14 +01:00
Martin Green
65eec8e91d attempt to use {% url %} tag to point at 3d file for cave viewer 2023-06-07 23:44:44 +01:00
Martin Green
0b0f2f07e1 Try having caveviewer using same url as download link again 2023-06-07 23:25:25 +01:00
Martin Green
ee34f87563 Replaced cave viewer link to 3d file with the working orginal 2023-06-07 23:20:51 +01:00
Martin Green
e42f0569fd Made the sources of the 3d download files consistent 2023-06-07 23:19:08 +01:00
Martin Green
d242a8bb1d Try using url template command to link to 3d files 2023-06-07 23:08:28 +01:00
Martin Green
0cd32d6a15 See what breaks when put .3d on the end of urls for dowloading 3d files 2023-06-07 22:58:28 +01:00
Martin Green
fc9977952e Changed source of cave 3d files back. 2023-06-07 22:47:06 +01:00
Martin Green
56e9273047 changed source of 3d files for cave viewer, to see if it works better 2023-06-07 22:45:36 +01:00
Martin Green
12cee59605 Try not showing kataster codes if they are empty/None 2023-06-07 22:38:22 +01:00
Martin Green
90862e9a89 Add editlink classes for editing the entrances 2023-06-07 22:26:11 +01:00
Martin Green
ec3ebe8499 Fixed comments again 2023-06-07 22:21:41 +01:00
Martin Green
1ef636ca6f fixed broken commment tags 2023-06-07 22:19:12 +01:00
Martin Green
174d7bfe13 Commented out Kataster status. Chnaged Survey heading to Surveys and Rigging Guides. Moved explorers and references down the page. 2023-06-07 22:08:11 +01:00
Martin Green
4e34ae0530 Reordered cave description and survey. 2023-06-07 21:54:25 +01:00
Expo on server
f477507d27 Ignore Windows Zone.identifier files
Ignore all of media/jslib except the readme
2023-06-04 11:17:48 +01:00
969ed6cce5 added 1627 caves to 'caves'page 2023-05-20 22:47:09 +03:00
2e6b8d44f1 adding BS4 because of Martin's KML stuff 2023-05-20 21:47:14 +03:00
93201ab458 better layout to understand apache interactions 2023-05-20 21:36:05 +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