olly
6b4ea7b83e
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
expo
da71cca22f
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
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
64f4e122a5
merge support for django 1.2 location for auth module
2013-07-02 21:12:59 +01:00
Wookey
ba5bc365c1
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
c362b1b529
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
f90b6dc7ab
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
a6a9016548
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
5351108ec1
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
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
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
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
ed13cca261
Add CSRF protection to registration form (and remove annoying second
...
password)
2013-07-02 18:10:45 +01:00
Wookey
d1ad8730d7
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
f3a570a21d
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
f626d3304d
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
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
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
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
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
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
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
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
badb93fcde
Add note on how to create a new year in troggle.
2013-06-25 15:56: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
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
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
wookey
00bd49ef2c
Add parsing_log.txt to the files ignored by the VCS.
2013-06-24 23:29:14 +01:00
wookey
82e69b4f05
Add parsing_log.txt to the files ignored by the VCS.
2013-06-24 23:29:14 +01:00
wookey
261ff3cdae
Add help command and usage info to databaseReset.py
2013-06-24 01:31:14 +01:00
wookey
ea9266ecf9
Add help command and usage info to databaseReset.py
2013-06-24 01:31:14 +01:00
wookey
511c379fe0
Add comment to identifycavedir function
...
and remove now-disused special-case filename
2013-06-24 01:30:17 +01:00
wookey
99ea6778ad
Add comment to identifycavedir function
...
and remove now-disused special-case filename
2013-06-24 01:30:17 +01:00
wookey
25c951b250
Change template headers to show 2012/2013 as shortcuts
2013-06-23 03:19:41 +01:00
wookey
ccd80e74f8
Change template headers to show 2012/2013 as shortcuts
2013-06-23 03:19:41 +01:00
Wookey
7437ac1d38
Add checking for compass too
...
Only print filenames on error by default
2013-05-22 02:33:47 +01:00
Wookey
3057d2a232
Add checking for compass too
...
Only print filenames on error by default
2013-05-22 02:33:47 +01:00
Wookey
b002ca6cc7
Add error check in place where parser died
2013-05-22 02:10:58 +01:00
Wookey
d1ac659d4f
Add error check in place where parser died
2013-05-22 02:10:58 +01:00
wookey
fb495119ab
Add some exception checking to parsers/caves.py so that missing entrance
...
slugs don't blow up the import. Also reduce the noise, so
you just get a warning about missing slugs printed out
2012-09-24 23:23:38 +01:00