 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 |
|
|
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 |
|
|
Sam Wenham
|
057b09dca9
|
Move expo user settings out of databasereset.py to localsettings where they really belong
|
2015-07-01 01:18:25 +01:00 |
|
|
Sam Wenham
|
480541ae54
|
Add a little style
|
2015-06-28 13:52:33 +01:00 |
|
|
Sam Wenham
|
60303d041c
|
Remove unnecessary escape slashes
|
2015-06-28 13:46:28 +01:00 |
|
|
Sam Wenham
|
5a911ecec7
|
I think this is breaking prospecting
|
2015-06-28 13:39:50 +01:00 |
|
|
Sam Wenham
|
7056f9a8b2
|
Remove balkonhoehle from the QM parser as this will need a lot of effort to get working
|
2015-06-28 12:28:18 +01:00 |
|
|
Sam Wenham
|
34036581f2
|
Correct JSLIB_URL
|
2015-06-27 13:01:15 +01:00 |
|
|
expo
|
dcc67fddda
|
Don't put passwords in the repo
|
2015-06-24 04:41:50 +01:00 |
|
|
expo
|
03cad0a37f
|
Survex parser fix to avoid allocation on error (by martin).
|
2015-06-24 04:09:19 +01:00 |
|
|
expo
|
a4651eaa0a
|
Added warnings that the database will need updating is cave or entrance data files are modified
|
2015-06-21 15:11:51 +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
|
4771f52b20
|
Have different links for system js files and troggle js files
|
2015-06-21 15:06:44 +01:00 |
|
|
Wookey
|
77ad85b05c
|
merge balconhoehle changes from server
|
2015-06-19 01:55:51 +01:00 |
|
|
Wookey
|
01d877d26e
|
Use django-registration, not a local copy.
This old one is uses deprecated hashcompat.
|
2015-06-10 23:52:49 +01:00 |
|
 DWalker
|
e84d990366
|
Add in balkon hoehle QM list
|
2015-05-25 21:55:54 +01:00 |
|
|
Wookey
|
e06be10f7f
|
Change password of 'expo' user created by databasereset script to match that used elsewhere
|
2015-05-25 21:26:26 +01:00 |
|
|
Wookey
|
fe6750e824
|
Fix up obvious URLs containing subarea names (smkridge)
|
2015-04-08 03:40:57 +01:00 |
|
|
Wookey
|
d29fe2ee1c
|
Merge in Sam's parser debugging
|
2015-04-08 03:27:48 +01:00 |
|
|
Wookey
|
1156b1d3ea
|
rename troggle paper.odt to troggle_paper.odt as space in repo are a
pain
|
2015-04-08 03:24:00 +01:00 |
|
|
Wookey
|
126a10cf94
|
Rename troggle paper to not have a space in it.
|
2015-04-06 02:38:24 +01:00 |
|
|
Sam Wenham
|
4560e0da84
|
Revert all of this the date is needed and is a not null in the db
|
2015-01-26 21:53:32 +00:00 |
|
|
Sam Wenham
|
f9c2e0e170
|
One more try
|
2015-01-26 21:15:17 +00:00 |
|
|
Sam Wenham
|
cf413dd03c
|
Ooops that wasn't right
|
2015-01-26 21:13:47 +00:00 |
|
|
Sam Wenham
|
4965678443
|
Don't assert an error on bad date formats
|
2015-01-26 21:12:27 +00:00 |
|
|
Sam Wenham
|
67f94f9436
|
A little more verbosity
|
2015-01-19 22:48:50 +00:00 |
|
|
Sam Wenham
|
1186662960
|
Add a little verbosity
|
2015-01-19 22:41:48 +00:00 |
|
|
Sam Wenham
|
3010961383
|
Try and ignore files that don't end .html (We really need to change to .xml) eg .html.orig!!
Change the index on troggle to move on with the year
|
2015-01-19 21:28:35 +00:00 |
|
|
Wookey
|
806fd41130
|
remove two files accidentally included in last commit
|
2014-09-11 07:41:33 +01:00 |
|
|
Wookey
|
af07161f05
|
remove internal copies of jquery, jquiery-forms, jquery-ui+themes,
django-feincms and codemirror
|
2014-09-11 07:40:58 +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
|
7f292d402b
|
Use REPOS_ROOT_PATH so there is just one place to change paths
|
2014-09-11 06:33:34 +01:00 |
|
|
Wookey
|
c180780da9
|
Update the README file a bit - still needs work.
|
2014-09-10 23:46:05 +01:00 |
|
|
Wookey
|
d75862bc41
|
Merge change of 'cavesnew'->'caves' in databasereset.
|
2014-07-28 01:22:52 +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
|
94c44b0d7b
|
Change databasereset to use 'caves' instead of 'cavesnew' for reloading the cave database
|
2014-07-28 00:18:10 +01:00 |
|
|
expo
|
4a3d181097
|
Set potato hut localsettingsfile to have correct URLs
|
2014-07-23 09:47:48 +01:00 |
|
|
Sam
|
d8863dca48
|
Fix media url to allow for working in the hut
|
2014-07-23 09:10:31 +01:00 |
|
|
expo
|
e0c439e850
|
Add a new config file for the potato hut setup.
|
2014-07-23 09:11:17 +01:00 |
|
|
Wookey
|
f4f1b3ca6d
|
Allow comma in starcommands (*,fix) (comma is default valid *set blank)
|
2014-07-01 02:26:26 +01:00 |
|
|
Wookey
|
4a93790c7e
|
Fix survex parser to allow whitespace between * and command (as survex
does).
|
2014-07-01 02:12:34 +01:00 |
|