Commit Graph

16482 Commits (ac412a0b871262ab9d12cb57028455edd989eca4)

Author SHA1 Message Date
chrysn ac412a0b87 (finished move from previous commit) 2012-03-20 12:08:11 -04:00
chrysn e203d7ef16 giving the linkmap issue its own patch page to make it more readable 2012-03-20 12:07:19 -04:00
chrysn e32cad7820 (nobody sees the fnord -- remove relic from testing) 2012-03-20 12:00:21 -04:00
chrysn c9d9769f83 comment on a non-obvious function 2012-03-20 11:59:33 -04:00
http://vn91.ya.ru/ 442f49319b 2012-03-20 03:29:58 -04:00
Joey Hess 4d707e665f add news item for ikiwiki 3.20120203 2012-03-19 14:45:52 -04:00
Joey Hess 8d46f83756 releasing version 3.20120203 2012-03-19 14:44:17 -04:00
Joey Hess 83876a7da6 remove pod documentation
This caused the build system to make unwanted man pages. Using comments
instead.
2012-03-19 14:36:03 -04:00
Joey Hess 9f2a2879c8 Merge remote-tracking branch 'smcv/trail-test' 2012-03-19 11:19:41 -04:00
Joey Hess 20a20f2f27 fixed 2012-03-19 11:04:47 -04:00
http://smcv.pseudorandom.co.uk/ 97b64fde14 fails to clone from multiple locations 2012-03-19 06:03:15 -04:00
http://smcv.pseudorandom.co.uk/ c344a5830c fixed, I think? 2012-03-19 05:53:49 -04:00
Simon McVittie 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
Joey Hess 914c362197 reproduce test suite failure, start of analysis 2012-03-18 19:55:50 -04:00
Joey Hess 0faceb91c0 misc cleanup 2012-03-18 19:33:11 -04:00
Joey Hess 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
http://hands.com/~phil/ d92a19ff08 fix plugins/mdwn wikilink 2012-03-18 17:50:45 -04:00
Joey Hess b2471aa729 fix waypoint hrefs 2012-03-18 17:48:57 -04:00
http://hands.com/~phil/ 5fcc4a9434 fix plugins/osm wikilink 2012-03-18 17:45:38 -04:00
Joey Hess 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
Joey Hess 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
Joey Hess 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
Joey Hess d7eca43103 test failure mysteriously vanished 2012-03-18 15:27:49 -04:00
Joey Hess 93972b1d94 trail.t is failing 2012-03-18 15:06:27 -04:00
Joey Hess 83aefff02f mention that trail is set to "yes" 2012-03-18 14:47:29 -04:00
Joey Hess 223c6d487a more updates for trail merge 2012-03-18 14:38:20 -04:00
Joey Hess 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
Joey Hess 9c30a00b24 merged trail3-integrated 2012-03-18 14:30:54 -04:00
Joey Hess a2eee93787 move 2012-03-18 14:23:47 -04:00
Joey Hess 23be8e3843 Merge branch 'master' of ssh://git.ikiwiki.info 2012-03-18 14:22:49 -04:00
Joey Hess a812692a50 changelog 2012-03-18 14:22:28 -04:00
http://smcv.pseudorandom.co.uk/ de00470dcf formatting 2012-03-18 14:21:11 -04:00
http://smcv.pseudorandom.co.uk/ 069e45fc00 request for re-review 2012-03-18 14:19:11 -04:00
Joey Hess 9c8262c663 Merge branch 'master' of ssh://git.ikiwiki.info 2012-03-18 14:01:15 -04:00
http://smcv.pseudorandom.co.uk/ 8fccf62f92 updated, again 2012-03-18 13:58:29 -04:00
Simon McVittie 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
Simon McVittie 63bb8b42f7 Replace [[!trailinline]] directive with [[!inline trail=yes]] 2012-03-18 17:11:05 +00:00
Simon McVittie dc3b9934d5 Move trail out of the contrib directory in preparation for eventual merge 2012-03-18 17:01:45 +00:00
Simon McVittie 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
https://www.google.com/accounts/o8/id?id=AItOawlqWSY9PNYRysA9vrU-JiQh7-s7q6SOcIE 8cad848af3 2012-03-17 16:57:43 -04:00
Joey Hess 4fee7097cd improve docs 2012-03-17 14:04:23 -04:00
http://joey.kitenet.net/ f6af518364 Added a comment 2012-03-16 16:33:20 -04:00
chrysn cc3afb8450 (fixed links that were broken due to missing extensions) 2012-03-15 21:38:59 -04:00
chrysn 128234cde1 the algorithms required for map plugin sorting 2012-03-15 21:36:36 -04:00
chrysn 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
chrysn b1802ca428 the incomplete patch for the map plugin 2012-03-15 21:33:11 -04:00
chrysn 02aab1da90 2/3 solution to map plugin sorting 2012-03-15 21:31:51 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlqWSY9PNYRysA9vrU-JiQh7-s7q6SOcIE c877488f52 2012-03-15 19:00:48 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlqWSY9PNYRysA9vrU-JiQh7-s7q6SOcIE a69cb46c52 2012-03-15 18:58:25 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlqWSY9PNYRysA9vrU-JiQh7-s7q6SOcIE ae76877625 Note about compatibility 2012-03-15 18:55:10 -04:00