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

94 Commits

Author SHA1 Message Date
expoonserver
e2c6845ae0 Remove jgtfile URLs (presumably no longer needed) 2012-09-08 01:12:17 +01:00
Martin
71289d9b0f 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
532b8e064b fixed spelling 2012-08-14 15:06:18 +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
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
ExpoOnServer
00c0358855 Looks like photos have been added by editing urls.py. 2012-06-10 16:19:17 +01:00
Martin Green
9024520184 Start to change dataformat for caves, along with there editing. Start to change survex reader to cope better with equates/tags. 2012-06-10 14:59:21 +01:00
Martin Green
599c59454a Render a cave editing page. Nb it does not do save anything yet. 2012-01-07 19:05:25 +00:00
Wookey
ded3d58da1 rest of martin's changes, without reverting lineend issues 2011-07-11 23:28:23 +01:00
Martin Green
3b028661f6 Moved troggle main page to /troggle added a link in flat pages. 
Now / takes you to the expoweb index page
 2011-07-11 22:38:40 +01:00
Wookey
a2e1882d91 undosify lineends 2011-07-11 01:49:03 +01:00
Martin Green
5cbfa6d8b1 Split up tags such that they use ajax 2011-07-11 00:50:07 +01:00
Martin Green
85318ac666 Add ability to views caves via their cave slug. Not recommended until links are fixed. 2011-07-10 23:48:13 +01:00
Martin Green
f318105a9b Added editing of flat pages. Added slugfields to models to refer to them. 2011-06-02 19:16:16 +01:00
Martin Green
9becad0d9a Added ability to host website not at the root, eg. http://m.com/troggle/ 2011-05-02 02:37:33 +01:00
Martin Green
a26310767b edit logbooks, new logbook format, increased database normalisation 2011-05-01 19:32:41 +01:00
goatchurch
24d90bae75 make 2008 logbook correctly parse 2009-09-14 22:52:46 +01:00
goatchurch
517d291636 able to save sketches up from tunnel 2009-09-13 17:27:46 +01:00
goatchurch
12cf3a6d53 tunnelfiles scheme added 2009-09-11 23:56:47 +01:00
goatchurch
ece3b79e5d survey scans features added 2009-09-10 22:07:31 +01:00
expo
65cebce198 get rid of photo 2009-08-29 18:08:55 +01:00
goatchurch
69dd36bdb5 enable admin url 2009-08-29 17:30:07 +01:00
goatchurch
20eac2d04b quick hack to make work in django1.0 Photo to DPhoto 2009-08-23 23:29:05 +01:00
goatchurch
e4496e4cd8 [svn] latest hacking for various statistics 2009-08-05 11:58:36 +01:00
goatchurch
60dcb82ef6 [svn] now with ability to make new svx file 2009-08-01 07:31:27 +01:00
goatchurch
b135ab64e7 [svn] full checkin. animations disabled, sorry 2009-07-27 13:43:43 +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
bfa202078b [svn] * Make Q< wikilinks work again 
* Add new ajax bit in LogbookEntry admin which checks for QMs not in wikilink format and allows one click fixes. Soon to be expanded to check for wikilinks that aren't in foreignkey.
* Tweaks to admin including using raw_id_fields for PersonExpedition & other foreignkeyed models with lots of instances.
 2009-07-06 08:31:24 +01:00
substantialnoninfringinguser
ebebb2f4bc [svn] Remove old subcave model, along with mptt and feincms. Also move OtherCaveNames admin representation to an inline in Cave. 2009-07-04 19:26:51 +01:00
martin speleo
c5c22562e0 [svn] Initial and poor attempt at a view for cave descriptions. 2009-07-04 18:11:20 +01:00
substantialnoninfringinguser
b816463d1d [svn] * Adding JS fill in next QM number via ajax. 
* Slight models cleanup- get rid of TroggleImageModel class, use mixin instead.
* Collect various troggle shared functions into utils.py
 2009-07-04 08:27:49 +01:00
substantialnoninfringinguser
e565a6b73b [svn] Renaming troggle.expo to troggle.core. To do this, used: 
perl -p -i -e "s/expo(?=[\s\.']+)/core/g" `find -name \*.py`

and then manually checked each change (had to remove a couple)
 2009-07-02 20:43:18 +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
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
goatchurch
91b9d80367 [svn] codemirror 2009-06-09 18:59:54 +01:00
substantialnoninfringinguser
9c1e978da2 [svn] 2009-05-19 06:32: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
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
57a972fae7 [svn] Fixed broken buttons on controlpanel, added CAVETAB2.CSV export and download buttons and made them work too. 
Changed ordering on PersonExpeditions so that it is based on their expedition. That way, even if we don't have date info on when a user was on expo exactly, pages like personindex work correctly.
 2009-05-14 06:19:46 +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
21204f1bc8 [svn] Fixes to deal with reorganization of expo surveys repository. Now that survey scans and Surveys.csv are in different directories, we have two settings variables, settings.SURVEYS for the root of the survey repo, and settings.SURVEY_SCANS for the surveyscans directory. 
Fixed tab / indent muck in surveys parser. Commented out some "file abstraction" stuff for the time being.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8335 by cucc @ 5/10/2009 7:26 AM
 2009-05-13 06:22:53 +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
2314373756 [svn] I worked on the trip_report view for a while before realizing it would be easier to just customize the LogbookEntry admin view to achieve the same effect. I never meant to commit it, but it snuck in to the urls.py 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8315 by aaron @ 3/30/2009 7:50 AM
 2009-05-13 06:14:08 +01:00
substantialnoninfringinguser
dab8dcea70 [svn] Decoupled get_absolute_url methods from urlconf by using reverse() 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8313 by aaron @ 3/30/2009 6:12 AM
 2009-05-13 06:12:54 +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