be954ff3cb
Merge commit 'upstream/master' into prv/po
2009-08-28 15:57:46 +02:00
3f303cc853
follow-up
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 15:25:05 +02:00
e3b5d70137
doc/po: bug report + patch proposal wrt. inline's post form's rootpage
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 15:08:02 +02:00
e671e72053
po: better rootpage logic for inline's post form
...
Set rootpage to the non-l10n'd rootpage parameter if it is set,
else to the masterpage of the linking page.
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 15:00:16 +02:00
53dc18ec2b
Revert "po: keep masterpage as the rootpage for inline's post form"
...
This reverts commit cf43ae5a1f
2009-08-28 14:47:11 +02:00
a06b8590ce
Merge commit 'upstream/master' into prv/po
2009-08-28 14:23:38 +02:00
cf43ae5a1f
po: keep masterpage as the rootpage for inline's post form
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 14:22:36 +02:00
72ac9821e5
inline: moved rootpage logic to a function
...
The po plugin's injected bestlink must do something special when called by this
exact part of inline's code.
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 14:22:23 +02:00
c68413dcce
Merge commit 'intrigeri/po'
2009-08-28 07:40:46 -04:00
cc6000f0b9
both changes picked
2009-08-28 07:34:09 -04:00
5136c22eed
po: favor the type of linking page's masterpage on page creation
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 07:33:53 -04:00
18ddf727d1
po: fix interdiction to create pages of type po
...
... which was broken by the new page_types code.
Signed-off-by: intrigeri <intrigeri@boum.org>
(cherry picked from commit 1914ae2fd2
2009-08-28 07:32:41 -04:00
8064acf87f
doc/po: reported bug + patches wrt. created page type
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 13:20:33 +02:00
c9301d2c29
po: favor the type of linking page's masterpage on page creation
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 13:12:58 +02:00
1914ae2fd2
po: fix interdiction to create pages of type po
...
... which was broken by the new page_types code.
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28 12:38:07 +02:00
29e1c8e033
Czech basewiki enabled
2009-08-28 06:13:47 -04:00
11ef522086
Initial Czech translation of basewiki/
2009-08-28 06:10:10 -04:00
23f2d53277
merge updates to danish translation from l10n
2009-08-28 06:07:59 -04:00
588b8951d3
print which remotes are failing
2009-08-27 21:51:06 -04:00
b7a3fbec78
response
2009-08-27 21:36:55 -04:00
04a8da4f01
mention ignore branch
2009-08-27 21:00:39 -04:00
ff0cb2a7bf
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
2009-08-27 20:19:28 -04:00
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
545029fe4b
Explain my depends-exact branch
2009-08-28 01:13:43 +01:00
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
18e4fa6539
fix merged
2009-08-27 15:54:44 -04:00
023c3046c0
Merge commit 'intrigeri/po'
2009-08-27 15:51:55 -04:00
f8ad1bfec4
fix cherry-picked
2009-08-27 15:50:43 -04:00
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
ffcd97ce52
change cherry-picked; move to discussion
2009-08-27 15:49:12 -04:00
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
eaa782a185
doc/po(self-links): follow-ups
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-27 20:38:36 +02:00
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
6bc3206af1
doc/po: follow-up
2009-08-27 20:21:16 +02:00
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
7d35d17f95
doc/po: follow-up
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-27 20:01:24 +02:00
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
0c032b0ccb
Merge commit 'upstream/master' into prv/po
2009-08-27 19:56:37 +02:00
5e515b493c
followups
2009-08-27 13:10:31 -04:00
e1acb707db
cherry-picked fix for recentchanges links
2009-08-27 12:57:04 -04:00
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
18fc71f033
unsure if this patch is enough
2009-08-27 12:56:24 -04:00
6ba35a7cb4
forwarded
2009-08-27 12:41:25 -04:00
dc1399fa80
initial patch proposal
2009-08-26 21:19:55 -04:00
70c601990b
Forgot to mention I have multimarkdown enabled
2009-08-26 14:39:25 -04:00
4e70f2f0d2
htmltidy: Print a warning message if tidy fails. Closes : #543722
2009-08-26 13:24:51 -04:00
2736fc5ba9
close; multimarkdown not enabled by default
2009-08-26 13:11:55 -04:00
4ce93af516
translation of directives
2009-08-26 13:09:43 -04:00
27c6f56fcf
typo
2009-08-26 13:05:46 -04:00
b740682f22
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
2009-08-26 13:05:29 -04:00
intrigeri
Joey Hess
Miroslav Kure
Simon McVittie
intrigeri
https://infosoph.myopenid.com/