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
Wookey
5265acd9dc
merge in survex parsing changes from server.
2014-06-26 02:37:55 +01:00
expoonserver
9f69bb5fca
Remove spurious real password from example localsettingserver.py file.
...
Add comment on how to use it.
2014-06-26 02:35:37 +01:00
expoonserver
b1d6e1c3d5
Replace assert on unrecognised commands with print, so that a minor
...
parsing issue doesn't completely kill a parsing update.
Add parsing for requires and alias commands.
2014-06-26 02:34:19 +01:00
Wookey
659703b221
Merge with server version
2014-06-09 19:30:06 +01:00
expoonserver
3869bd536e
remove humongous troggle_log.txt from repo
2014-05-19 03:12:16 +01:00
expoonserver
408d154d3f
Refer to debian package, not upstream URL
2014-05-19 03:11:46 +01:00
Wookey
44e3eb8a18
Tidy up urls file a little
2014-05-14 20:46:59 +01:00
wookey
51a3cecc02
Document 'cavesnew' option in databasereset.py - which just reads in
...
caves datafiles.
2013-10-07 23:45:59 +01:00
olly
6b4ea7b83e
merge
2013-08-08 15:48:10 +02:00
expo
da71cca22f
Prospecting guide and images and few minor other things.
2013-08-01 17:00:01 +02:00
wookey
5c945e3431
Put correct user for mysql on seagrass back into config (It was accidentally overwritten in recent changes)
2013-07-06 09:28:39 +01:00
Wookey
ba5bc365c1
merge support for django 1.2 location for auth module
2013-07-02 21:12:59 +01:00
Wookey
c362b1b529
3rd attempt at getting the right syntax for the CSRF protection in
2013-07-02 21:11:07 +01:00
Wookey
f90b6dc7ab
update location of auth module for django 1.4
2013-07-02 21:10:30 +01: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
5351108ec1
merged in proper CSRF changes from server
2013-07-02 20:23:55 +01:00
Wookey
7759e481d4
Change database syntax to modern format as old style no longer
...
supported in django 1.4
2013-07-02 18:13:27 +01:00
Wookey
69c3a06c98
Remove support for django 1.0 CSRF as we only care about 1.2 or later
2013-07-02 18:12:18 +01:00
Wookey
d1ad8730d7
Add CSRF protection to registration form (and remove annoying second
...
password)
2013-07-02 18:10:45 +01:00
wookey
f3a570a21d
Add csrf token to registration forms
2013-07-02 17:26:35 +01:00
Wookey
f626d3304d
parsing_log should not be saved in the vcs
2013-07-02 00:49:07 +01: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
wookey
9435be0f19
Add 'people' option to DatabaseReset.py, to read in just the folk list after update.
...
Not sure that it actually works mind...
2013-07-02 00:34:58 +01:00
wookey
7f108f6d9a
Set title to show 1976-2013
...
Put quick link to 2011 back as that one works
2013-07-02 00:33:53 +01:00
wookey
3f98470af8
Add a function for running people parser
...
And comments on how logbooks can't be read in until 'year' exists in database
2013-06-25 15:59:19 +01:00
wookey
e58b69782c
Add note on how to create a new year in troggle.
2013-06-25 15:56:19 +01:00
wookey
e49e22b37c
Removed asserts which meant that if any 'odd' .svx files, or directories
...
with no obvious 'controlling' svx file, were added to the dataset then the
survex viewer code exploded and the website didn't work.
It's wrong that adding a new cave with an oddly-named .svx file can break
the website in this way, so these asserts are wrong.
2013-06-24 23:32:12 +01:00
