expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-12-22 00:12:17 +00:00
Code Issues 19 Projects 3 Activity
2,988 Commits 7 Branches 0 Tags 36 MiB
5475a0b853
Commit Graph

129 Commits

Author SHA1 Message Date
Philip Sargent
674cea629d clean up import statements: more specific 2020-06-22 00:03:23 +01:00
Philip Sargent
8199e67b79 re-ordered middlkeware 2020-06-21 00:06:03 +01:00
Philip Sargent
f3232cc5df More security, middleware upgrade, dj-reg.2.5 2020-06-20 23:08:34 +01:00
Philip Sargent
e697466557 Cleanup secrets management, pre-run checks. 2020-06-20 16:51:07 +01:00
Philip Sargent
d9c6986a89 static files redone 2020-06-18 21:50:16 +01:00
Philip Sargent
55dd577275 New url dispatcher OK 1.9.13 2020-06-17 22:55:51 +01:00
Philip Sargent
4941d230e2 TEMPLATES done for dj 1.9.13 2020-06-17 21:27:01 +01:00
Philip Sargent
adc43324f3 move TEMPLATE to localsettings 2020-06-16 19:30:06 +01:00
Philip Sargent
4c44a504ed preparing for django 1.8 2020-06-16 11:14:10 +01:00
Philip Sargent
30e560d808 Dump django.sites, .redirects, registration, extensions 2020-06-14 20:02:52 +01:00
Philip Sargent
38fa552c00 Disable TinyMCE 2020-06-13 23:16:19 +01:00
Philip Sargent
fda50ed570 attempt to simplify wnt horribly wrong 2020-06-06 22:51:55 +01:00
Philip Sargent
73637ba53d Clean install with python3 2020-05-27 01:04:37 +01:00
Philip Sargent
f4099c6929 fix py3 bug and make settings import clearer 2020-05-26 02:21:03 +01:00
Philip Sargent
50d753a87b Convert codebase for python3 usage 2020-05-24 20:56:27 +01:00
Philip Sargent
a3e564855a removing imagekit 2020-05-22 01:28:45 +01:00
Philip Sargent
d4ac28af18 Remove PHOTOS_ROOT and DPhoto class 2020-05-15 21:32:55 +01:00
Philip Sargent
76a6b501f3 LoadPos not-found cache working 2020-04-28 22:51:18 +01:00
Philip Sargent
ecf92e2079 getting the LoadPos to work better 2020-04-28 21:50:53 +01:00
Philip Sargent
e08b4275a9 2010 is html format not wiki format. 
Or at least, now it is.
 2020-04-12 23:03:00 +01:00
Philip Sargent
a88f326ee6 added year 2019 to logbook parsing 2020-02-17 01:39:00 +00: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
expo on server
7a9aef6faf Add expo.survex.com to ALLOWED_HOSTS in troggle settings 2019-06-26 15:23:20 +01:00
expo on server
02d3cc84d5 Add SURVEX_TOPNAME (top-level survex file) as a setting item in settings.py so it's not hardcoded. 2019-06-26 03:32:18 +01:00
expoonserver
39c61bd526 Move cave and entrance data out of 'noinfo' 2019-04-01 23:03:45 +01: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
Sam Wenham
c6656e6642 Stop django moaning about unit tests from pre 1.6, like we have any anyway! 2019-02-24 16:48:12 +00:00
Sam Wenham
798ae591c6 Django 1.7 mostly working. Big refactor so probably bugs 2018-04-15 16:28:13 +01:00
Sam Wenham
cedcb0988a Clean up indenting in models 
add registration required modules
 2018-04-14 21:14:19 +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
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
expo
7aed3d3b30 Moved notable caves to settings.py, link to a script to fix permissions 2015-06-21 15:08:09 +01:00
expo
da71cca22f Prospecting guide and images and few minor other things. 2013-08-01 17:00:01 +02:00
wookey
a6a9016548 Add support for old and new (1.4 on) location for auth module. 2013-07-02 21:05:48 +01:00
wookey
f3a570a21d Add csrf token to registration forms 2013-07-02 17:26:35 +01: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
65c55f0f21 Removed conversion to wiki, replaced Surveystation models with text, added area 1623 to all relevant caves. 2011-07-11 00:15:59 +01:00
Martin Green
835680f0ee Get CSRF middleware to work on django 1.1- and 1.2+ 2011-05-02 02:51:14 +01:00
Martin Green
671e946c6d settings.PUBLIC_SITE, login required if public for logbook entry, CRCF middleware 2011-05-02 02:12:26 +01:00
Martin Green
7a0a898bc6 Added variables to configure TinyMCE 2011-05-01 19:17:57 +01:00
substantialnoninfringinguser
2993ca74cc [svn] override save for CaveDescriptions to scan qm wikilinks and add into the manytomany field linked_qms 2009-07-11 01:36:00 +01:00
substantialnoninfringinguser
38a545e174 [svn] Remove old subcave model, along with mptt and feincms. Also move OtherCaveNames admin representation to an inline in Cave. 2009-07-04 19:26:51 +01:00
martin speleo
92635f6f68 [svn] Change to get js in admin work for feincms 2009-07-04 00:26:12 +01:00
substantialnoninfringinguser
854fe85132 [svn] 2009-07-03 21:59:31 +01:00
substantialnoninfringinguser
ae3fe8cd42 [svn] Renaming troggle.expo to troggle.core. To do this, used: 
perl -p -i -e "s/expo(?=[\s\.']+)/core/g" `find -name \*.py`

