summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-07-17Merge branch 'master' into master-noneditmaster-noneditJonas Smedegaard
Conflicts (manually resolved: text adjustments adopted, newly added files suppressed): ikiwiki.mdwn ikiwiki/directive.mdwn ikiwiki/formatting.mdwn ikiwiki/markdown.mdwn ikiwiki/openid.mdwn ikiwiki/pagespec.mdwn ikiwiki/pagespec/attachment.mdwn ikiwiki/subpage.mdwn ikiwiki/wikilink.mdwn index.mdwn templates.mdwn wikiicons/openidlogin-bg.gif
2010-07-14Sync with ikiwiki 3.20100704.HEADmasterJonas Smedegaard
2008-10-23Merge branch 'master' into master-noneditJonas Smedegaard
Conflicts (all dropped, as in earlier change in this branch): ikiwiki.mdwn ikiwiki/blog.mdwn ikiwiki/directive.mdwn ikiwiki/formatting.mdwn ikiwiki/pagespec.mdwn ikiwiki/pagespec/attachment.mdwn templates.mdwn
2008-10-22Sync with ikiwiki 2.67.Jonas Smedegaard
2008-08-30Fix add missing colon in .notebook in style.css (bug#497176).Jonas Smedegaard
2008-08-30Merge branch 'master' into master-nonedit + drop ikiwiki/directive.mdwnJonas Smedegaard
2008-08-30Sync with ikiwiki 2.62.1.Jonas Smedegaard
2008-08-09Drop pages and images irrelevant if no edit access.Jonas Smedegaard
2008-08-01Sync with ikiwiki 2.55.Jonas Smedegaard
2008-06-14Sync with ikiwiki 2.50.Jonas Smedegaard
2008-06-12Sync with ikiwiki 2.49.Jonas Smedegaard
2008-05-29Sync with ikiwiki 2.47.Jonas Smedegaard
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
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-21 19:37:21 +0000