Wookey
dc385b52bf
Merge in Sam's parser debugging
2015-04-08 03:27:48 +01:00
Wookey
bc4fa32ce9
rename troggle paper.odt to troggle_paper.odt as space in repo are a
...
pain
2015-04-08 03:24:00 +01:00
Wookey
d5d0a24bed
Rename troggle paper to not have a space in it.
2015-04-06 02:38:24 +01:00
Sam Wenham
244a6177cf
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
086bfe61a1
One more try
2015-01-26 21:15:17 +00:00
Sam Wenham
187e537f46
Ooops that wasn't right
2015-01-26 21:13:47 +00:00
Sam Wenham
a5e7fcf435
Don't assert an error on bad date formats
2015-01-26 21:12:27 +00:00
Sam Wenham
3bdd1ad737
A little more verbosity
2015-01-19 22:48:50 +00:00
Sam Wenham
0ab32ef60a
Add a little verbosity
2015-01-19 22:41:48 +00:00
Sam Wenham
9961c31e73
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
7bd035f602
remove two files accidentally included in last commit
2014-09-11 07:41:33 +01:00
Wookey
086793c341
remove internal copies of jquery, jquiery-forms, jquery-ui+themes,
...
django-feincms and codemirror
2014-09-11 07:40:58 +01:00
Wookey
814ecf8425
Fix templates to use system javascript for jquery, jquery-ui and
...
jquery-ui themes
2014-09-11 07:38:45 +01:00
Wookey
8563edd4a7
Use REPOS_ROOT_PATH so there is just one place to change paths
2014-09-11 06:33:34 +01:00
Wookey
e72546d4b8
Update the README file a bit - still needs work.
2014-09-10 23:46:05 +01:00
Wookey
9d3cac41b9
Merge change of 'cavesnew'->'caves' in databasereset.
2014-07-28 01:22:52 +01:00
Wookey
3daf8d14c9
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
d4750e7ce9
Change databasereset to use 'caves' instead of 'cavesnew' for reloading the cave database
2014-07-28 00:18:10 +01:00
expo
ea72b68532
Set potato hut localsettingsfile to have correct URLs
2014-07-23 09:47:48 +01:00
Sam
90fbc05e2d
Fix media url to allow for working in the hut
2014-07-23 09:10:31 +01:00
expo
511f0cf515
Add a new config file for the potato hut setup.
2014-07-23 09:11:17 +01:00
Wookey
963259d6e3
Allow comma in starcommands (*,fix) (comma is default valid *set blank)
2014-07-01 02:26:26 +01:00
Wookey
9d9fad2ae4
Fix survex parser to allow whitespace between * and command (as survex
...
does).
2014-07-01 02:12:34 +01:00
Wookey
8cad25ecc4
merge in survex parsing changes from server.
2014-06-26 02:37:55 +01:00
expoonserver
01d4efccdd
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
042507cb91
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
011fa3acb3
Merge with server version
2014-06-09 19:30:06 +01:00
expoonserver
f54f0d9d7f
Refer to debian package, not upstream URL
2014-05-19 03:11:46 +01:00
Wookey
624c2d96df
Tidy up urls file a little
2014-05-14 20:46:59 +01:00
wookey
4d6f8cb079
Document 'cavesnew' option in databasereset.py - which just reads in
...
caves datafiles.
2013-10-07 23:45:59 +01:00
olly
6b84d811a2
merge
2013-08-08 15:48:10 +02:00
expo
df8618d0f0
Prospecting guide and images and few minor other things.
2013-08-01 17:00:01 +02:00
wookey
9f5f5fb616
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
64f4e122a5
merge support for django 1.2 location for auth module
2013-07-02 21:12:59 +01:00
Wookey
9737a09c26
3rd attempt at getting the right syntax for the CSRF protection in
2013-07-02 21:11:07 +01:00
Wookey
b90a311d9c
update location of auth module for django 1.4
2013-07-02 21:10:30 +01:00
wookey
a376044fdf
Add support for old and new (1.4 on) location for auth module.
2013-07-02 21:05:48 +01:00
Wookey
ecfa6b19a0
merged in proper CSRF changes from server
2013-07-02 20:23:55 +01:00
Wookey
1471abeda7
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
6adcadb97c
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
ed13cca261
Add CSRF protection to registration form (and remove annoying second
...
password)
2013-07-02 18:10:45 +01:00
wookey
0dfbd1c84f
Add csrf token to registration forms
2013-07-02 17:26:35 +01:00
Wookey
ca1a1dfb97
parsing_log should not be saved in the vcs
2013-07-02 00:49:07 +01:00
Wookey
c3bde999c1
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
97c7a2fd87
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
ce249ab957
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
81d9d7533e
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
badb93fcde
Add note on how to create a new year in troggle.
2013-06-25 15:56:19 +01:00
wookey
8badd8b556
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
wookey
00bd49ef2c
Add parsing_log.txt to the files ignored by the VCS.
2013-06-24 23:29:14 +01:00
