Philip Sargent
785d6360cd
Now compat with Dj2.0.13 & 1.11.29
2021-04-06 22:50:57 +01:00
Philip Sargent
d1cd72c5f8
New user login/logoff system using standard Dj
2021-04-06 00:49:09 +01:00
Philip Sargent
6d6bec35f2
fix incorrect folder when showing index.html
2021-04-05 15:48:48 +01:00
Philip Sargent
9db1a8490c
fix bug in parsing bad HTML pages e.g.expo 82
2021-04-05 14:49:06 +01:00
Philip Sargent
409037bdf3
tiny tidyings
2021-04-05 14:01:15 +01:00
Philip Sargent
4d7e3d6866
no permission for this on expo server
2021-04-03 21:09:16 +01:00
Philip Sargent
ab5512e9d6
bugger, missed this edit
2021-04-03 20:54:33 +01:00
Philip Sargent
f6ae46e352
3d CaveView regeneates .3d file in cache
2021-04-03 20:52:35 +01:00
Philip Sargent
52c1dabd0e
survex_file field inconsistency detection & edit
2021-04-02 23:21:23 +01:00
Philip Sargent
bd8d59b343
restoring wiki_markup where still used
2021-04-02 23:17:54 +01:00
Philip Sargent
663d4a2a02
JSLIB and tidy path settings
2021-04-02 19:22:53 +01:00
Philip Sargent
d841faa057
login decorator moved into views & .gitignore
2021-04-02 15:51:14 +01:00
Philip Sargent
c8cc1673e0
enable non-cave html and images redirection
2021-04-01 21:44:03 +01:00
Philip Sargent
f752f934b6
fix cave description view
2021-04-01 20:08:57 +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
9d8a44696b
remove garbage & duplicated code
2021-03-31 22:13:51 +01:00
Philip Sargent
7cccf4daf1
move *_views files to /views/*
2021-03-31 21:51:17 +01:00
Philip Sargent
e1cf43c260
trailing slashes fixed
2021-03-31 20:18:46 +01:00
Philip Sargent
a6ed0a964e
making flat files delivery more robust
2021-03-31 17:57:43 +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
0f024b27f0
Replace assert() with DataIssue message
2021-03-29 02:06:19 +01:00
Philip Sargent
c81f17c24b
more tests for files served from several places
2021-03-28 23:48:36 +01:00
Philip Sargent
623483f3b1
Fixing multiple caves with same kataser no
2021-03-28 23:47:47 +01:00
Philip Sargent
a99020078c
tidy render() calls
2021-03-28 03:48:24 +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
0abd8aedff
layout tidying
2021-03-26 21:20:08 +00:00
Philip Sargent
dba0fd8b20
remove survexblock webpage - redundant
2021-03-26 21:19:31 +00:00
Philip Sargent
ec83c1ff12
csrf continued
2021-03-26 19:42:58 +00:00
Philip Sargent
f5e799d632
new remote expofiles option
2021-03-26 13:51:00 +00:00
Philip Sargent
2e068d3fbb
move mistake to expoweb
2021-03-26 13:30:40 +00:00
Philip Sargent
713db304e2
deleting unused old utilities
2021-03-26 13:14:52 +00:00
Philip Sargent
3487c22da3
Survex 1624, 1626, 1627 now displayed robustly
2021-03-26 02:01:29 +00:00
Philip Sargent
65c3cb31d7
improved display of survex files for a cave
2021-03-25 20:23:25 +00:00
Philip Sargent
80874887cc
404 fix attempt
2021-03-25 16:15:58 +00:00
Philip Sargent
8723d62add
Survex files subdirectories displayed differently
2021-03-25 16:15:26 +00:00
Philip Sargent
65be64c756
type data added to report
2021-03-24 21:16:06 +00:00
Philip Sargent
2fe2c0515f
update push procedure and fix order in pathsreport
2021-03-24 20:38:43 +00:00
Philip Sargent
39194704f5
pathlib updates
2021-03-24 17:32:45 +00:00
Philip Sargent
9a91487375
pathlib for path management & cavelist fixes
2021-03-24 15:46:35 +00:00
Philip Sargent
a9fa251fee
now robust re svx in folders unofficial numbers
2021-03-23 17:35:41 +00:00
Philip Sargent
4e00645851
fix if empty directory present & display 144, 40
2021-03-23 16:36:55 +00:00
Philip Sargent
18b570d750
remote /expofiles/ now for runserver dev
2021-03-21 01:33:59 +00:00
Philip Sargent
6ac65cf893
Buxfix for cave search not finding any cave file
2021-03-17 20:58:25 +00:00
Philip Sargent
5836c6ff90
Importing old logbooks
2021-02-06 00:18:48 +00:00
Philip Sargent
d61c2b20c8
Deleted archaisms and new comments
2020-08-02 23:53:35 +01:00
Philip Sargent
95b9daca80
remove commented out code, more comments
2020-07-29 22:54:09 +01:00
Philip Sargent
0094cf7054
clean troggle menu and drawingfiles layout
2020-07-28 01:22:06 +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
809633bdd3
Fixed QMs in Admin control panel &remv. OtherCave
2020-07-23 02:16:08 +01:00
Philip Sargent
64727e0d3a
Commented-out unused CaveDescription object
2020-07-23 01:24:06 +01:00
Philip Sargent
2a0aee5bf5
remove NewSubCave
2020-07-23 01:08:45 +01:00
Philip Sargent
427afa9ebd
Removing foissil: subcave and flatpages-redirects
2020-07-22 23:14:09 +01:00
Expo on server
92de606bc6
removing files which are generated
2020-07-22 23:14:02 +01:00
Philip Sargent
5aed96c5a6
mistake
2020-07-21 00:18:02 +01:00
Philip Sargent
5bc2c132fa
fix makes prospecting_guide work
2020-07-21 00:15:53 +01:00
Expo on server
f7db908cb2
generated files should be in gitignore
2020-07-20 23:51:15 +01:00
Philip Sargent
1bc82dea15
make survexblock titles 200 chars
2020-07-20 23:25:49 +01:00
Philip Sargent
f131509c56
3dtopos to survexpos + comments
2020-07-20 22:53:26 +01:00
Expo on server
8e77a70ad6
remove unused SVX_URL variable
2020-07-20 20:11:07 +01:00
Philip Sargent
28130de9cb
avoiding problem with WSGI populate() error
2020-07-20 18:31:50 +01:00
Expo on server
d7838e2a42
migraitons files should be in gitign9ore
2020-07-20 12:54:32 +01:00
Philip Sargent
eb923af44f
webpage tests created (no database)
2020-07-19 01:23:07 +01:00
Philip Sargent
d2833d26cc
fix schema and try cache caves import
2020-07-06 20:27:31 +01:00
Philip Sargent
8530b0643d
person attribution of surveyed length working
2020-07-06 01:24:43 +01:00
Philip Sargent
5be41c8163
splays and alias splays implemented
2020-07-04 13:31:46 +01:00
Philip Sargent
df434cd399
SurvexBlocks now importing in deatil
2020-07-01 22:49:38 +01:00
Philip Sargent
5feb07e3f6
Creates folders as needed on editing new svx file
2020-07-01 00:20:27 +01:00
Philip Sargent
6b0275d035
CASCADE on delete removed from key foregin keys
2020-06-30 15:26:03 +01:00
Philip Sargent
be2b17ea85
More debugging and warnings
2020-06-30 15:24:42 +01:00
Philip Sargent
39f042240d
Fix SurvexDirectory import
2020-06-29 21:16:13 +01:00
Philip Sargent
a60a495c83
Creating forgotten caves & better GetCaveLookup()
2020-06-29 21:15:42 +01:00
Philip Sargent
459ed11b58
avoiding problem in KH QMs import
2020-06-28 15:57:40 +01:00
Philip Sargent
bf1c683fd0
fixing parent blocks & titles
2020-06-28 14:42:26 +01:00
Philip Sargent
122cdd7fc8
replace GetCaveByReference
2020-06-28 01:50:34 +01:00
Philip Sargent
4716eaa4b6
Working. More fault checking.
2020-06-27 17:55:59 +01:00
Philip Sargent
ca6f7ed587
move function
2020-06-27 12:04:34 +01:00
Philip Sargent
bb69cc073a
start refactor survex import
2020-06-24 14:10:13 +01:00
Philip Sargent
dc5a53376d
exploring recusrive behaviour
2020-06-24 02:33:43 +01:00
Philip Sargent
6bf762b72f
bin Makesurvexstation, survextitle, survexEquate
2020-06-24 01:57:20 +01:00
Philip Sargent
d6c4ffca5a
tunnelfile.scans name change for compatibility
2020-06-24 00:36:32 +01:00
Philip Sargent
c91aa4be47
Simple renaming too-similar variables
2020-06-24 00:18:01 +01:00
Philip Sargent
9cd70b31ac
simple rename survexscansfolder to scansfolder
2020-06-23 23:46:33 +01:00
Philip Sargent
b64c779a58
rename SurvexScansFolders and tidy survex parser
2020-06-23 23:34:08 +01:00
Philip Sargent
2e7cf188af
cosmetic and moving a funciton
2020-06-23 22:44:06 +01:00
Philip Sargent
674cea629d
clean up import statements: more specific
2020-06-22 00:03:23 +01:00
Philip Sargent
7b260006bf
dj.-reg. 2.5.2 all tested.
2020-06-20 23:26:50 +01:00
Philip Sargent
f3232cc5df
More security, middleware upgrade, dj-reg.2.5
2020-06-20 23:08:34 +01:00
Philip Sargent
77c80d1a69
remove in-memory phase of data import
2020-06-20 19:55:23 +01:00
Philip Sargent
f608fc186e
Fixup after rebase and pre- scripts fixed
2020-06-20 17:19:50 +01:00
Philip Sargent
e697466557
Cleanup secrets management, pre-run checks.
2020-06-20 16:51:07 +01:00
Philip Sargent
b35a0b0d26
Fully working dj 1.11.29
2020-06-19 16:39:05 +01:00
Philip Sargent
4a51de95c4
Django 1.11.19 runs clean on pre-built db.
2020-06-18 22:44:41 +01:00
Philip Sargent
d9c6986a89
static files redone
2020-06-18 21:50:16 +01:00
Philip Sargent
640e1e3b5e
cleaner warnings but site_media still not ok
2020-06-18 12:10:42 +01:00
Philip Sargent
ee92182163
n_delete=... soon to be required
2020-06-18 00:20:47 +01:00
Philip Sargent
55dd577275
New url dispatcher OK 1.9.13
2020-06-17 22:55:51 +01:00
Philip Sargent
4941d230e2
TEMPLATES done for dj 1.9.13
2020-06-17 21:27:01 +01:00
Philip Sargent
660479d692
django 1.9.13 initial
2020-06-17 01:00:50 +01:00
Philip Sargent
b153fafa9f
django 1.8.19
2020-06-16 22:16:48 +01:00
Philip Sargent
f6bd08029f
remove useless nulls on ManyToMany
2020-06-16 19:28:24 +01:00
Philip Sargent
94e5a06a15
clean up survexlegs
2020-06-16 19:27:32 +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
1b693da5ed
break recursive import cycle
2020-06-16 16:07:36 +01:00
Philip Sargent
453af2851b
Stop storing all SurvexStations
2020-06-15 03:28:51 +01:00
Philip Sargent
d4deea2019
remove tinyMCE more
2020-06-14 10:05:25 +01:00
Philip Sargent
38fa552c00
Disable TinyMCE
2020-06-13 23:16:19 +01:00
Philip Sargent
38beb34a38
cleaner import statements
2020-06-13 01:26:59 +01:00
Philip Sargent
269b8840ad
import fixes & statistics table
2020-06-12 18:10:07 +01:00
Philip Sargent
092c8bb913
stopped storing survex legs
2020-06-12 14:06:03 +01:00
Philip Sargent
538a3b6ca8
fixed circular ref on setup & in-memory db
2020-06-08 00:11:09 +01:00
Philip Sargent
9237a6262e
Make import robust against duplicate kataster numbers
2020-06-07 17:49:58 +01:00
Philip Sargent
75bac01f3a
Fix bad pages for clashing kataster numbers
2020-06-07 16:13:59 +01:00
Philip Sargent
fda50ed570
attempt to simplify wnt horribly wrong
2020-06-06 22:51:55 +01:00
Philip Sargent
681bfcb4c4
removing redundant functions
2020-06-04 23:53:36 +01:00
Philip Sargent
27816724f8
moved 2 funct, deletion of FileAbstraction pending
2020-06-04 23:38:57 +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
c6d68749e0
Comment-out all ScannedImage objects
2020-06-04 19:32:26 +01:00
Philip Sargent
ae89a707ec
Unit tests outline implemented
2020-06-03 21:57:05 +01:00
Philip Sargent
973c6f4ef8
update svx template & fix CRLF
2020-06-02 21:38:29 +01:00
Philip Sargent
4dd0a5ddf2
import syntax fix
2020-06-02 21:38:01 +01:00
Philip Sargent
f949bb8dc0
python3 fixes for djsngo admin pages
2020-05-31 22:35:36 +01:00
Philip Sargent
5d89cf9474
Delete SURVEYS.CSV code
2020-05-31 21:03:40 +01:00
Philip Sargent
09aedecc3b
Unicode fix for SVX display and edit page
2020-05-31 20:46:12 +01:00
Philip Sargent
3088727fd4
unicode fix for python3
2020-05-31 19:00:44 +01:00
Philip Sargent
b33ad5833e
delete duplication
2020-05-30 20:48:17 +01:00
Philip Sargent
01e098339e
Imposrt mad more specific
2020-05-30 12:35:15 +01:00
Philip Sargent
0776978c9c
Import rejigging to fix circular refs
2020-05-30 01:11:02 +01:00
Philip Sargent
6568cb8900
import fix to allow manage.py to run
2020-05-28 22:42:50 +01:00
Philip Sargent
6a755598b2
Moved classes to models_caves and fixed imports
2020-05-28 04:54:53 +01:00
Philip Sargent
df3917a677
Expunge cavetab
2020-05-28 02:20:50 +01:00
Philip Sargent
d2192ffd21
delete duplication
2020-05-28 02:09:36 +01:00
Philip Sargent
cb4128436c
expung imagekit and clean import lists
2020-05-28 01:38:35 +01:00
Philip Sargent
6cc578435c
Refactor to avoid loading unused surveystations
2020-05-28 01:16:45 +01:00
Philip Sargent
c9657aeb8c
preparing to clean up LoadPos
2020-05-26 16:41:11 +01:00
Expo on server
dfb7cc88cd
Allow being unable to open local LOGFILE.
2020-05-26 02:26:51 +01:00
Philip Sargent
8b74ff4bb6
__unicode__ to __str__ 2to3 conversion
2020-05-26 02:21:36 +01:00
Philip Sargent
44d190e91c
partial fix to make OK on python3.8
2020-05-25 01:49:02 +01:00
Philip Sargent
0a864c7f87
2to3 sort comparison key change
2020-05-25 01:46:52 +01:00
Philip Sargent
50d753a87b
Convert codebase for python3 usage
2020-05-24 20:56:27 +01:00
Philip Sargent
49d5857b36
tabs and spaces format fix
2020-05-24 13:31:38 +01:00
Philip Sargent
d4ac28af18
Remove PHOTOS_ROOT and DPhoto class
2020-05-15 21:32:55 +01:00
Philip Sargent
e4290c4ab0
adding *ref to troggle svx parser
2020-05-13 19:57:07 +01:00
Philip Sargent
39c622d5bf
dbReset now loads into memory first (fast err checking), then into db
2020-04-30 23:15:57 +01:00
Expo on server
59633d94f5
Remove mention of obsolete EMAIL_HOST_USER to correspond with change made in pathreport.py
2020-03-09 17:44:29 +00:00
53206ad1d7
Removed EMAIL_HOST entirely
2020-03-09 16:52:51 +00:00
9aa91bf3e2
remove EMAIL_HOST global name
2020-03-09 16:48:51 +00:00
cdef395f89
New troggle report on defined directory paths
2020-02-27 00:58:09 +00:00
429c21a8e9
installing on WSL ubuntu on Windows 10
2020-02-22 00:04:41 +00:00
Sam Wenham
e77aa9fb84
Changes needed to stop the survex parser having to go through the data twice
...
Taken from the Django 1.10 upgrade branch
2020-02-21 15:57:07 +00:00
Sam Wenham
97426a0ddb
Backed out changeset: 4552f42bdf54
2019-06-26 20:57:24 +01:00
Sam Wenham
8a1be45aac
Remove this stupid hard coded name match
2019-06-26 20:56:08 +01:00
expo on server
02d3cc84d5
Add SURVEX_TOPNAME (top-level survex file) as a setting item in settings.py so it's not hardcoded.
2019-06-26 03:32:18 +01: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
ae284a1f30
Add ordering to the data issues model
2019-04-18 19:01:29 +01:00
Sam Wenham
23df89cf31
Fix CSRF issues in svx form
...
Set date formats
Add DataIssue model and add errors to it to allow us to give people a list of
stuff to fix
2019-04-14 22:45:31 +01:00
Sam Wenham
a588221524
Ooops shouldn't of commited the DateTime change, yet...
2019-03-31 16:43:21 +01:00
Sam Wenham
9df91b221b
Support html and wiki logbook entrys
...
Move nearest_station to nearest_station_name and make nearest_station a foreign
key to SurvexStation
Lots of tidying
2019-03-31 15:39:53 +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
a4532a29da
Update new management command for DB reset
...
Switch to content_type from mimetype
Make DB reset not nuke so much
Tidy logbook parser
2019-03-30 13:58:38 +00:00
Sam Wenham
9fa93fdd15
Fix person chronology to get the date from te logbook entry
2019-03-09 18:43:58 +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
Sam Wenham
1bac650aee
There is no point having two functions do basicaly the same thing so make the
...
load all logbooks call load logbook(expo)
Remove the return message from load logbook as it isn't used
2019-03-09 11:18:44 +00:00
Sam Wenham
42d10cf43d
Revert (I hate hg!!!)
2019-02-26 20:43:18 +00:00
Sam Wenham
2226aa34d5
merge
2019-02-26 20:41:47 +00:00
Sam
0268ff46b3
Add docker readme, settings and update compose file
...
Fix views_logbooks.py
2019-02-26 19:19:01 +00:00
1d7cf3f41a
Messing with millenialcaves.html or similar
2019-02-26 14:07:45 +00:00
32c186afd7
Messing with millenialcaves.html or similar
2019-02-26 14:05:41 +00:00
8703ed5d94
Messing with millenialcaves.html or similar
2019-02-26 12:30:20 +00:00
a4118261e1
Messing with millenialcaves.html or similar
2019-02-26 12:29:46 +00:00
6392c1f238
Messing with millenialcaves.html or similar
2019-02-26 12:23:12 +00:00
c724f292ca
Messing with millenialcaves.html or similar
2019-02-26 12:03:17 +00:00
beffdbd89d
Messing with millenialcaves.html or similar
2019-02-26 12:01:30 +00:00
da88771fd4
Messing with millenialcaves.html or similar
2019-02-26 09:45:17 +00:00
b6b7d2aa12
Messing with millenialcaves.html or similar
2019-02-26 09:41:02 +00:00
9712bf6dfd
Messing with millenialcaves.html or similar
2019-02-26 02:01:09 +00:00
5e4c1493a1
Messing with millenialcaves.html or similar
2019-02-26 01:56:39 +00:00
41b1334257
Messing with millenialcaves.html or similar
2019-02-26 01:48:52 +00:00
a2fcbae129
Messing with millenialcaves.html or similar
2019-02-26 01:46:54 +00:00
e9077542c9
Messing with millenialcaves.html or similar
2019-02-26 01:46:05 +00:00
79595521a9
Messing with millenialcaves.html or similar
2019-02-26 01:45:03 +00:00
38b658fd3f
Messing with millenialcaves.html or similar
2019-02-26 01:43:54 +00:00
a89123755c
Messing with millenialcaves.html or similar
2019-02-26 01:43:28 +00:00
0fb9accd05
Messing with millenialcaves.html or similar
2019-02-26 01:41:15 +00:00
f87df707ab
Messing with millenialcaves.html or similar
2019-02-26 01:37:52 +00:00
a2cb771fc1
Messing with millenialcaves.html or similar
2019-02-26 01:35:55 +00:00
c888f59ff0
Messing with millenialcaves.html or similar
2019-02-26 01:34:09 +00:00
43ff6e09be
Messing with millenialcaves.html or similar
2019-02-26 01:30:32 +00:00
466e667e14
Messing with millenialcaves.html or similar
2019-02-26 01:04:09 +00:00
19a061efa8
Messing with millenialcaves.html or similar
2019-02-26 00:56:46 +00:00
e5d864359a
Messing with millenialcaves.html or similar
2019-02-26 00:47:35 +00:00
b2adc285b6
Messing with millenialcaves.html or similar
2019-02-26 00:45:56 +00:00
b33ca2b290
Messing with millenialcaves.html or similar
2019-02-26 00:43:05 +00:00
c4455168c6
Messing with millenialcaves.html or similar
2019-02-26 00:35:28 +00:00
1b4674acde
Messing with millenialcaves.html or similar
2019-02-26 00:33:37 +00:00
4fac4317a3
Messing with millenialcaves.html or similar
2019-02-26 00:33:04 +00:00
78bf9986b7
Messing with millenialcaves.html or similar
2019-02-26 00:30:09 +00:00
5154c0d8e5
Messing with millenialcaves.html or similar
2019-02-26 00:29:16 +00:00
521f0241f8
Messing with millenialcaves.html or similar
2019-02-26 00:21:54 +00:00
0394becdac
Messing with millenialcaves.html or similar
2019-02-26 00:21:27 +00:00
6beaf4afdd
Messing with millenialcaves.html or similar
2019-02-26 00:17:11 +00:00
a4a92483bd
Messing with millenialcaves.html or similar
2019-02-26 00:04:27 +00:00
3254ba1443
2019-02-26 00:00:34 +00:00
4c3d0ce7fa
2019-02-25 23:55:06 +00:00
0a214c5d4b
2019-02-25 23:51:26 +00:00
29c53f35ab
2019-02-25 23:48:58 +00:00
3746dab5de
2019-02-25 23:46:52 +00:00
18dbadd675
space/tab
2019-02-25 23:42:56 +00:00
ee2cd0d391
trying to add new field
2019-02-25 23:40:53 +00:00
0cc4e7c7d3
2019-02-25 23:37:12 +00:00
Sam Wenham
478065786f
Merge
2019-02-25 23:34:10 +00:00
Sam Wenham
e64d82cd92
Start of moving databasereset to django management
2019-02-25 23:10:24 +00:00
Sam Wenham
12a991920a
Get get_absolute_url in the correct place
2019-02-25 23:07:20 +00:00
78a5f656b9
added Rad's playground
2019-02-25 22:24:33 +00:00
Sam Wenham
77a6015ad6
Fix the All Survex page to work with 1623 area
2019-02-25 20:13:28 +00:00
Sam Wenham
7c15a7439d
Decode the url encoded # when looking at wallets
2019-02-24 19:50:45 +00:00
Sam Wenham
b4f4db5754
Deal better with the wallet letter number combo of 2019#X01
2019-02-24 18:55:30 +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
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
expoonserver
c162411f0b
FileUploadForm does not work with django 1.7.
...
It tries to use database during class initialisation.
removed it for now - not sure if it's important...
2018-06-17 02:24:00 +01:00
Sam Wenham
46124a770f
Fix the django for the spinny js cave viewer.
...
Make the paths settings (don't hard code things like this!!)
Add " round spinny urls from the late merge (the rest were done for the move off 1.4.2
2018-04-20 20:55:12 +01: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
174c475ec7
Add default BooleanField(default=False) for django 1.7 compatibility
2018-04-17 21:51:39 +01:00
Sam Wenham
760fa3114f
missed from last commit
2018-04-15 16:28:52 +01:00
Sam Wenham
798ae591c6
Django 1.7 mostly working. Big refactor so probably bugs
2018-04-15 16:28:13 +01:00
Sam Wenham
7877efba0a
Up to 1.6.11 on stretch. New manage.py. Some tidying
2018-04-15 12:00:59 +01:00
Sam Wenham
cfa888fde6
More cleanup and modernisation
2018-04-14 21:37:12 +01:00
Sam Wenham
cedcb0988a
Clean up indenting in models
...
add registration required modules
2018-04-14 21:14:19 +01:00
Sam Wenham
242cf4741a
Import Image from PIL to support newer python
...
import the Django registration module rather than the troggle one
2018-04-10 01:34:06 +01:00
expoonserver
d7c6676c49
Test whether url is not 'None' before applying 'startswith' test in
...
forms.py entering new caves, otherwise it barfs.
2017-10-25 03:49:03 +01:00
expoonserver
5e9dfc6ea6
Fix Scan scanning, so that 2015#X01 format (with 'X') is accepted in
...
scan directories. Allows 2016 data to be processed.
2017-03-07 15:44:42 +00:00
expo
716131f005
Fix cave pages to have entrances and description on one page.
...
Fixes broken links on description and entrance pages.
Removes need for jquery-ui.
2016-07-02 23:42:47 +01:00
expo
214d887c57
Commit changes made on expo 2015
2015-09-16 01:52:45 +01:00
Sam Wenham
5a911ecec7
I think this is breaking prospecting
2015-06-28 13:39:50 +01:00
expo
7aed3d3b30
Moved notable caves to settings.py, link to a script to fix permissions
2015-06-21 15:08:09 +01:00
Wookey
fe6750e824
Fix up obvious URLs containing subarea names (smkridge)
2015-04-08 03:40:57 +01:00
Wookey
5ff759db93
Fix templates to use system javascript for jquery, jquery-ui and
...
jquery-ui themes
2014-09-11 07:38:45 +01:00
Wookey
7cdb603d75
Add 107 to notable caves (noting that this is hard-coded into
...
core/views_caves.py which is just shoddy)
2014-07-28 01:21:24 +01:00
expo
da71cca22f
Prospecting guide and images and few minor other things.
2013-08-01 17:00:01 +02:00
Wookey
7eb4c89bf0
Don't explode if a master survex file is not found for a directory -
...
that shouldn't cause total failure to read the database in.
2013-07-02 00:47:42 +01:00
wookey
99ea6778ad
Add comment to identifycavedir function
...
and remove now-disused special-case filename
2013-06-24 01:30: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
8e64062214
added entrance locations
2012-08-14 15:08:08 +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
expo
1ef274ec1d
Editing no longer changes files more than nesecary. Removed TinyMCE editing. /Sumbit/Submit
2012-08-06 12:19:48 +02:00
expo
c0782e1cca
Fixed cave order
2012-08-05 19:28:34 +02:00
expo
ed1d273e03
Fixed cave order
2012-08-05 19:26:24 +02: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
fd12e70f78
Editing for entrances along with caves
...
More detailed display of entrances
2012-05-23 09:23:40 +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
Martin Green
c09a668620
Fix logbook editing
2011-08-08 12:17:38 +01:00
Martin Green
d8fe39ae86
Allow the viewing of noinfo caves on non public website without login
2011-08-08 08:51:12 +01:00
Wookey
dc1327674c
remove all the DOS linefeeds
2011-07-11 02:10:22 +01:00
Wookey
bab92cb88c
merge martin's tip again
2011-07-11 00:52:58 +01:00
Martin Green
5d8a5494cd
Split up tags such that they use ajax
2011-07-11 00:50:07 +01:00
Wookey
129d93dfa7
Merge from Martin's tip
2011-07-11 00:49:18 +01:00
Martin Green
de5f68e42c
Removed links to removed forms
2011-07-11 00:04:30 +01:00
Martin Green
f44b0be459
slug views, start of cave eidt form, cavelist splitting up by kataster area etc.
2011-07-11 00:03:36 +01:00
Martin Green
a128401d49
Added parsing of all.svx, along side parsing individual caves.
...
Added the making and parsing of all.pos to determine the location of stations.
Mare work is required so the caves are parsed and stored only once.
Survex parsing appears to include bugs, that print out errors.
2011-07-11 00:01:12 +01:00
Martin Green
5075ded032
Removed modelforms for Caves started to add normal forms
2011-07-10 23:57:31 +01:00
Martin Green
47c2e87979
Removed SurveyStation model (not SurvexStation)
2011-07-10 23:55:54 +01:00
Martin Green
44f86a7d6f
Added url to cave and turned entrances station names and removed the previous SurveyStation model.
...
Note caves should be rendered in the directory of their original url to make links work.
Note SurveyStations appeared to duplicate SurvexStations.
Note Given we want to be running from a mercurial repository, it is easiest to store the names of survey stations rather than foreign keys.
2011-07-10 23:52:18 +01:00
Wookey
28924db9f8
merge fix from martin's tip.
2011-07-10 23:30:36 +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
expo
30829ff9c8
debug
2011-05-02 03:25:43 +01:00
Martin Green
ede9e4a9bd
debug
2011-05-02 03:23:59 +01:00
Martin Green
04d0e80430
debug
2011-05-02 03:22:45 +01:00
Martin Green
366d4736ca
Try to fake crsf tags so site works on djang0 1.1
2011-05-02 03:20:31 +01:00
Martin Green
52eb4030d0
Attempt to get csrf tag working in django 1.1-
2011-05-02 03:11:17 +01:00
Martin Green
b439d40120
Debugging, and make get_name function accessable (should really be renamed)
2011-05-02 02:15:54 +01:00
Martin Green
bff34aafb9
FIX2
2011-05-01 23:21:47 +01:00
Martin Green
7623943f3e
Fix
2011-05-01 23:11:18 +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
f21cddb2d0
modelviz added
2009-09-11 09:04:59 +01:00
goatchurch
735b729a41
survey scans features added
2009-09-10 22:07:31 +01:00
goatchurch
709f9954f4
login required for saving survex files
2009-08-29 18:33:28 +01:00
goatchurch
6b8294d9dc
remove dependence on latest django
2009-08-29 16:23:11 +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
408a4c79aa
[svn]
2009-07-17 01:14:37 +01:00
substantialnoninfringinguser
b9bbccfe00
[svn] * Make descriptions parser also replace links to descriptions from Cave models' underground_descriptions with wikilinks for valid (existing) links
...
* Make entrances searchable in admin by cave kataster number
2009-07-16 05:37:33 +01:00
substantialnoninfringinguser
05d262e42b
[svn] only logged in users should see the tasks page thing
2009-07-15 01:55:26 +01:00
substantialnoninfringinguser
18e61d19f5
[svn] * wikilink to html for subcaves and cave descriptions
...
* fix header regex
2009-07-12 06:30:24 +01:00
substantialnoninfringinguser
4a073ea161
[svn] Add regex to turn ==headers== into <h2>headers</2>
2009-07-12 05:54:08 +01:00
substantialnoninfringinguser
2993ca74cc
[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
1566923d5c
[svn] Make QM wikilinks work in new format, and fix cave description parser to output working wikilinks.
2009-07-09 05:08:21 +01:00
substantialnoninfringinguser
b0073caf5f
[svn] not ready for that yet
2009-07-06 08:35:08 +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
martin speleo
8a9eb32aaf
[svn] wiki_to_html changes.
...
Changes views of qm model.
2009-07-04 19:35:06 +01:00
substantialnoninfringinguser
7f2199405d
[svn]
2009-07-04 19:29:19 +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
martin speleo
3afb94f5d2
[svn] Work on turn html pages into cavedescription models.py.
...
Moved parser/cavetabs html_to_wiki function to utils.py
Added databaseReset.py desc to refresh the cavedescriptions.
2009-07-04 16:42:17 +01:00
martin speleo
29f084613d
[svn] removed redundant import
2009-07-04 16:39:59 +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
martin speleo
c132477f80
[svn] Added cavedescription and new subcave.
...
Changed parsers/survex to read *title into subcave
2009-07-04 00:28:28 +01:00
martin speleo
7db1aae5ee
[svn] Remove broken import search
2009-07-03 21:04:28 +01:00
substantialnoninfringinguser
b4388d838e
[svn]
2009-07-03 20:49:04 +01:00
substantialnoninfringinguser
8446047ab2
[svn] Brief code cleanup.
2009-07-03 05:31:49 +01:00
substantialnoninfringinguser
dc19150eba
[svn] whoops
2009-07-03 00:51:41 +01:00
substantialnoninfringinguser
a89139763f
[svn] Use template block "related" for related objects. Various cleanup, fix personexpedition date views.
2009-07-03 00:50:56 +01:00
substantialnoninfringinguser
dab138c731
[svn] More fallout of renaming expo to core. Also fix
2009-07-02 23:02:42 +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
