2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-12-11 19:12:17 +00:00
Commit Graph

259 Commits

Author SHA1 Message Date
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
pjrharley
18e080418f [svn] Use the django compatability thing - webserver might have old python on it.... 2009-05-23 21:13:53 +01:00
substantialnoninfringinguser
4ba77b9c2f [svn] Fix mistakes in export admin actions. The python serializer only works on simple objects (lists, dicts etc) and not model instances so nix that part. 2009-05-23 20:46:10 +01:00
substantialnoninfringinguser
470fe5a1d1 [svn] Re-enable JSON and XML export actions in admin pages now that troggle is using latest SVN version of Django. 2009-05-23 20:37:42 +01:00
substantialnoninfringinguser
32a7d5e79f [svn] Fix broken admin link. 2009-05-23 20:06:05 +01:00
substantialnoninfringinguser
9006016bfd [svn] fix imports 2009-05-23 16:51:21 +01:00
substantialnoninfringinguser
941ff3fdac [svn] Created wiki page through web user interface. 2009-05-22 22:38:41 +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
pjrharley
a50485729f [svn] Use hashlib rather than depreciated sha 2009-05-22 20:59:03 +01:00
substantialnoninfringinguser
f573ffbb5d [svn] Edited wiki page through web user interface. 2009-05-22 08:17:17 +01:00
substantialnoninfringinguser
e2affe7867 [svn] Edited wiki page through web user interface. 2009-05-22 07:59:37 +01:00
substantialnoninfringinguser
5095282c59 [svn] Created wiki page through web user interface. 2009-05-22 07:58:58 +01:00
substantialnoninfringinguser
431e7226d9 [svn] Created wiki page through web user interface. 2009-05-22 07:47:11 +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
3784eb9720 [svn] - Remove feature (admin JSON / XML downloads) which won't work until we have django 1.1 installed (works on my SVN version, but not on seagrass debian package version).
- Copy feincms media to project so that we don't have to serve it separately. Also useful because we may want to customize it.
2009-05-22 02:54:09 +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
9f13a58498 [svn] minor logfile mistake 2009-05-21 22:55:08 +01:00
substantialnoninfringinguser
06051fe7dc [svn] allow the recreate tables thing on control panel to work 2009-05-21 20:46:24 +01:00
substantialnoninfringinguser
a24becd004 [svn] fix minor logfile error 2009-05-21 20:24:21 +01:00
substantialnoninfringinguser
2dfcfb6ffa [svn] 2009-05-21 20:17:07 +01:00
substantialnoninfringinguser
54a62999c0 [svn] Updates to allow subcave tree with nice admin. 2009-05-21 19:47:19 +01:00
substantialnoninfringinguser
99949d466a [svn] forgot to add earlier 2009-05-20 03:28:48 +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
b4c1d0cbb9 [svn] semi ugly hack... 2009-05-15 03:38: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
c4ff04c357 [svn] localsettings should override settings, so the import should be at the bottom of the file, unless someone has a better way of doing this 2009-05-14 06:39:36 +01:00
substantialnoninfringinguser
b1cc5ce6b5 [svn] 2009-05-14 06:32:58 +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
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
987bd56edd [svn]
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8342 by cucc @ 5/11/2009 3:23 AM
2009-05-13 06:27:45 +01:00
substantialnoninfringinguser
736d13310a [svn]
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8341 by cucc @ 5/11/2009 3:21 AM
2009-05-13 06:27:00 +01:00
substantialnoninfringinguser
ee1d4d8501 [svn] django-evolution is optional so shouldn't be in main settings
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8340 by cucc @ 5/11/2009 3:18 AM
2009-05-13 06:26:17 +01:00
substantialnoninfringinguser
b509390575 [svn] Switch from photologue to imagekit. Less bloat.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8338 by cucc @ 5/11/2009 3:08 AM
2009-05-13 06:24:52 +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
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
6006eebb57 [svn]
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8332 by cucc @ 5/8/2009 8:17 PM
2009-05-13 06:20:26 +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