xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity
564 Commits 8 Branches 0 Tags
b33ca2b290ca6e00ea4dbcc709862b61881086e1
Commit Graph

121 Commits

Author SHA1 Message Date
RadostW b33ca2b290 Messing with millenialcaves.html or similar 2019-02-26 00:43:05 +00:00
RadostW c4455168c6 Messing with millenialcaves.html or similar 2019-02-26 00:35:28 +00:00
RadostW 1b4674acde Messing with millenialcaves.html or similar 2019-02-26 00:33:37 +00:00
RadostW 4fac4317a3 Messing with millenialcaves.html or similar 2019-02-26 00:33:04 +00:00
RadostW 78bf9986b7 Messing with millenialcaves.html or similar 2019-02-26 00:30:09 +00:00
RadostW 5154c0d8e5 Messing with millenialcaves.html or similar 2019-02-26 00:29:16 +00:00
RadostW 521f0241f8 Messing with millenialcaves.html or similar 2019-02-26 00:21:54 +00:00
RadostW 0394becdac Messing with millenialcaves.html or similar 2019-02-26 00:21:27 +00:00
RadostW 6beaf4afdd Messing with millenialcaves.html or similar 2019-02-26 00:17:11 +00:00
RadostW a4a92483bd Messing with millenialcaves.html or similar 2019-02-26 00:04:27 +00:00
RadostW 3254ba1443 2019-02-26 00:00:34 +00:00
RadostW 4c3d0ce7fa 2019-02-25 23:55:06 +00:00
RadostW 0a214c5d4b 2019-02-25 23:51:26 +00:00
RadostW 29c53f35ab 2019-02-25 23:48:58 +00:00
RadostW 3746dab5de 2019-02-25 23:46:52 +00:00
RadostW 18dbadd675 space/tab 2019-02-25 23:42:56 +00:00
RadostW ee2cd0d391 trying to add new field 2019-02-25 23:40:53 +00:00
RadostW 0cc4e7c7d3 2019-02-25 23:37:12 +00:00
Sam Wenham 478065786f Merge 2019-02-25 23:34:10 +00:00
Sam Wenham e64d82cd92 Start of moving databasereset to django management 2019-02-25 23:10:24 +00:00
Sam Wenham 12a991920a Get get_absolute_url in the correct place 2019-02-25 23:07:20 +00:00
RadostW 78a5f656b9 added Rad's playground 2019-02-25 22:24:33 +00:00
Sam Wenham 77a6015ad6 Fix the All Survex page to work with 1623 area 2019-02-25 20:13:28 +00:00
Sam Wenham 7c15a7439d Decode the url encoded # when looking at wallets 2019-02-24 19:50:45 +00:00
Sam Wenham b4f4db5754 Deal better with the wallet letter number combo of 2019#X01 2019-02-24 18:55:30 +00:00
Sam Wenham e6fa54d0e5 Fix survey scans 
Remove the assert for folders in survey wallets, this does mean currently they
will be ignored by troggle.
 2019-02-24 16:46:02 +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
expoonserver c162411f0b FileUploadForm does not work with django 1.7. 
It tries to use database during class initialisation.
removed it for now - not sure if it's important...
 2018-06-17 02:24:00 +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 174c475ec7 Add default BooleanField(default=False) for django 1.7 compatibility 2018-04-17 21:51:39 +01:00
Sam Wenham 760fa3114f missed from last commit 2018-04-15 16:28:52 +01:00
Sam Wenham 798ae591c6 Django 1.7 mostly working. Big refactor so probably bugs 2018-04-15 16:28:13 +01:00
Sam Wenham 7877efba0a Up to 1.6.11 on stretch. New manage.py. Some tidying 2018-04-15 12:00:59 +01:00
Sam Wenham cfa888fde6 More cleanup and modernisation 2018-04-14 21:37:12 +01:00
Sam Wenham cedcb0988a Clean up indenting in models 
add registration required modules
 2018-04-14 21:14:19 +01:00
Sam Wenham 242cf4741a Import Image from PIL to support newer python 
import the Django registration module rather than the troggle one
 2018-04-10 01:34:06 +01:00
expoonserver d7c6676c49 Test whether url is not 'None' before applying 'startswith' test in 
forms.py entering new caves, otherwise it barfs.
 2017-10-25 03:49:03 +01:00
expoonserver 5e9dfc6ea6 Fix Scan scanning, so that 2015#X01 format (with 'X') is accepted in 
scan directories. Allows 2016 data to be processed.
 2017-03-07 15:44:42 +00: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
expo 214d887c57 Commit changes made on expo 2015 2015-09-16 01:52:45 +01:00
Sam Wenham 5a911ecec7 I think this is breaking prospecting 2015-06-28 13:39:50 +01:00
expo 7aed3d3b30 Moved notable caves to settings.py, link to a script to fix permissions 2015-06-21 15:08:09 +01:00
Wookey fe6750e824 Fix up obvious URLs containing subarea names (smkridge) 2015-04-08 03:40:57 +01: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
Wookey 7cdb603d75 Add 107 to notable caves (noting that this is hard-coded into 
core/views_caves.py which is just shoddy)
 2014-07-28 01:21:24 +01:00
expo da71cca22f Prospecting guide and images and few minor other things. 2013-08-01 17:00:01 +02:00
Wookey 7eb4c89bf0 Don't explode if a master survex file is not found for a directory - 
that shouldn't cause total failure to read the database in.
 2013-07-02 00:47:42 +01:00