summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-10-22Merge branch 'wian-da' into allinone-daallinone-daJonas Smedegaard
2010-10-22Merge branch 'scs-da' into allinone-daJonas Smedegaard
2010-10-22Merge branch 'wian' into wian-dawian-daJonas Smedegaard
2010-10-22Merge branch 'master-da' into wian-daJonas Smedegaard
2010-10-22Merge branch 'scs' into scs-dascs-daJonas Smedegaard
2010-10-22Merge branch 'master' into wianwianJonas Smedegaard
2010-10-22Merge branch 'master' into master-damaster-daJonas Smedegaard
2010-10-22Merge branch 'master-da' into scs-daJonas Smedegaard
2010-10-22Merge branch 'master' into scsscsJonas Smedegaard
2010-10-22Move OTHERLANGUAGES down to footer (above COPYRIGHT).HEADmasterJonas Smedegaard
2010-10-14Sync with ikiwiki 3.20100926.Jonas Smedegaard
2010-10-13Add title as H1 above content (for h1title plugin).Jonas Smedegaard
2010-07-21Merge branch 'wian' into wian-daJonas Smedegaard
2010-07-21Merge branch 'wian-da' into allinone-daJonas Smedegaard
2010-07-20Merge branch 'wian-da' into allinone-daJonas Smedegaard
2010-07-20Merge branch 'scs-da' into allinone-daJonas Smedegaard
Conflicts (manually resolved): misc.tmpl page.tmpl
2010-07-20Merge branch 'master-da' into wian-daJonas Smedegaard
Conflicts (manually resolved): misc.tmpl page.tmpl
2010-07-20Merge branch 'master' into wianJonas Smedegaard
Conflicts (manually resolved): misc.tmpl page.tmpl
2010-07-20Merge branch 'scs' into scs-daJonas Smedegaard
Conflicts (manually resolved): page.tmpl
2010-07-20Merge branch 'master-da' into scs-daJonas Smedegaard
Conflicts (manually resolved): misc.tmpl page.tmpl
2010-07-20Merge branch 'master' into scsJonas Smedegaard
Conflicts (manually resolved): misc.tmpl page.tmpl
2010-07-19Apply gettext translation.Jonas Smedegaard
2010-07-18Merge remote branch 'origin/master-da' into temp-masterJonas Smedegaard
2010-07-14Sync with ikiwiki 3.20100704.Jonas Smedegaard
2009-01-22Merge branch 'clean-da' into allinone-daJonas Smedegaard
2009-01-22Revert "Fix strip edit and prefs actions."Jonas Smedegaard
This reverts commit 90401bdc7cb46bc15e522cddaf1d22a4deb56e0b.
2008-11-17Merge branch 'master-da' into wian-daJonas Smedegaard
2008-11-17Merge branch 'wian-da' into allinone-daJonas Smedegaard
2008-11-17Merge branch 'scs-da' into allinone-daJonas Smedegaard
2008-11-17Merge branch 'master-da' into scs-daJonas Smedegaard
2008-11-17Merge branch 'clean-da' into allinone-daJonas Smedegaard
2008-11-17Fix strip edit and prefs actions.Jonas Smedegaard
2008-11-01Merge branch 'wian-da' into allinone-daJonas Smedegaard
2008-11-01Merge branch 'wian' into wian-daJonas Smedegaard
2008-11-01Rely on branding_logo_text (not branding_logo). Add branding_logo_tagline.Jonas Smedegaard
2008-11-01Merge branch 'wian-da' into allinone-daJonas Smedegaard
2008-11-01Merge branch 'wian' into wian-daJonas Smedegaard
2008-11-01Add branding divs above header.Jonas Smedegaard
2008-10-23Merge branch 'wian-da' into allinone-daJonas Smedegaard
2008-10-23Merge branch 'master-da' into wian-daJonas Smedegaard
2008-10-23Merge branch 'master-da' into scs-daJonas Smedegaard
2008-10-23Merge branch 'master' into wianJonas Smedegaard
2008-10-23Merge branch 'scs-da' into allinone-daJonas Smedegaard
2008-10-23Merge branch 'master' into scsJonas Smedegaard
2008-10-23Merge branch 'clean-da' into allinone-daJonas Smedegaard
2008-10-23Merge branch 'master' into master-da + translateJonas Smedegaard
Conflicts (replaced with updated PO-based translation): renamesummary.tmpl
2008-10-22Sync with ikiwiki 2.67.Jonas Smedegaard
2008-08-30Merge branch 'master' into wianJonas Smedegaard
2008-08-30Merge branch 'master' into scsJonas Smedegaard
2008-08-30Sync with ikiwiki 2.62.1.Jonas Smedegaard