xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity
275 Commits 8 Branches 0 Tags 18 MiB
b135ab64e7
Commit Graph

100 Commits

Author SHA1 Message Date
goatchurch
694fe4b4d8 [svn] some file reading things 2009-07-27 13:42:54 +01:00
substantialnoninfringinguser
57ede091c4 [svn] Various bug fixes, using more raw_id fields in admin so it loads faster. I had to put onLoad="contentHeight();" back into the base template. This is a bad solution, I would rather use Martin's, but it wasn't working. 2009-07-22 16:18:00 +01:00
substantialnoninfringinguser
6f0be2c492 [svn] override save for CaveDescriptions to scan qm wikilinks and add into the manytomany field linked_qms 2009-07-11 01:36:00 +01:00
substantialnoninfringinguser
9d90506e1c [svn] 2009-07-04 18:41:48 +01:00
martin speleo
c5c22562e0 [svn] Initial and poor attempt at a view for cave descriptions. 2009-07-04 18:11:20 +01:00
martin speleo
7dce545b4c [svn] Fixed setContentHeight to work properly for eye candy view, whilst removing it from the non-eyecandy view 2009-07-03 21:29:02 +01:00
substantialnoninfringinguser
83fa1ea9ac [svn] Brief code cleanup. 2009-07-03 05:31:49 +01:00
substantialnoninfringinguser
b69ae42ef2 [svn] Use template block "related" for related objects. Various cleanup, fix personexpedition date views. 2009-07-03 00:50:56 +01:00
martin speleo
3e377eb32e [svn] Fixed accidental removal of fading in margin pictures from main page of eye candy site. 
Reduced non eye candy margins.
Moved set contents style height function into main.js from being embeded js, and ran when eye candy is turned on.  Remove style attribute when eye candy is turned back off.
 2009-06-28 23:11:45 +01:00
martin speleo
2ad3d7e332 [svn] Have different css for plain and eye candy views. 2009-06-28 22:23:56 +01:00
martin speleo
b847bde6b7 [svn] Fixed small semantics issues stopping base.js working with IE. 
Made toggle eyecandy persistent (using a cookie)
Made toggle eyecandy turn off footer menu images
Only load footer menu images if the eyecandy is being used.
 2009-06-28 19:33:24 +01:00
substantialnoninfringinguser
3f290349aa [svn] Adding logbook export features. Troggle can now produce .txt or .html logbooks through the controlPanel or via an action in the LogbookEntry admin pages. 2009-06-18 06:53:52 +01:00
substantialnoninfringinguser
5db52862f6 [svn] * Fix bugs that were causing broken wikilinks. *Add edit link to mugshots. *make admin url trailing-slash tolerant 2009-06-12 05:39:30 +01:00
substantialnoninfringinguser
6e3b99c8d2 [svn] Whoops, forgot the template during last commit. 2009-06-10 06:37:38 +01:00
substantialnoninfringinguser
eed4fea255 [svn] Fixed a bug with QMs with numbers between 1 and 10, and fixed the links in the recent changes box. 2009-06-10 05:37:53 +01:00
substantialnoninfringinguser
f9175cc6fa [svn] * Added admin inlines for QMs in LogbookEntry model 
* Added QM list edit view
* Fixed "recent changes" box on front page
 2009-06-10 00:05:02 +01:00
goatchurch
c2a72ab4f1 [svn] fix the revert and css 2009-06-09 19:15:31 +01:00
goatchurch
2927e27b6d [svn] the ajax page 2009-06-09 19:13:48 +01:00
goatchurch
91b9d80367 [svn] codemirror 2009-06-09 18:59:54 +01:00
substantialnoninfringinguser
d645660c50 [svn] Rewrote get_absolute_url methods of models to use urlparse.urljoin instead of just +ing the urls together. This fixes problems with double slashes. 2009-06-08 20:16:18 +01:00
pjrharley
096f74a3f3 [svn] A few registration updates 
-display an error for nonmatching passwords
-display an error for short passwords
-dont direct people to http://http://sitename....
 2009-05-30 16:17:19 +01:00
substantialnoninfringinguser
4735edb9d0 [svn] Have control panel display an error for logged in, non-superuser users. 2009-05-24 23:24:59 +01:00
substantialnoninfringinguser
32a7d5e79f [svn] Fix broken admin link. 2009-05-23 20:06:05 +01:00
pjrharley
7e1bb9ed78 [svn] Dont say activation failed if it didn't\! 2009-05-22 21:02:48 +01:00
pjrharley
bcb013c4ce [svn] Accidentally commited another change... so might as well add the template to go with it. Send activation email as text and html so the link is clickable 2009-05-22 21:02:24 +01:00
substantialnoninfringinguser
3528f56b83 [svn] more survey binder updates 2009-05-22 06:49:13 +01:00
substantialnoninfringinguser
a2154b411e [svn] fix wrongly named template tags 2009-05-22 06:43:25 +01:00
substantialnoninfringinguser
b774c42333 [svn] switched from dodgy manually writing to logfile to using python's logging module, which seems great 2009-05-22 06:17:24 +01:00
substantialnoninfringinguser
49ed6495ad [svn] * Make subcave urls work. 
* Add json and xml download to admin.
 2009-05-22 01:50:16 +01:00
