Joey Hess
ff0cb2a7bf
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
2009-08-27 20:19:28 -04:00
Joey Hess
d4b4b3d988
avoid fetching tags from random remotes
...
git makes it too easy to get crap tags into origin
2009-08-27 20:17:38 -04:00
Simon McVittie
545029fe4b
Explain my depends-exact branch
2009-08-28 01:13:43 +01:00
Joey Hess
0c1a71896d
htmltidy: Return an error message if tidy fails. Closes : #543722
...
On second^Wthird^Wfourth thought, putting the message into the page seems
better than using stderr.
2009-08-27 16:27:57 -04:00
Joey Hess
18e4fa6539
fix merged
2009-08-27 15:54:44 -04:00
Joey Hess
023c3046c0
Merge commit 'intrigeri/po'
2009-08-27 15:51:55 -04:00
Joey Hess
f8ad1bfec4
fix cherry-picked
2009-08-27 15:50:43 -04:00
intrigeri
f4583c1524
po: override the title template variable for coherent homepage titling
...
Signed-off-by: intrigeri <intrigeri@boum.org>
(cherry picked from commit 6c0f9c691c
)
2009-08-27 15:50:01 -04:00
Joey Hess
ffcd97ce52
change cherry-picked; move to discussion
2009-08-27 15:49:12 -04:00
intrigeri
33b18e12c7
po(scan): removed scary comment about only wanting to change the first link
...
Signed-off-by: intrigeri <intrigeri@boum.org>
(cherry picked from commit 3c2bffe21b
)
2009-08-27 15:48:02 -04:00
intrigeri
eaa782a185
doc/po(self-links): follow-ups
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-27 20:38:36 +02:00
intrigeri
cdc3576c8d
po: do not inject custom bestlink function when po_link_to eq default
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-27 20:31:44 +02:00
intrigeri
6bc3206af1
doc/po: follow-up
2009-08-27 20:21:16 +02:00
intrigeri
6c0f9c691c
po: override the title template variable for coherent homepage titling
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-27 20:19:17 +02:00
intrigeri
7d35d17f95
doc/po: follow-up
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-27 20:01:24 +02:00
intrigeri
3c2bffe21b
po(scan): removed scary comment about only wanting to change the first link
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-27 19:59:15 +02:00
intrigeri
0c032b0ccb
Merge commit 'upstream/master' into prv/po
2009-08-27 19:56:37 +02:00
Joey Hess
5e515b493c
followups
2009-08-27 13:10:31 -04:00
Joey Hess
e1acb707db
cherry-picked fix for recentchanges links
2009-08-27 12:57:04 -04:00
intrigeri
5eec60d4c6
po: do not beautify urls on the recentchanges page
...
... else, the recentchanges page shows a link such as "sandbox.es". But,
clicking on it goes to the English (or negotiated language) version of the page.
It is better in this one case if the link goes direct to the translated version
of the page.
(cherry picked from commit 496e8523c6
)
2009-08-27 12:56:49 -04:00
Joey Hess
18fc71f033
unsure if this patch is enough
2009-08-27 12:56:24 -04:00
Joey Hess
6ba35a7cb4
forwarded
2009-08-27 12:41:25 -04:00
intrigeri
dc1399fa80
initial patch proposal
2009-08-26 21:19:55 -04:00
https://infosoph.myopenid.com/
70c601990b
Forgot to mention I have multimarkdown enabled
2009-08-26 14:39:25 -04:00
Joey Hess
4e70f2f0d2
htmltidy: Print a warning message if tidy fails. Closes : #543722
2009-08-26 13:24:51 -04:00
Joey Hess
2736fc5ba9
close; multimarkdown not enabled by default
2009-08-26 13:11:55 -04:00
Joey Hess
4ce93af516
translation of directives
2009-08-26 13:09:43 -04:00
Joey Hess
27c6f56fcf
typo
2009-08-26 13:05:46 -04:00
Joey Hess
b740682f22
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
2009-08-26 13:05:29 -04:00
Joey Hess
2996f0b5ee
fix emphasis examples to actually work
2009-08-26 13:04:09 -04:00
https://infosoph.myopenid.com/
155347837a
initial report
2009-08-26 10:25:48 -04:00
martin
cc76cd6402
suggestion
2009-08-26 09:59:39 -04:00
intrigeri
d5a04b2de9
po: more TODO items comments and patches
2009-08-26 02:00:48 -04:00
intrigeri
496e8523c6
po: do not beautify urls on the recentchanges page
...
... else, the recentchanges page shows a link such as "sandbox.es". But,
clicking on it goes to the English (or negotiated language) version of the page.
It is better in this one case if the link goes direct to the translated version
of the page.
2009-08-26 07:56:33 +02:00
intrigeri
7bd7e78e4a
po: commenting some TODO items
2009-08-26 01:41:55 -04:00
intrigeri
145d89a6fc
po: maybe fixed self links
2009-08-26 01:05:07 -04:00
intrigeri
0113c69d4f
po: (hopefully) fixed WikiLink to self with po_link_to=default
2009-08-26 07:02:29 +02:00
Joey Hess
7dd9b65db4
don't use pagespec_match_list
...
This should be more efficient than pagespec_match_list since it short-circuits
after the first match is found.
The other problem with using pagespec_match_list here is it may throw an
error if a bad or failing pagespec somehow got into the dependencies.
2009-08-25 17:54:36 -04:00
Joey Hess
2ef6b15973
changelog and news file, also make postinst rebuild on upgrade
2009-08-25 17:27:32 -04:00
Joey Hess
b3d65aee18
Merge commit 'remotes/smcv/ready/remove-pagespec-merge'
2009-08-25 17:21:19 -04:00
Joey Hess
3548b6214f
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
2009-08-25 17:18:39 -04:00
Simon McVittie
aeea77e5c4
reply
2009-08-25 22:18:52 +01:00
Joey Hess
5bcdc39999
Revert "Allow add_depends to take an arrayref"
...
This reverts commit e4cd168ebe
.
There was no benefit to this change.
2009-08-25 17:11:29 -04:00
Joey Hess
fc445f6b70
Merge commit 'smcv/ready/optimize-depends'
2009-08-25 17:09:52 -04:00
Joey Hess
99626615ff
Fix example blog's tags/life to not have a broken PageSpec. Closes : #543510
2009-08-25 13:39:33 -04:00
Joey Hess
134a25d163
better analysis of why the depends keep growing
2009-08-24 22:10:12 -04:00
Joey Hess
96936899da
at this point I'm down to deciding which specific commits to merge and
...
which were dead ends
2009-08-24 21:54:22 -04:00
Simon McVittie
68fd245add
Respond with benchmarks and an updated branch
2009-08-25 00:45:28 +01:00
Simon McVittie
848bb66c37
Indicate that pagespec_merge() is no longer needed (much rejoicing?)
2009-08-25 00:31:40 +01:00
Simon McVittie
1ea8580a5f
Remove now-unused function pagespec_merge
...
Now that dependencies are a list of pagespecs with an implicit "or"
operation, there's no need to try to merge pagespecs under normal use.
ikiwiki-transition contains the only use of the function, so move
it there rather than deleting it entirely (it's used to concatenate all
admins' lists of locked pages).
2009-08-25 00:31:40 +01:00