and then manually checked each change (had to remove a couple)
 2009-07-02 20:43:18 +01:00
substantialnoninfringinguser
891b3abb44 [svn] Updates to allow subcave tree with nice admin. 2009-05-21 19:47:19 +01:00
substantialnoninfringinguser
2c2f11be39 [svn] 2009-05-19 06:32:42 +01:00
substantialnoninfringinguser
f27d5988f0 [svn] semi ugly hack... 2009-05-15 03:38:11 +01:00
substantialnoninfringinguser
d8a215a575 [svn] Add: new generic object list template object_list.html, and convenience filter named "link" for making links from objects, and make expeditions list page using those two. Also, fixed survey parsing in databaseReset.py 2009-05-15 03:29:19 +01:00
substantialnoninfringinguser
06487e5534 [svn] localsettings should override settings, so the import should be at the bottom of the file, unless someone has a better way of doing this 2009-05-14 06:39:36 +01:00
substantialnoninfringinguser
c0b73d4777 [svn] 2009-05-14 06:32:58 +01:00
substantialnoninfringinguser
0f64e786b5 [svn] Made the subcaves work! Now we just have to figure out how to parse them... 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8343 by cucc @ 5/11/2009 6:36 AM
 2009-05-13 06:28:36 +01:00
substantialnoninfringinguser
7164296c9d [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8342 by cucc @ 5/11/2009 3:23 AM
 2009-05-13 06:27:45 +01:00
substantialnoninfringinguser
d9d119c0c9 [svn] django-evolution is optional so shouldn't be in main settings 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8340 by cucc @ 5/11/2009 3:18 AM
 2009-05-13 06:26:17 +01:00
substantialnoninfringinguser
b31d022c1a [svn] Dynamic thumbnail generation for photos and survey scans using imagekit, further improving registration system, other misc. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8336 by cucc @ 5/10/2009 11:05 PM
 2009-05-13 06:23:57 +01:00
substantialnoninfringinguser
8ae5232d87 [svn] django_evolution is a nice thing to have for development (allows updating db with changes to models without wiping whole tables) but for development and not deployment. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8325 by cucc @ 5/3/2009 6:11 AM
 2009-05-13 06:16:27 +01:00
substantialnoninfringinguser
625b2156e3 [svn] Weeks of local changes. 
- Import is now non-destructive
- Parsers write output to a log file (path be specified in settings)
- databaseReset.py content been divided into separate functions which can be called for varying levels of deletion and importing
- control panel (view, template, urlpattern) added for deleting and importing
- Logins and signup fixed
- CaveArea model updated, view, hierarchical url patterns, and beginning of template added
- New site style
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8324 by cucc @ 5/3/2009 5:56 AM
 2009-05-13 06:15:48 +01:00
substantialnoninfringinguser
7ff0753b13 [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8312 by aaron @ 3/27/2009 7:32 PM
 2009-05-13 06:12:13 +01:00
substantialnoninfringinguser
558a005836 [svn] Smart url joining 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8311 by aaron @ 3/27/2009 4:11 PM
 2009-05-13 06:11:40 +01:00
substantialnoninfringinguser
72bd959b2a [svn] Temporary fix for double slash problem 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8310 by aaron @ 3/27/2009 3:58 PM
 2009-05-13 06:11:05 +01:00
substantialnoninfringinguser
e8da6b9b8b [svn] Further attempts to make troggle work on windows using surveys stored on an external server 
settings.PHOTOS changed to setting.PHOTO_ROOT
Made databaseReset.py get info from external server if appropriate (hope this did not break linus disk based scripts)
Still needs more work, to get everything working
Auto create photos directory if it does not already exist

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8262 by julian @ 3/2/2009 1:30 AM
 2009-05-13 05:58:18 +01:00
substantialnoninfringinguser
e9cc5094b9 [svn] Not ready for these yet. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8257 by aaron @ 2/23/2009 1:11 PM
 2009-05-13 05:56:16 +01:00
substantialnoninfringinguser
24dc2e3a20 [svn] Fixing what I broke. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8256 by aaron @ 2/23/2009 1:05 PM
 2009-05-13 05:55:40 +01:00
substantialnoninfringinguser
24dc7c5a0c [svn] Photo file handling and mugshots parsing sorted. 
Made URL settings more relative, less redundant.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8246 by aaron @ 2/18/2009 6:45 AM
 2009-05-13 05:53:37 +01:00
substantialnoninfringinguser
d25fd97864 [svn] My crusade to make our project more Djangoic. 
Got rid of the url tags in template, replaced them with get_absolute_url method calls where possible. Adding get_absolute_url in models enables direct link to the public model views in admin. The use of get_absolute_url, which is the correct Django way of doing things, eliminates any need for the redundant "href" fields we were using. Those fields now need to be deleted from the models and from the parsers.

Made the context processor to pass settings to all templates actually work, although this was a little uglier than expected. I had to put in a new render_response to replace render_to_response. This is because Django uses Context, not RequestContext by default. I wish they would change this, it's annoying. Anyway, I deleted all the manual settings passing in the views.

I also eliminated a couple of unnecessary methods and stuff like that.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8244 by aaron @ 2/16/2009 8:31 AM
 2009-05-13 05:52:15 +01:00
substantialnoninfringinguser
ed345f2576 [svn] Add user registration and user profiles. 
Used modified versions of django-registration and django-profiles , both on bitbucket.

The Person model is now set up as the profile for auth.User s.

I set up a requestcontext so that settings is automatically passed to every template, no need to repeat ourselves in views. However, this needs to be refined: I will soon change it to only pass a subset of settings. E.G. we do not need to be passing the DB login and password!
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8231 by aaron @ 1/29/2009 11:02 PM
 2009-05-13 05:48:10 +01:00
substantialnoninfringinguser
ecc4e1dc13 [svn] Changed admin media prefix and enabled smart slash adding 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8170 by julian @ 1/17/2009 8:35 PM
 2009-05-13 05:33:57 +01:00
substantialnoninfringinguser
89ea3a5106 [svn] Try and sort out settings mess. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8087 by aaron @ 12/9/2008 4:48 AM
 2009-05-13 05:23:25 +01:00
substantialnoninfringinguser
c06585b3e8 [svn] Remove MEDIA_ROOT from settings.py because it belongs in local settings, and comment out urlconf line for unfinished edit form which I haven't checked in. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8082 by aaron @ 12/8/2008 5:10 AM
 2009-05-13 05:22:26 +01:00
substantialnoninfringinguser
29984ff15a [svn] Added cave and logbook search, collapsible footer navbar, useless statistics page. Also fixed broken css. Toying with forms but not committing those yet. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8081 by aaron @ 12/8/2008 4:28 AM
 2009-05-13 05:22:14 +01:00
substantialnoninfringinguser
9c75c35ed4 [svn] going back now works 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8068 by julian @ 11/7/2008 2:30 AM
 2009-05-13 05:19:44 +01:00
substantialnoninfringinguser
a9161e791a [svn] remove nonasc 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8067 by julian @ 11/7/2008 2:25 AM
 2009-05-13 05:19:31 +01:00
substantialnoninfringinguser
3a4fd77860 [svn] Moved template directories to local settings 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8055 by julian @ 11/2/2008 11:18 PM
 2009-05-13 05:17:27 +01:00
substantialnoninfringinguser
edba377305 [svn] Settings.py now references localsettings.py, which is kept outside of SVN and is specific to each machine. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8049 by aaron @ 11/2/2008 4:18 AM
 2009-05-13 05:16:23 +01:00
substantialnoninfringinguser
cbf6be7990 [svn] more parsing back to 2002 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8047 by julian @ 10/31/2008 2:43 PM
 2009-05-13 05:16:11 +01:00
substantialnoninfringinguser
01cd961229 [svn] Add QM model. Note that I had to put models_logbook into models cave because it referred to models from both. Will try to split them back up, should be possible. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8042 by aaron @ 10/28/2008 10:21 PM
 2009-05-13 05:15:20 +01:00
substantialnoninfringinguser
18f6731b5b [svn] add personindex templates 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8038 by julian @ 10/27/2008 12:36 AM
 2009-05-13 05:14:28 +01:00
substantialnoninfringinguser
b503d3d588 [svn] Initial troggle checkin 
This is a development site using Django 1.0
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8034 by julian @ 10/26/2008 9:04 PM
 2009-05-13 05:13:38 +01:00