2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-03-24 02:24:29 +00:00

Commit Graph

  • 6e452b2ee9 current settings on server - sanitized Philip Sargent 2023-05-25 12:53:41 +03:00
  • dc06744444 fix exception? Philip Sargent 2023-07-14 11:26:47 +02:00
  • 26e96839e4 stop crash onloading wallet with blank caveid Philip Sargent 2023-07-14 11:22:48 +02:00
  • 4e4824546a stop crash on live system Philip Sargent 2023-07-14 11:21:49 +02:00
  • 387bdf4f91 shorter msg Philip Sargent 2023-07-14 11:20:57 +02:00
  • b650095588 calendar S T colour >10 per date Philip Sargent 2023-07-14 11:13:06 +02:00
  • 761a71930b hack to stop crash Philip Sargent 2023-07-13 22:20:01 +02:00
  • 127002d736 more entries Philip Sargent 2023-07-13 21:36:48 +02:00
  • a062e9ea44 moving venv stuff to _deploy Philip Sargent 2023-07-13 16:02:51 +02:00
  • 380fe8cc32 Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle Martin Green 2023-07-13 12:35:00 +02:00
  • bdb5e3208b Rotate and reflect images, as specified in EXIF whilst uploading Martin Green 2023-07-13 12:34:52 +02:00
  • c119c99308 removed print statement Martin Green 2023-07-13 12:33:55 +02:00
  • 2af4f4b10e ignore javascript dir that should be downloaded from the deployment server Martin Green 2023-07-13 12:27:13 +02:00
  • a5968121a0 add DEPRECATed SURVEX FILES TO IGNORE LIST Expo laptop Crowley 2023-07-12 22:04:32 +02:00
  • 5eb6ef4d31 more synonyms Philip Sargent 2023-07-12 16:44:34 +02:00
  • 5f6359694d Update test to reflect change in loser repo Mark Shinwell 2023-07-12 14:12:40 +02:00
  • 90a6eaa26d Updated requirements to match expo.survex.com Martin Green 2023-07-10 17:42:29 +02:00
  • 67361fa66c Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle Martin Green 2023-07-10 17:00:56 +02:00
  • b27852c1f3 redirect to actual login page Martin Green 2023-07-10 16:55:09 +02:00
  • 8ff438942d handle shortform months and days in svx file Expo laptop Crowley 2023-07-10 12:49:14 +02:00
  • b3e2f34960 hack fix Expo laptop Crowley 2023-07-10 10:33:57 +02:00
  • d0ccc46260 better test & msg Expo laptop Crowley 2023-07-10 10:03:23 +02:00
  • 5a7f197bcb hack to make server reset quickly Expo laptop Crowley 2023-07-10 09:24:11 +02:00
  • 389fb6c409 add month Expo laptop Crowley 2023-07-10 09:18:17 +02:00
  • 4d48dd4386 Logbook debugging Expo laptop Crowley 2023-07-09 11:30:50 +02:00
  • 086537cb56 =Added string to caveslugs so admin interface works. Added explanation for the rational for cave slugs. Expo on server 2023-07-08 23:45:32 +01:00
  • beab42323b Added CaveSlugs to Admin Expo on server 2023-07-08 23:43:57 +01:00
  • 3d43c0ec12 Allow for parent directories to be created when created photos. Expo on server 2023-07-08 22:42:06 +01:00
  • b1c5b03104 link to 2023 in menus Philip Sargent 2023-07-08 17:13:57 +01:00
  • 68724a0504 Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle Martin Green 2023-07-08 17:57:33 +02:00
  • 3359889d97 Better attempt at creating a default url for caves created by svx files Martin Green 2023-07-08 17:56:49 +02:00
  • 2f24a7f7bb Barbie setup Philip Sargent 2023-07-08 15:35:43 +01:00
  • 66ee96cd63 Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle Martin Green 2023-07-05 21:11:04 +01:00
  • ad37a82713 git comitting allowing files to be comitted in different directories. Martin Green 2023-07-05 21:10:05 +01:00
  • ffed6e3ba6 convert uploaded images to RGB so that it can be saved as jpg Martin Green 2023-07-05 21:08:51 +01:00
  • 7b8e93cdb5 menus and logbook Expo laptop Crowley 2023-07-05 21:54:25 +02:00
  • 4158f5ba63 add 2023 Expo laptop Crowley 2023-07-05 20:16:52 +02:00
  • a70cf6cad3 Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle Martin Green 2023-07-05 18:27:49 +01:00
  • 63599cb27a Removed ability to add other caves entrances to a cave. Martin Green 2023-07-05 18:22:08 +01:00
  • a0fcb78e95 Removed kataster area for unoffical numbers of pending caves. Added .html to urls of pending caves. Martin Green 2023-07-05 18:21:15 +01:00
  • 745ccd7f88 Show when running locally Expo laptop Crowley 2023-07-05 19:04:55 +02:00
  • 2b30b7b624 Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle Martin Green 2023-07-05 17:45:21 +01:00
  • 410a285085 Bug fixes to allow adding of a new cave. No longer ask users about filenames or urls. Martin Green 2023-07-05 17:43:57 +01:00
  • d2bcef6e36 Turn menu bar magenta if running on localserver Expo laptop Crowley 2023-07-05 18:35:17 +02:00
  • 067fcd9892 Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle Martin Green 2023-07-05 13:19:11 +01:00
  • c4095eb336 Have images saved to correct place, when edited in the cave or entrance view. etc Martin Green 2023-07-05 13:18:02 +01:00
  • 020a083afa more fix Expo laptop Crowley 2023-07-05 13:09:49 +02:00
  • fd9f21de2e more local fixups Expo laptop Crowley 2023-07-05 12:49:30 +02:00
  • 7268eb4f30 synch localsettings variants Expo laptop Crowley 2023-07-05 12:11:44 +02:00
  • 910e0e3123 updating requirements for testing Expo laptop Crowley 2023-07-05 11:19:37 +02:00
  • 7db17154ad ugh stage problem Expo laptop Crowley 2023-07-05 11:09:54 +02:00
  • ebcc0db665 ugh stage problem Expo laptop Crowley 2023-07-05 11:08:44 +02:00
  • 73675ca1b9 Radost fiux for narrow screens Expo on server 2023-07-05 10:22:30 +01:00
  • 973d05f9fb Modification to templates to make them more suitable on a stand alone website. Martin Green 2023-07-03 21:35:00 +01:00
  • 52299fb6fd Add links to entrances page Martin Green 2023-07-03 09:32:34 +01:00
  • 01964e7cf6 Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle Martin Green 2023-07-03 08:06:45 +01:00
  • 929f6732d0 Add some sort of orderinng Martin Green 2023-07-03 08:04:26 +01:00
  • b91223da66 Add list of entrances Martin Green 2023-07-03 08:00:03 +01:00
  • a04d9ef056 capitalisation fix Philip Sargent 2023-06-28 20:37:06 +01:00
  • e4fe5eaf5d removed extranius bracket from html Martin Green 2023-06-08 01:10:07 +01:00
  • c7494fe379 bug fix Martin Green 2023-06-07 23:49:19 +01:00
  • e4112431be bug fix Martin Green 2023-06-07 23:47:14 +01:00
  • 65eec8e91d attempt to use {% url %} tag to point at 3d file for cave viewer Martin Green 2023-06-07 23:44:44 +01:00
  • 0b0f2f07e1 Try having caveviewer using same url as download link again Martin Green 2023-06-07 23:25:25 +01:00
  • ee34f87563 Replaced cave viewer link to 3d file with the working orginal Martin Green 2023-06-07 23:20:51 +01:00
  • e42f0569fd Made the sources of the 3d download files consistent Martin Green 2023-06-07 23:19:08 +01:00
  • d242a8bb1d Try using url template command to link to 3d files Martin Green 2023-06-07 23:08:28 +01:00
  • 0cd32d6a15 See what breaks when put .3d on the end of urls for dowloading 3d files Martin Green 2023-06-07 22:58:28 +01:00
  • fc9977952e Changed source of cave 3d files back. Martin Green 2023-06-07 22:47:06 +01:00
  • 56e9273047 changed source of 3d files for cave viewer, to see if it works better Martin Green 2023-06-07 22:45:36 +01:00
  • 12cee59605 Try not showing kataster codes if they are empty/None Martin Green 2023-06-07 22:38:22 +01:00
  • 90862e9a89 Add editlink classes for editing the entrances Martin Green 2023-06-07 22:26:11 +01:00
  • ec3ebe8499 Fixed comments again Martin Green 2023-06-07 22:21:41 +01:00
  • 1ef636ca6f fixed broken commment tags Martin Green 2023-06-07 22:19:12 +01:00
  • 174d7bfe13 Commented out Kataster status. Chnaged Survey heading to Surveys and Rigging Guides. Moved explorers and references down the page. Martin Green 2023-06-07 22:08:11 +01:00
  • 4e34ae0530 Reordered cave description and survey. Martin Green 2023-06-07 21:54:25 +01:00
  • f477507d27 Ignore Windows Zone.identifier files Ignore all of media/jslib except the readme Expo on server 2023-06-04 11:17:48 +01:00
  • 969ed6cce5 added 1627 caves to 'caves'page Philip Sargent 2023-05-20 22:47:09 +03:00
  • 2e6b8d44f1 adding BS4 because of Martin's KML stuff Philip Sargent 2023-05-20 21:47:14 +03:00
  • 93201ab458 better layout to understand apache interactions Philip Sargent 2023-05-20 21:36:05 +03:00
  • 43724f1cf6 When reloading a cave, do so from cave.filename, rather than inorrectly assuming the cave is named after its slug Martin Green 2023-05-08 23:09:15 +01:00
  • 7d140af87a Do not rename caves when saving Martin Green 2023-05-08 22:34:45 +01:00
  • 77ed1b444c Hack to turn cave URL to absolute links, so they can work from anywhere on the website. Martin Green 2023-05-08 22:32:49 +01:00
  • f7fca58c57 Start of creating kmz file, with entrance photos and links to expo.survex.com Martin Green 2023-05-08 01:10:43 +01:00
  • ea7c29a54e Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle Martin Green 2023-05-02 22:41:36 +01:00
  • 0052385333 Add lat long to entrance locations on cave pages Martin Green 2023-05-02 22:40:44 +01:00
  • 7f0e7d8fa3 Ubuntu 22.04 + python3.11 Philip Sargent 2023-05-02 23:26:53 +03:00
  • ef467ad481 Making the dummy entrance thing clear Philip Sargent (laptop) 2023-05-02 17:42:58 +03:00
  • 175307773b More fixes for laptop Philip Sargent (laptop) 2023-05-02 15:28:28 +03:00
  • 8e982bd6be Fixing new dev machine setup Philip Sargent (laptop) 2023-05-02 14:27:55 +03:00
  • 783154d24a Restored check of git status after a committ, but only for the one file being committed Martin Green 2023-05-01 22:06:48 +01:00
  • 40126f6e2f fixing laptop SNowWHite Philip Sargent (laptop) 2023-05-01 22:01:47 +03:00
  • 1ccd9c418b template missing from last commit Martin Green 2023-05-01 00:03:58 +01:00
  • 896af43994 kml file output for google earth etc Martin Green 2023-05-01 00:01:41 +01:00
  • 2ee63a9804 If a cave is made with no entrances, redirect to a new entrance form for the cave Martin Green 2023-04-30 21:42:03 +01:00
  • c7b3e8aff0 Added an ordering of entrances Martin Green 2023-04-30 21:41:17 +01:00
  • c50236575f Dummy entrances were being written to a global variable, recording that they have a filename. But the filename was not written. This was then causing an exception when the user asked to edit a cave, leading to all entrances being reread. Obviously the dummy entrances file ould not be read. PS. Do we really want to reread all entrances when we start editing a cave? Martin Green 2023-04-30 21:06:57 +01:00
  • 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. Martin Green 2023-04-30 21:04:05 +01:00
  • 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 Martin Green 2023-04-30 19:05:57 +01:00
  • 941100a8a3 Previously if a cave was found without an entrance an entrance was added to the database. However as this was not also added as a file, the new entrance could not be edited via the web interface. Without an entrance being made, they can still be added. Martin Green 2023-04-30 19:03:09 +01:00