From: joey Date: Thu, 18 Jan 2007 14:46:51 +0000 (+0000) Subject: * Added smileys for Moin Moin compatability. X-Git-Tag: 1.41~102 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d8c3baf7a3c152f44bcb0e68ed13776a38c8f3a0;p=ikiwiki.git * Added smileys for Moin Moin compatability. --- diff --git a/basewiki/smileys.mdwn b/basewiki/smileys.mdwn index 73826c457..e5377ced2 100644 --- a/basewiki/smileys.mdwn +++ b/basewiki/smileys.mdwn @@ -25,12 +25,16 @@ Just write the text of a smiley to display it. * \|-) [[smileys/tired.png]] * \{OK} [[smileys/thumbs-up.png]] * \{X} [[smileys/icon-error.png]] +* \{i} [[smileys/icon-info.png]] * \(./) [[smileys/checkmark.png]] * \(!) [[smileys/idea.png]] * \[!] [[smileys/attention.png]] * \/!\ [[smileys/alert.png]] * \{*} [[smileys/star_on.png]] * \{o} [[smileys/star_off.png]] +* \{1} [[smileys/prio1.png]] +* \{2} [[smileys/prio2.png]] +* \{3} [[smileys/prio3.png]] For example: {*} B) {*} diff --git a/basewiki/smileys/prio1.png b/basewiki/smileys/prio1.png new file mode 100644 index 000000000..774d34d65 Binary files /dev/null and b/basewiki/smileys/prio1.png differ diff --git a/basewiki/smileys/prio2.png b/basewiki/smileys/prio2.png new file mode 100644 index 000000000..3c6fac54f Binary files /dev/null and b/basewiki/smileys/prio2.png differ diff --git a/basewiki/smileys/prio3.png b/basewiki/smileys/prio3.png new file mode 100644 index 000000000..2d03e62ce Binary files /dev/null and b/basewiki/smileys/prio3.png differ diff --git a/debian/changelog b/debian/changelog index 7a6500643..24a36edcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ ikiwiki (1.41) UNRELEASED; urgency=low * Gettext 1.04 or up is needed for the OO interface that ikiwiki needs, if an older version is installed, just don't gettext strings, instead of crashing. + * Added smileys for Moin Moin compatability. - -- Joey Hess Mon, 15 Jan 2007 22:19:02 -0500 + -- Joey Hess Thu, 18 Jan 2007 09:45:47 -0500 ikiwiki (1.40) unstable; urgency=low