Sam Wenham
|
552730f0a3
|
Revert urls.py as it contains Django 1.8 upgrade code
|
2019-02-23 15:43:38 +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 |
|
expoonserver
|
9802f45452
|
Add missing linefeed on survey-parsing error message
|
2018-06-18 23:43:20 +01:00 |
|
expoonserver
|
1ad58d6b5d
|
Make sure that cave parser only reads .html files in cave_data dir (to stop foo~ causing 'duplicate cave' error)
|
2018-06-18 23:17:05 +01:00 |
|
expoonserver
|
6805bcb690
|
Add 'troggle' namespace to databasereset.py so it runs in django >1.5
|
2018-06-17 02:41:58 +01: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 |
|
expoonserver
|
10a05d686e
|
django.setup needs to be run before any attempt to use database
|
2018-06-17 02:23:02 +01:00 |
|
expoonserver
|
89ef5c19ff
|
imports must specify the application name i nlater django versions.
databasereset updated accordingly.
|
2018-06-16 19:00:26 +01:00 |
|
Sam Wenham
|
4385ce86c1
|
Add the extra setting for the threed cache to all the template configs
|
2018-04-20 20:58:05 +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
|
d3b42a125d
|
1.7 requiremnets
|
2018-04-15 16:45:07 +01:00 |
|
Sam Wenham
|
2f2f4d396d
|
New vars needed to make django 1.7 and tinymce work
|
2018-04-15 16:36:23 +01:00 |
|
Sam Wenham
|
e1eea7088f
|
Django 1.7 wsgi.py
|
2018-04-15 16:29:30 +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
|
c939013b14
|
Add ref as a valid survex command to prevent errors
|
2018-04-14 16:13:21 +01:00 |
|
Sam Wenham
|
458d0e1ebc
|
add all the docker commands to bulid and run troggle in a container (more of a guide than something to run)
|
2018-04-11 22:32:47 +01:00 |
|
Sam Wenham
|
776152ef47
|
Add missing expose container port and commneted command to auto start the dev server
|
2018-04-11 22:18:15 +01:00 |
|
Sam Wenham
|
9f285a9f34
|
Update requirements for 1.5.12 and preserve the 1.4.22 requiremnets
|
2018-04-11 22:13:31 +01:00 |
|
Sam Wenham
|
302ad0632e
|
Add the docker files and the pip requiremnets.txt to allow install usign pip
|
2018-04-11 22:03:48 +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 |
|
Wookey
|
41a14f161d
|
Avoid barf if URL field in new cave form is left blank.
|
2018-02-28 15:57:27 +00: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 |
|
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 |
|
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 |
|
expo
|
496280f3e6
|
merge serve changes
HGerver canges Enter commit message. Lines beginning with 'HG:' are removed.
|
2016-06-09 04:16:46 +01:00 |
|
Sam Wenham
|
0dd0951b28
|
Merge
|
2016-05-20 21:35:58 +01:00 |
|
Wookey
|
b9597fbb57
|
Merge 'expofiles' instead of 'expoimages' config changes
|
2016-01-27 04:27:38 +00:00 |
|
Wookey
|
edc6591554
|
Correct typo on cave and entrance template files
('If you edit this files...')
|
2016-01-27 04:24:44 +00:00 |
|
expoonserver
|
560b9bf985
|
Move expoimage to expofiles
Relies on permanent rediect in apache config to keep old URLs working
everywhere.
|
2015-10-02 15:10:04 +01:00 |
|
expoonserver
|
6652e3f160
|
remove code saying we can't do interlaced pngs. It's fine now.
|
2015-10-02 15:07:03 +01:00 |
|
expo
|
b0f1f73ce4
|
Store expo user/password info in localsettings file, and not repeated in databaseReset script
|
2015-09-16 01:58:51 +01:00 |
|
expo
|
214d887c57
|
Commit changes made on expo 2015
|
2015-09-16 01:52:45 +01:00 |
|
Sam Wenham
|
6b16724c2a
|
tidy up after merge
|
2015-08-22 13:28:17 +01:00 |
|
Sam Wenham
|
f1bb927063
|
Merge settings changes
|
2015-08-22 13:26:38 +01:00 |
|
expo
|
eeda1bed73
|
properly quote JSLIB_PATH and mke clear that example password is just an example
|
2015-07-26 00:38:10 +01:00 |
|
Sam Wenham
|
751ec9517f
|
Change JSLIB_PATH to JSLIB_URL and correct the path
|
2015-07-01 18:22:25 +01:00 |
|
Wookey
|
228814be33
|
Fix unquoted string in troggle localsettingspotatohut.py
|
2015-07-01 03:55:12 +01:00 |
|
Sam Wenham
|
cebcbeb73a
|
sysadmin to expouser for email
|
2015-07-01 01:26:04 +01:00 |
|