Philip Sargent
343d6cf350
delete old forms, templates. fix logdataissues
2021-04-23 11:43:25 +01:00
Philip Sargent
dbd186e299
make ?reload private and clean old error msgs
2021-04-23 03:07:21 +01:00
Philip Sargent
8f89b022c7
drawing file upload form working
2021-04-22 02:45:28 +01:00
Philip Sargent
1968db62ad
archeology on the logbook entry editing forms
2021-04-21 22:09:20 +01:00
Philip Sargent
bcdb3572fa
Add new per-module ToDo texts
2021-04-21 19:08:42 +01:00
Philip Sargent
18938c9fca
more attempts to recognise scotsmen
2021-04-20 23:57:51 +01:00
Philip Sargent
8f0e7435d6
renaming 'tunnel' to 'dwg' in urls and views
2021-04-20 23:57:19 +01:00
Philip Sargent
bad5484d12
fix for missing scotsmen
2021-04-20 23:14:10 +01:00
Philip Sargent
879f6c288e
Make troggle compatible with Django 3.1
2021-04-19 01:32:18 +01:00
Philip Sargent
eea74406c9
fix template bug for newentrance
2021-04-17 23:59:11 +01:00
Philip Sargent
f8b613e0aa
prospect and moving code to better places
2021-04-17 01:41:06 +01:00
Philip Sargent
fa1df39923
stopo prospecting map crashing
2021-04-16 21:28:44 +01:00
Philip Sargent
16ef4fa9fb
split out prospecting guide code
2021-04-16 03:05:39 +01:00
Philip Sargent
9695e49024
add link to all expedition pages back to expoweb /year/ page
2021-04-16 01:56:43 +01:00
Philip Sargent
c2c7de4c59
more cave parsing data fixes
2021-04-14 22:50:47 +01:00
Philip Sargent
bc9b4f508b
Public Import Errors webpage
2021-04-11 20:00:09 +01:00
Philip Sargent
7f5ac93cc6
url dispatcher tidying
2021-04-11 03:02:06 +01:00
Philip Sargent
5d4ad93c51
Better FileNotFound in expofiles
2021-04-10 15:30:29 +01:00
Philip Sargent
cb5b80353d
Therion files now handled
2021-04-08 01:09:06 +01:00
Philip Sargent
b7d54111ba
Import Therion files too
2021-04-07 21:53:43 +01:00
Philip Sargent
d1cd72c5f8
New user login/logoff system using standard Dj
2021-04-06 00:49:09 +01:00
Philip Sargent
409037bdf3
tiny tidyings
2021-04-05 14:01:15 +01:00
Philip Sargent
f6ae46e352
3d CaveView regeneates .3d file in cache
2021-04-03 20:52:35 +01:00
Philip Sargent
663d4a2a02
JSLIB and tidy path settings
2021-04-02 19:22:53 +01:00
Philip Sargent
f752f934b6
fix cave description view
2021-04-01 20:08:57 +01:00
Philip Sargent
51de825189
making PHOTOS files served correctly by troggle
2021-04-01 02:50:30 +01:00
Philip Sargent
8f790309ce
tests for new /site_media/ management
2021-03-31 23:41:46 +01:00
Philip Sargent
2690203912
new method for /site-media/, /static/, /photos/
2021-03-31 23:19:48 +01:00
Philip Sargent
7cccf4daf1
move *_views files to /views/*
2021-03-31 21:51:17 +01:00
Philip Sargent
3452c2c5d4
flatpages to expopages
2021-03-31 16:14:36 +01:00
Philip Sargent
b3b2356a7e
expopages now troggle/core/views_expo
2021-03-30 21:48:36 +01:00
Philip Sargent
cacae6a9cd
rename flatpages as expopages to reduce confusion
2021-03-30 21:05:27 +01:00
Philip Sargent
a4c892b696
fixed serving expofiles from test server
2021-03-28 03:48:04 +01:00
Philip Sargent
c7475cda83
merge expeditions and statistics pages
2021-03-27 20:05:15 +00:00
Philip Sargent
ffaaea497c
re-ordering middleware and logon system
2021-03-27 18:22:07 +00:00
Philip Sargent
dba0fd8b20
remove survexblock webpage - redundant
2021-03-26 21:19:31 +00:00
Philip Sargent
1c7e99e91b
attempting to enable csrf cookie robustly
2021-03-26 17:33:58 +00:00
Philip Sargent
f5e799d632
new remote expofiles option
2021-03-26 13:51:00 +00:00
Philip Sargent
8723d62add
Survex files subdirectories displayed differently
2021-03-25 16:15:26 +00:00
Philip Sargent
a0c3ef8ea1
comments on urls resolution re apache & bugfix
2021-03-21 01:37:52 +00:00
Philip Sargent
18b570d750
remote /expofiles/ now for runserver dev
2021-03-21 01:33:59 +00:00
Philip Sargent
314f600523
Dj1.11.29 running - trimmed unneeded packages
2021-03-17 21:09:44 +00:00
Philip Sargent
d61c2b20c8
Deleted archaisms and new comments
2020-08-02 23:53:35 +01:00
Philip Sargent
0094cf7054
clean troggle menu and drawingfiles layout
2020-07-28 01:22:06 +01:00
Philip Sargent
0403c68429
enabling django/admin/ auto documentn. functions
2020-07-26 23:38:17 +01:00
Philip Sargent
0cf3b869af
First implementation of html API, both TSV and JSON
2020-07-26 20:48:25 +01:00
Philip Sargent
69b843a824
Removing editLogbookEntry capability
2020-07-26 03:22:37 +01:00
Philip Sargent
924c5a3bf8
Delete commented-out code
2020-07-26 02:26:04 +01:00
Philip Sargent
edd5a3efd9
Module documentation docstrings
2020-07-18 16:23:54 +01:00
Philip Sargent
674cea629d
clean up import statements: more specific
2020-06-22 00:03:23 +01:00
Philip Sargent
f3232cc5df
More security, middleware upgrade, dj-reg.2.5
2020-06-20 23:08:34 +01:00
Philip Sargent
d9c6986a89
static files redone
2020-06-18 21:50:16 +01:00
Philip Sargent
bd6490631f
edit this page working
2020-06-18 15:54:40 +01:00
Philip Sargent
640e1e3b5e
cleaner warnings but site_media still not ok
2020-06-18 12:10:42 +01:00
Philip Sargent
f4231456e7
admin urls
2020-06-18 11:48:50 +01:00
Philip Sargent
55dd577275
New url dispatcher OK 1.9.13
2020-06-17 22:55:51 +01:00
Philip Sargent
8fc0ba136f
removed jgtfileupload
2020-06-16 16:48:19 +01:00
Philip Sargent
9f5e779b5e
remove Survey & virtual survey wallet - never used
2020-06-16 16:17:35 +01:00
Philip Sargent
38fa552c00
Disable TinyMCE
2020-06-13 23:16:19 +01:00
Philip Sargent
f8fa426adb
rearrange for clarity
2020-06-13 01:27:42 +01:00
Philip Sargent
9237a6262e
Make import robust against duplicate kataster numbers
2020-06-07 17:49:58 +01:00
Philip Sargent
fda50ed570
attempt to simplify wnt horribly wrong
2020-06-06 22:51:55 +01:00
Philip Sargent
f8a3c8f5bc
Bugfix for capitalised filename extensions
2020-06-05 00:38:05 +01:00
Philip Sargent
681bfcb4c4
removing redundant functions
2020-06-04 23:53:36 +01:00
Philip Sargent
ac9ac5e397
Remove unused Survey object
2020-06-04 23:16:26 +01:00
Philip Sargent
43c6e2f2e1
dlete todo page, partly fix other url pages
2020-06-04 23:00:58 +01:00
Philip Sargent
b7fea2042f
merge exptl & stats, delete millenial & eyecandy
2020-06-04 21:57:04 +01:00
Philip Sargent
90dc3dac3b
Change troggle horizontal menu items
2020-06-01 17:41:41 +01:00
Philip Sargent
c863bf6e1d
Oops. Remove CSV download pages
2020-05-31 21:38:19 +01:00
Philip Sargent
4205821bac
allow STATIC and tinyMCE to work with runserver
2020-05-30 02:34:33 +01:00
Philip Sargent
df3917a677
Expunge cavetab
2020-05-28 02:20:50 +01:00
Philip Sargent
cb4128436c
expung imagekit and clean import lists
2020-05-28 01:38:35 +01:00
Philip Sargent
50d753a87b
Convert codebase for python3 usage
2020-05-24 20:56:27 +01:00
Philip Sargent
d4ac28af18
Remove PHOTOS_ROOT and DPhoto class
2020-05-15 21:32:55 +01:00
cdef395f89
New troggle report on defined directory paths
2020-02-27 00:58:09 +00:00
Sam Wenham
b42249890e
Updating caves and entrances is no longer nuclear!
...
Big overhaul of people processing, fullname added to the model
lastname is now names -1 unless you only have one (yes you Wookey)
this allows for Jon Arne Toft and Wookey to live it the same DB
names can now have html chars in them, this should be real unicode but that can
only happen when we go to Python 3!
2019-04-19 22:52:54 +01:00
Sam Wenham
64a4842dcb
Remove the redundant render_with_context() as django now does this just with the
...
render() shortcut
Move from mimetype to content_type, missed in last commit
2019-03-30 17:02:07 +00:00
Sam Wenham
b4296f1736
Fix people list
...
Cope with Jimmy McFoo as a name!
Don't set the top expo value in the code whin it is piss easy to calculate
Fix typo from last commit
2019-03-09 18:21:10 +00:00
54a9f7a37c
Messing with millenialcaves.html or similar
2019-02-26 12:50:19 +00:00
e4e8cc5993
Messing with millenialcaves.html or similar
2019-02-26 12:47:50 +00:00
8bd0df1bab
Messing with millenialcaves.html or similar
2019-02-26 10:57:02 +00:00
4ae43e94f4
Messing with millenialcaves.html or similar
2019-02-26 10:02:57 +00:00
c733b0f2eb
Messing with millenialcaves.html or similar
2019-02-26 02:03:26 +00:00
810ab3ea4f
Messing with millenialcaves.html or similar
2019-02-26 01:18:47 +00:00
cb5978237b
Messing with millenialcaves.html or similar
2019-02-26 01:13:54 +00:00
ee7d2529e7
Messing with millenialcaves.html or similar
2019-02-26 01:08:04 +00:00
82de967f97
Messing with millenialcaves.html or similar
2019-02-26 01:07:18 +00:00
3c563ce665
Messing with millenialcaves.html or similar
2019-02-26 01:03:22 +00:00
c4455168c6
Messing with millenialcaves.html or similar
2019-02-26 00:35:28 +00:00
6beaf4afdd
Messing with millenialcaves.html or similar
2019-02-26 00:17:11 +00:00
822812525e
Messing with millenialcaves.html or similar
2019-02-26 00:08:15 +00:00
0758efb3ec
2019-02-25 22:34:13 +00:00
54b782c67e
tab/space fix
2019-02-25 22:28:30 +00:00
78a5f656b9
added Rad's playground
2019-02-25 22:24:33 +00:00
Sam Wenham
e6fa54d0e5
Fix survey scans
...
Remove the assert for folders in survey wallets, this does mean currently they
will be ignored by troggle.
2019-02-24 16:46:02 +00:00
Sam Wenham
4ad5b68433
Make things more compatiable with newer python
...
Fix the expeditions list
Improvements to make it compatiable with django 1.8
Bump the years to add 2018
Update the .hgignore file to ignore junk
2019-02-24 13:03:34 +00:00
Sam Wenham
552730f0a3
Revert urls.py as it contains Django 1.8 upgrade code
2019-02-23 15:43:38 +00:00
Sam Wenham
a1f02e575f
Prevent troggle adding the menu if there is one in the file
...
Add a Docker compose file to bring up a dev troggle easily
Various PEP improvments
2019-02-23 15:30:58 +00:00
Sam Wenham
6f6327d267
Merge with django-upgrade
2018-04-17 22:19:20 +01:00
expoonserver
6710a469ee
Add CaveView spinny caves view to each troggle cave page
2018-04-17 21:57:02 +01:00
Sam Wenham
cfa888fde6
More cleanup and modernisation
2018-04-14 21:37:12 +01:00
Sam Wenham
ffb5d7bdda
Upgrade to django 1.5, some functions have been changed
...
url in templates now requires quotes roung the first arg
USE_TZ added
2018-04-11 22:02:57 +01:00
Wookey
44e3eb8a18
Tidy up urls file a little
2014-05-14 20:46:59 +01:00
expo
da71cca22f
Prospecting guide and images and few minor other things.
2013-08-01 17:00:01 +02:00
expoonserver
54d7f1d097
Remove jgtfile URLs (presumably no longer needed)
2012-09-08 01:12:17 +01:00
Martin
cfc90deb83
Merge
2012-08-14 23:49:26 +02:00
Martin
1a0e577606
Bug fixing of cave and entrance forms removal of slugs
2012-08-14 22:51:15 +02:00
Martin
8c1882eec8
fixed spelling
2012-08-14 15:06:18 +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
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
ExpoOnServer
4a074295ad
Looks like photos have been added by editing urls.py.
2012-06-10 16:19:17 +01:00
Martin Green
711fefb0da
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
fac89bae30
Render a cave editing page. Nb it does not do save anything yet.
2012-01-07 19:05:25 +00:00
Wookey
c23fcc5b06
rest of martin's changes, without reverting lineend issues
2011-07-11 23:28:23 +01:00
Martin Green
97c388dba0
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
f766df597c
undosify lineends
2011-07-11 01:49:03 +01:00
Martin Green
5d8a5494cd
Split up tags such that they use ajax
2011-07-11 00:50:07 +01:00
Martin Green
c37124d9c4
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
50545af223
Added editing of flat pages. Added slugfields to models to refer to them.
2011-06-02 19:16:16 +01:00
Martin Green
cdf54e0f9b
Added ability to host website not at the root, eg. http://m.com/troggle/
2011-05-02 02:37:33 +01:00
Martin Green
b001df1f53
edit logbooks, new logbook format, increased database normalisation
2011-05-01 19:32:41 +01:00
goatchurch
1294444026
make 2008 logbook correctly parse
2009-09-14 22:52:46 +01:00
goatchurch
7578b65573
able to save sketches up from tunnel
2009-09-13 17:27:46 +01:00
goatchurch
ced45c92f7
tunnelfiles scheme added
2009-09-11 23:56:47 +01:00
goatchurch
735b729a41
survey scans features added
2009-09-10 22:07:31 +01:00
expo
29adaa03c6
get rid of photo
2009-08-29 18:08:55 +01:00
goatchurch
9f169fb2b9
enable admin url
2009-08-29 17:30:07 +01:00
goatchurch
0ea70273fe
quick hack to make work in django1.0 Photo to DPhoto
2009-08-23 23:29:05 +01:00
goatchurch
c66b5e2dad
[svn] latest hacking for various statistics
2009-08-05 11:58:36 +01:00
goatchurch
9077462893
[svn] now with ability to make new svx file
2009-08-01 07:31:27 +01:00
goatchurch
7158a79a34
[svn] full checkin. animations disabled, sorry
2009-07-27 13:43:43 +01:00
substantialnoninfringinguser
263b640641
[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
8ad044cb2c
[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
38a545e174
[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
7fc1602f7a
[svn] Initial and poor attempt at a view for cave descriptions.
2009-07-04 18:11:20 +01:00
substantialnoninfringinguser
dd76a1a0be
[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
ae3fe8cd42
[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
ca7bc171c9
[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
b4a63eca02
[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
9b44731c33
[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
1d421b2d7c
[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
17175637dc
[svn] codemirror
2009-06-09 18:59:54 +01:00
substantialnoninfringinguser
2c2f11be39
[svn]
2009-05-19 06:32:42 +01:00
substantialnoninfringinguser
21c39f70de
[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
d8a215a575
[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
e9e755b517
[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
0f64e786b5
[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
b31d022c1a
[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
919c7e932a
[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
