9f2a2879c8
Merge remote-tracking branch 'smcv/trail-test'
2012-03-19 11:19:41 -04:00
20a20f2f27
fixed
2012-03-19 11:04:47 -04:00
97b64fde14
fails to clone from multiple locations
2012-03-19 06:03:15 -04:00
c344a5830c
fixed, I think?
2012-03-19 05:53:49 -04:00
c7bc11f26f
Use utime to make initial files in trail test come from the past
...
This ensures that when we do the second phase of the test (edit some
files and refresh), the changes get a different mtime and are picked up,
even if the entire test happened between two 1-second "clock ticks".
2012-03-19 09:49:31 +00:00
914c362197
reproduce test suite failure, start of analysis
2012-03-18 19:55:50 -04:00
0faceb91c0
misc cleanup
2012-03-18 19:33:11 -04:00
1e0389fffb
remove fullscreen option
...
The cgi shows a fullscreen map, so having this other option to do it seems
redundant, and also layering a fullscreen map over an existing wiki page
doesn't look very good to me (and prevents editing the page etc).
2012-03-18 18:03:48 -04:00
d92a19ff08
fix plugins/mdwn wikilink
2012-03-18 17:50:45 -04:00
b2471aa729
fix waypoint hrefs
2012-03-18 17:48:57 -04:00
5fcc4a9434
fix plugins/osm wikilink
2012-03-18 17:45:38 -04:00
06aa145676
fix href parameter for osm
...
This was not set anywhere, which causes their javascript to crash.
It *seems* the idea is this is the url to use to view the map full screen,
which uses ikiwiki.cgi.
2012-03-18 17:39:06 -04:00
917cdb7ade
multiple osm fixes
...
* fix will_render calls to pass proper relative filenames
* fix urls to kml etc files to not assume wiki's top is at /
* avoid building the javascript to display the map in two different
ways between the cgi and on-page maps
* refactor duplicate code
2012-03-18 17:07:01 -04:00
3867f038a7
load index file in osm cgi hook
...
This hook involves urlto, and that needs to have state loaded to work
in all situations.
Note that I can see no reason for the osm plugin to use a cgi hook at all.
This could just as well be a static html page!
2012-03-18 15:54:47 -04:00
d7eca43103
test failure mysteriously vanished
2012-03-18 15:27:49 -04:00
93972b1d94
trail.t is failing
2012-03-18 15:06:27 -04:00
83aefff02f
mention that trail is set to "yes"
2012-03-18 14:47:29 -04:00
223c6d487a
more updates for trail merge
2012-03-18 14:38:20 -04:00
d134a2a6e9
avoid unnecessary uses of UNIVERSAL
...
Foo->Bar->can("method") works just as well, even if Foo::Bar is not
loaded. Using UNIVERSAL::can is deprecated.
But, I was unable to easily eliminate conditional.pm's use of UNIVERSAL::can
2012-03-18 14:34:21 -04:00
9c30a00b24
merged trail3-integrated
2012-03-18 14:30:54 -04:00
a2eee93787
move
2012-03-18 14:23:47 -04:00
23be8e3843
Merge branch 'master' of ssh://git.ikiwiki.info
2012-03-18 14:22:49 -04:00
a812692a50
changelog
2012-03-18 14:22:28 -04:00
de00470dcf
formatting
2012-03-18 14:21:11 -04:00
069e45fc00
request for re-review
2012-03-18 14:19:11 -04:00
9c8262c663
Merge branch 'master' of ssh://git.ikiwiki.info
2012-03-18 14:01:15 -04:00
8fccf62f92
updated, again
2012-03-18 13:58:29 -04:00
24168b993e
Add a build_affected hook so trail doesn't have to inject
...
In principle, building any pages affected by links, backlinks etc.
could work the same way.
2012-03-18 17:34:39 +00:00
63bb8b42f7
Replace [[!trailinline]] directive with [[!inline trail=yes]]
2012-03-18 17:11:05 +00:00
dc3b9934d5
Move trail out of the contrib directory in preparation for eventual merge
2012-03-18 17:01:45 +00:00
4e54fa1144
tagging version 3.20120202
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIVAwUATytJp8kQ2SIlEuPHAQgKeg/+MPL9KcL13f1DQUwu9TXEr7hSocn3NTa/
LMvLJvrzqI5BGRP+jBGFG/Kn9yFt6S4gdCvpOwi1INxAanLQnaVoSLoie1teUbU3
dxi8f3wGMBtEX+BiOi9gbjxF2v98D+Fh73O9H7newsEJiRDRor7U4EE1dWC8uidc
d/9vhWkaDy1BlEahaU85v7RY94h5EnEzgD0Rm7wkSSr1aquQsr89OijC6SY0dEJe
b6AunkRqsOGDrm6elSRFi6E5eStPhIu2t6GmyhpulWn5vr4PyqdWZ7jcWvDGYr+r
v2iuses1fH8qWE1CQ6Y2XadK7Cj2IbGhaiLXp3TdbPgKnB7BS89cSWRKQ5SlvTlJ
sUUPauhLDMqp1Cux6oUgs5T9ADTO922p1FzR3JuTkgwNLWH7UXTRuwVvtPz4aKqN
QBmQeknTTQAxqi+DhgBK+CXM7LIt3d2TaoUFt6gl4kKt3FYzGfyh9ohhDSQniAa8
C52InJ2X5bamz8/fIcELChg+wBT+naQrDW7V74kFKvWzIwnqfvseaF3zVqDgYLQy
e12vL6GAdnO66VhzULU1NyH/XNvfyKEpwiKHPwCEK5wPTLweWBqjU0952GDBlUov
PDDoQgwijnSCSxJOcEsAnnpkT16pw0VWHTSLrqkYYZBg7WGkZbhwk4cRVkqcsMK7
JjKUdA9rK0E=
=KLr6
-----END PGP SIGNATURE-----
Merge tag '3.20120202' into trail3-integrated
2012-03-18 15:31:41 +00:00
8cad848af3
2012-03-17 16:57:43 -04:00
4fee7097cd
improve docs
2012-03-17 14:04:23 -04:00
f6af518364
Added a comment
2012-03-16 16:33:20 -04:00
cc3afb8450
(fixed links that were broken due to missing extensions)
2012-03-15 21:38:59 -04:00
128234cde1
the algorithms required for map plugin sorting
2012-03-15 21:36:36 -04:00
3ca2d6f459
rename todo/incomplete_patch.pl to todo/sort_parameter_for_map_plugin_and_directive/incomplete_patch.pl.pl
2012-03-15 21:34:12 -04:00
b1802ca428
the incomplete patch for the map plugin
2012-03-15 21:33:11 -04:00
02aab1da90
2/3 solution to map plugin sorting
2012-03-15 21:31:51 -04:00
c877488f52
2012-03-15 19:00:48 -04:00
a69cb46c52
2012-03-15 18:58:25 -04:00
ae76877625
Note about compatibility
2012-03-15 18:55:10 -04:00
bf056a7ef4
2012-03-15 18:52:49 -04:00
b9b4bfd29d
Copy 'template.pm' re-write from website
2012-03-15 18:52:13 -04:00
13a850e715
implementation suggestion for map templating
2012-03-15 17:36:55 -04:00
4ecf1c3fb8
how sorting on maps might work
2012-03-15 17:29:51 -04:00
dc2d560bba
linkmap issue: linked to a similar issue
2012-03-15 10:09:00 -04:00
4e5a14bad2
linkmap issue: no attachment; inline patch instead
2012-03-15 10:02:33 -04:00
ef410fd237
link to attachment
2012-03-15 09:57:23 -04:00
70ced8faac
document and fix linkmap underscore issue
2012-03-15 09:55:52 -04:00
Joey Hess
http://smcv.pseudorandom.co.uk/
Simon McVittie
http://hands.com/~phil/
https://www.google.com/accounts/o8/id?id=AItOawlqWSY9PNYRysA9vrU-JiQh7-s7q6SOcIE
http://joey.kitenet.net/
chrysn