2982 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Martin	71289d9b0f	Merge	2012-08-14 23:49:26 +02:00
Martin	cfc90deb83	Merge	2012-08-14 23:49:26 +02:00
Martin	25a73c4ab7	Bug fixing of cave and entrance forms removal of slugs	2012-08-14 22:51:15 +02:00
Martin	1a0e577606	Bug fixing of cave and entrance forms removal of slugs	2012-08-14 22:51:15 +02:00
Martin	a4f9f5bb5a	ignore files ending in ~	2012-08-14 15:31:34 +02:00
Martin	a05fe94d90	ignore files ending in ~	2012-08-14 15:31:34 +02:00
Martin	29c2c5f88d	added entrance locations	2012-08-14 15:08:08 +02:00
Martin	8e64062214	added entrance locations	2012-08-14 15:08:08 +02:00
Martin	532b8e064b	fixed spelling	2012-08-14 15:06:18 +02:00
Martin	8c1882eec8	fixed spelling	2012-08-14 15:06:18 +02:00
Martin	951f88a59a	allow extensions to be capatalised	2012-08-14 15:05:15 +02:00
Martin	8dd51096cf	allow extensions to be capatalised	2012-08-14 15:05:15 +02:00
expo	28047277f1	Started removing foreignkeys to caves, to achieve greater flexability. Some log book entries stuff may be broken. Add ability to make new caves and entrances via website.	2012-08-12 19:10:23 +02:00
expo	ecd5bbcb1d	Started removing foreignkeys to caves, to achieve greater flexability. Some log book entries stuff may be broken. Add ability to make new caves and entrances via website.	2012-08-12 19:10:23 +02:00
Martin Green	5ff163efaa	Prospecting template	2012-08-10 19:34:44 +02:00
Martin Green	6d5babd331	Prospecting template	2012-08-10 19:34:44 +02:00
Martin Green	52736ca1b3	Made a prospecting guide and fixed survex station description. Removed parsing of underground descriptions to wikis.	2012-08-10 19:02:13 +02:00
Martin Green	79b7d32664	Made a prospecting guide and fixed survex station description. Removed parsing of underground descriptions to wikis.	2012-08-10 19:02:13 +02:00
expo	484f8f76cc	Fixed directory names for the survey scans such that surveys could be found. It did not seem possible to simply change the localsettings.py file to get it to work.	2012-08-08 11:29:15 +02:00
expo	dd66ad835a	Fixed directory names for the survey scans such that surveys could be found. It did not seem possible to simply change the localsettings.py file to get it to work.	2012-08-08 11:29:15 +02:00
expo	70a743f88b	Prevent modification of auto generated files	2012-08-06 12:56:20 +02:00
expo	a29fd964bd	Prevent modification of auto generated files	2012-08-06 12:56:20 +02:00
expo	44eb3c0caf	Editing no longer changes files more than nesecary. Removed TinyMCE editing. /Sumbit/Submit	2012-08-06 12:19:48 +02:00
expo	1ef274ec1d	Editing no longer changes files more than nesecary. Removed TinyMCE editing. /Sumbit/Submit	2012-08-06 12:19:48 +02:00
expo	c221b75afc	Fix broken markup	2012-08-05 21:37:46 +02:00
expo	0f5627505f	Fix broken markup	2012-08-05 21:37:46 +02:00
expo	b2fc3dd35b	Fixed cave order	2012-08-05 19:28:34 +02:00
expo	c0782e1cca	Fixed cave order	2012-08-05 19:28:34 +02:00
expo	2208f0748b	Fixed cave order	2012-08-05 19:26:24 +02:00
expo	ed1d273e03	Fixed cave order	2012-08-05 19:26:24 +02:00
expo	0785455bac	FIx base template so admin link, expoweb link work and use consistent base URL	2012-08-05 02:33:48 +02:00
expo	9654e5da1c	FIx base template so admin link, expoweb link work and use consistent base URL	2012-08-05 02:33:48 +02:00
expo	742848409b	Note that the instructions for adding a survey are all wrong.	2012-08-05 00:35:02 +02:00
expo	8040b746b4	Note that the instructions for adding a survey are all wrong.	2012-08-05 00:35:02 +02:00
expo	0c20ef2a04	Fix up parser paths so everything is found	2012-08-05 00:26:05 +02:00
expo	05004aa874	Fix up parser paths so everything is found	2012-08-05 00:26:05 +02:00
Martin Green	833ddeef8b	Merge	2012-06-10 17:24:10 +01:00
Martin Green	4a21720745	Merge	2012-06-10 17:24:10 +01:00
Martin Green	d37001962b	no need to export to cavetab2 anymore	2012-06-10 17:22:50 +01:00
Martin Green	13cb2e9b0f	no need to export to cavetab2 anymore	2012-06-10 17:22:50 +01:00
ExpoOnServer	6ba6f108ab	merge	2012-06-10 17:21:26 +01:00
ExpoOnServer	0259947cda	merge	2012-06-10 17:21:26 +01:00
ExpoOnServer	0fabcaedf8	no need to export cavetab2 anymore	2012-06-10 17:20:57 +01:00
ExpoOnServer	080684e56f	no need to export cavetab2 anymore	2012-06-10 17:20:57 +01:00
Martin Green	f369f34c8f	update caves from new cave file format not cavetab2.csv	2012-06-10 17:16:33 +01:00
Martin Green	4b269bb234	update caves from new cave file format not cavetab2.csv	2012-06-10 17:16:33 +01:00
Martin Green	0d346c80f7	Merge	2012-06-10 16:56:44 +01:00
Martin Green	1a62931202	Merge	2012-06-10 16:56:44 +01:00
Martin Green	19055d01fb	New parser for new cave format	2012-06-10 16:56:12 +01:00
Martin Green	c2029df3c9	New parser for new cave format	2012-06-10 16:56:12 +01:00