Commit Graph

1280 Commits

Author SHA1 Message Date
aaron
7a4f8987f8 [svn r8093] Added QM model and parser. Had to merge models_cave.py and models_logbooks.py into models.py. This is because logbook entries now have an optional foreign key to caves, and QMs have a required foreign key to a logbook entry of the trip that created them. So, the two files became circularly dependent.
Also, the urls for the person model now allow lookups using their actual first and last name in the url instead of the primary key. We should do similar things for all models, maybe even using the url as a search which results in a page with multiple model instance results if the input is ambiguous (e.g. they only enter a first name).
2008-12-14 00:17:33 +01:00
aaron
fe81408800 [svn r8092] 2008-12-09 19:58:32 +01:00
aaron
88146c9a25 [svn r8091] undo stupid change 2008-12-09 19:51:11 +01:00
aaron
e783b3b576 [svn r8090] 2008-12-09 18:45:34 +01:00
aaron
f4f4efbe0e [svn r8089] Fix settings reference. 2008-12-09 09:49:59 +01:00
aaron
7f43f0ccc8 [svn r8088] 2008-12-09 09:02:21 +01:00
aaron
4e1b4684cd [svn r8087] Try and sort out settings mess. 2008-12-09 05:48:56 +01:00
aaron
b04d822383 [svn r8086] whoops, no slash 2008-12-09 03:05:23 +01:00
aaron
262b32bad5 [svn r8085] Trying to fix framos troggle 2008-12-09 03:01:31 +01:00
aaron
5720e9f9c5 [svn r8084] Forgot to add cave and logbook search templates in earlier commit. 2008-12-09 02:31:30 +01:00
aaron
feb0f3a5c5 [svn r8083] 2008-12-08 06:17:35 +01:00
aaron
6b1555f867 [svn r8082] Remove MEDIA_ROOT from settings.py because it belongs in local settings, and comment out urlconf line for unfinished edit form which I haven't checked in. 2008-12-08 06:10:45 +01:00
aaron
97332b8103 [svn r8081] Added cave and logbook search, collapsible footer navbar, useless statistics page. Also fixed broken css. Toying with forms but not committing those yet. 2008-12-08 05:28:03 +01:00
aaron
12118e4a59 [svn r8080] Replace "django" with "troggle" in admin 2008-12-07 23:18:58 +01:00
julian
aff675d7f4 [svn r8079] Generalised the way dates are stored, and added a personRole and Role field 2008-11-09 00:27:00 +01:00
julian
a76fd17c4e [svn r8078] Added survex persons to admin site 2008-11-09 00:24:24 +01:00
julian
503d00db90 [svn r8077] *teams and *date identified and scrapped 2008-11-09 00:23:27 +01:00
julian
b85c962575 [svn r8076] Djangoed Julians code
added underscores to field names
turned __str__ to __unicode__
2008-11-08 19:24:03 +01:00
julian
f08d6b6ecf [svn r8075] Removed troggle from urls 2008-11-08 16:37:12 +01:00
julian
c126d85b87 [svn r8074] Use URL_ROOT for links 2008-11-07 10:12:11 +01:00
julian
400276daae [svn r8073] Added URL_ROOT to local settings 2008-11-07 10:10:03 +01:00
julian
379183b9db [svn r8072] add local settings files 2008-11-07 10:09:45 +01:00
julian
657046ca8c [svn r8071] convert unfound files to lower case and try again 2008-11-07 09:55:37 +01:00
julian
627ffdf9cd [svn r8070] forgot the bad symbol 2008-11-07 03:34:40 +01:00
julian
abcd18531d [svn r8069] going back now works 2008-11-07 03:31:52 +01:00
julian
5f18df3822 [svn r8068] going back now works 2008-11-07 03:30:53 +01:00
julian
e8b493d070 [svn r8067] remove nonasc 2008-11-07 03:25:00 +01:00
julian
c057ec34f3 [svn r8066] quick 2008-11-07 03:09:23 +01:00
julian
9e26b652b2 [svn r8065] long putting in 2008-11-07 03:08:47 +01:00
julian
d5f15a98e2 [svn r8063] Converted <p> tags to wiki style "\n\n"
Tidied header
2008-11-07 00:29:38 +01:00
julian
c496000d97 [svn r8062] wiki_to_html changed to wiki_to_html_short 2008-11-07 00:25:11 +01:00
julian
d639a53f20 [svn r8061] Wiki_markup imporved to include paragraphs
wiki_to_html should be used when the field will include paragraphs
wiki_to_html_short should be used when the field will not include paragraphs
2008-11-07 00:24:20 +01:00
julian
91f24887ab [svn r8059] forgotten 2008-11-06 22:29:46 +01:00
julian
a08daf8e21 [svn r8058] Becka's work 2008-11-04 22:54:21 +01:00
julian
901c2ad3f5 [svn r8057] Moved templates and python path into the various localsettings files 2008-11-03 00:22:19 +01:00
julian
00dbc91314 [svn r8056] Moved up a directory 2008-11-03 00:19:53 +01:00
julian
223a32a5db [svn r8055] Moved template directories to local settings 2008-11-03 00:18:55 +01:00
julian
c2876c0b64 [svn r8054] Removed last of the sqlite save hack
Started to add reading of dates
Changed character encoding code so it works
2008-11-03 00:17:28 +01:00
julian
e56ad841b2 [svn r8053] Added date field 2008-11-03 00:15:37 +01:00
julian
316807afff [svn r8052] Moved and improved reset script from the parsers directory 2008-11-03 00:14:37 +01:00
julian
65caea6e05 [svn r8051] Removed last of the sqlite save hack 2008-11-03 00:13:04 +01:00
julian
3301c10513 [svn r8050] Increased maximum length of some of the fields to fit with the cavetab data 2008-11-03 00:10:19 +01:00
aaron
6b91da5b60 [svn r8049] Settings.py now references localsettings.py, which is kept outside of SVN and is specific to each machine. 2008-11-02 05:18:41 +01:00
julian
233f376608 [svn r8047] more parsing back to 2002 2008-10-31 15:43:57 +01:00
julian
3a61277647 [svn r8046] forgotten 2008-10-31 14:58:13 +01:00
julian
0a9bfa3178 [svn r8045] with cave orders at front 2008-10-30 23:11:28 +01:00
julian
727c2994fb [svn r8044] make the person logbooks work 2008-10-30 14:13:35 +01:00
aaron
dfebde5da1 [svn r8043] Add Martin's reset script 2008-10-29 08:35:01 +01:00
aaron
8bfa77583e [svn r8042] Add QM model. Note that I had to put models_logbook into models cave because it referred to models from both. Will try to split them back up, should be possible. 2008-10-28 23:21:35 +01:00
aaron
0575f0630e [svn r8041] Fix edit conflict screwup 2008-10-27 19:12:12 +01:00