substantialnoninfringinguser
06051fe7dc [svn] allow the recreate tables thing on control panel to work 2009-05-21 20:46:24 +01:00
substantialnoninfringinguser
54a62999c0 [svn] Updates to allow subcave tree with nice admin. 2009-05-21 19:47:19 +01:00
substantialnoninfringinguser
9c1e978da2 [svn] 2009-05-19 06:32:42 +01:00
substantialnoninfringinguser
e9eb00f65d [svn] 2009-05-18 04:30:26 +01:00
substantialnoninfringinguser
d99f44650c [svn] Turn main menu into dropdown (well actually, drop up) menu. 2009-05-18 04:25:42 +01:00
substantialnoninfringinguser
4a42396774 [svn] - Make control panel downloads (qm.csv for each cave, CAVETAB2.CSV) work. 
- Fix problems in QM parsing script
 2009-05-17 04:31:23 +01:00
substantialnoninfringinguser
a4212632b2 [svn] Make the workaround to avoid parsing interlaced pngs actually work (see issue # 14) 2009-05-15 03:56:11 +01:00
substantialnoninfringinguser
5f93301493 [svn] Add: new generic object list template object_list.html, and convenience filter named "link" for making links from objects, and make expeditions list page using those two. Also, fixed survey parsing in databaseReset.py 2009-05-15 03:29:19 +01:00
substantialnoninfringinguser
8538ef27a1 [svn] Forgot to upload with earlier commit 2009-05-14 14:24:46 +01:00
substantialnoninfringinguser
c454fecfc1 [svn] Add link to google code issue tracker 2009-05-13 07:01:45 +01:00
substantialnoninfringinguser
268d69214d [svn] Made the subcaves work! Now we just have to figure out how to parse them... 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8343 by cucc @ 5/11/2009 6:36 AM
 2009-05-13 06:28:36 +01:00
substantialnoninfringinguser
8c68a8a0d7 [svn] Dynamic thumbnail generation for photos and survey scans using imagekit, further improving registration system, other misc. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8336 by cucc @ 5/10/2009 11:05 PM
 2009-05-13 06:23:57 +01:00
substantialnoninfringinguser
1b06243dab [svn] Improve registration system. 
Add jquery fade effects and quick search.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8334 by cucc @ 5/10/2009 5:23 AM
 2009-05-13 06:22:07 +01:00
substantialnoninfringinguser
9972e28a91 [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8333 by cucc @ 5/8/2009 8:20 PM
 2009-05-13 06:21:10 +01:00
substantialnoninfringinguser
09a1539aef [svn] Interface improvements. Code will need some cleaning up. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8331 by cucc @ 5/8/2009 8:16 PM
 2009-05-13 06:19:45 +01:00
substantialnoninfringinguser
625b2156e3 [svn] Weeks of local changes. 
- Import is now non-destructive
- Parsers write output to a log file (path be specified in settings)
- databaseReset.py content been divided into separate functions which can be called for varying levels of deletion and importing
- control panel (view, template, urlpattern) added for deleting and importing
- Logins and signup fixed
- CaveArea model updated, view, hierarchical url patterns, and beginning of template added
- New site style
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8324 by cucc @ 5/3/2009 5:56 AM
 2009-05-13 06:15:48 +01:00
substantialnoninfringinguser
6137f8baaa [svn] Logbook entries are now at /YYYY-MM-DD/slug . 
Try editing a logbook entry title in the admin now. The django built in auto slug field is fun and javascripty.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8308 by aaron @ 3/16/2009 7:27 PM
 2009-05-13 06:09:55 +01:00
substantialnoninfringinguser
157f11b659 [svn] Added QM wiki markup. The format is [[cave:204 QM:2005-04A]] with the grade (A) being optional. The links color red if the QM does not exist, and in that case clicking on them goes to an admin add page with fields prepopulated. 
Various other little things, e.g. filled in the footer with links.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8305 by aaron @ 3/16/2009 8:53 AM
 2009-05-13 06:08:04 +01:00
substantialnoninfringinguser
256de6e083 [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8304 by aaron @ 3/15/2009 11:12 PM
 2009-05-13 06:07:19 +01:00
substantialnoninfringinguser
5811124d9d [svn] fix year links 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8303 by julian @ 3/15/2009 10:44 PM
 2009-05-13 06:06:46 +01:00
substantialnoninfringinguser
91e4f0f8c0 [svn] Reverted the reverts from 8267. Fixed the next / previous trip in personexpedition on the LogbookEntry template -- I had misunderstood what this was supposed to do last time I messed with it. This involved adding the methods PersonTrip.get_persons_next_trip and persons_previous_trip. Couldn't find any other broken things. 
Kept the productive changes in 8267: extending the logbook parsing back to 1993, changing index page, changes to view_surveys.py

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8274 by aaron @ 3/14/2009 8:38 AM
 2009-05-13 06:02:42 +01:00