summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-10-23Merge branch 'scs' into allinone-noneditallinone-noneditJonas Smedegaard
2008-10-23Merge branch 'clean' into allinone-noneditJonas Smedegaard
Conflicts (all dropped): ikiwiki.mdwn ikiwiki/blog.mdwn ikiwiki/directive.mdwn ikiwiki/formatting.mdwn ikiwiki/pagespec.mdwn ikiwiki/pagespec/attachment.mdwn templates.mdwn
2008-10-23Merge branch 'master' into scsscsJonas Smedegaard
2008-10-23Merge branch 'master' into cleancleanJonas Smedegaard
2008-10-22Sync with ikiwiki 2.67.HEADmasterJonas Smedegaard
2008-08-30Merge branch 'scs' into allinone-noneditJonas Smedegaard
2008-08-30Merge branch 'clean' into allinone-noneditJonas Smedegaard
2008-08-30Merge branch 'master' into scsJonas Smedegaard
2008-08-30Merge branch 'master' into cleanJonas Smedegaard
2008-08-30Fix add missing colon in .notebook in style.css (bug#497176).Jonas Smedegaard
2008-08-30Merge branch 'scs' into allinone-noneditJonas Smedegaard
2008-08-30Merge branch 'clean' into allinone-nonedit + drop ikiwiki/directive.mdwnJonas Smedegaard
2008-08-30Merge branch 'master' into scsJonas Smedegaard
2008-08-30Merge branch 'master' into clean + drop ikiwiki/preprocessordirective.mdwnJonas Smedegaard
2008-08-30Sync with ikiwiki 2.62.1.Jonas Smedegaard
2008-08-09Merge branch 'master-nonedit' into allinone-noneditJonas Smedegaard
2008-08-09Drop pages and images irrelevant if no edit access.Jonas Smedegaard
2008-08-01Merge branches 'clean' and 'scs' into allinoneJonas Smedegaard
2008-08-01Merge branch 'master' into scsJonas Smedegaard
2008-08-01Merge branch 'master' into cleanJonas Smedegaard
2008-08-01Sync with ikiwiki 2.55.Jonas Smedegaard
2008-06-14Merge commit 'ikiwiki' into allinoneJonas Smedegaard
2008-06-14Merge branch 'master' into scsJonas Smedegaard
2008-06-14Merge branch 'master' into cleanJonas Smedegaard
2008-06-14Sync with ikiwiki 2.50.Jonas Smedegaard
2008-06-14Merge branch 'master' into scsJonas Smedegaard
2008-06-14Merge branch 'clean' into clean-scsJonas Smedegaard
2008-06-14Drop deprecated redirection pages.Jonas Smedegaard
2008-06-12Merge branch 'master' into scsJonas Smedegaard
2008-06-12Sync with ikiwiki 2.49.Jonas Smedegaard
2008-05-29Merge branch 'master' of ↵Jonas Smedegaard
debian@coreander:/srv/git/source.jones.dk/ikiwiki_basewiki into scs
2008-05-29Merge branch 'master' into scsJonas Smedegaard
2008-05-29Sync with ikiwiki 2.47.Jonas Smedegaard
2008-04-13Add "Sane CSS Sizes".Jonas Smedegaard
Origin: http://www.thenoodleincident.com/tutorials/typography/
2008-02-08Sync with ikiwiki 2.30.Jonas Smedegaard
2008-01-20Sync with ikiwiki 2.20 part III: Update content.Jonas Smedegaard
2008-01-20Sync with ikiwiki 2.20 part II: Add redirects for moved pages.Jonas Smedegaard
2008-01-20Sync with ikiwiki 2.20 part I: Move a bunch of pages to ikiwiki/ subsir.Jonas Smedegaard
2007-10-21Sync with upstream version 2.10.Jonas Smedegaard
2007-10-15Grab upstream pages from version 2.9.Jonas Smedegaard