summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-08-10Merge branch 'master' into wianJonas Smedegaard
2008-08-10Merge branch 'master' into scsJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-10Merge branch 'master' into cleanJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-10Disable PO-based locales by default.Jonas Smedegaard
2008-08-10Reorder and comment Makefile variables.Jonas Smedegaard
2008-08-10Use nonedit branch and dummy content for main setup.Jonas Smedegaard
2008-08-10Fork ikiwiki.setup as ikiwiki_admin.setup.Jonas Smedegaard
2008-08-10Merge branch 'master' into wianJonas Smedegaard
2008-08-10Merge branch 'master' into scsJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-10Merge branch 'master' into cleanJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-10Disable locales and flavors by default.Jonas Smedegaard
2008-08-10Adapt ikiwiki.setup paths to common usage.Jonas Smedegaard
2008-08-09Merge branch 'wian' into allinoneJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-09Merge branch 'master' into wianJonas Smedegaard
2008-08-09Merge branch 'master' into scsJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-09Merge branch 'master' into cleanJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-09Ignore content and content_dummy.Jonas Smedegaard
2008-08-09Extend make to support FLAVORS.Jonas Smedegaard
2008-08-09Merge branch 'wian' into allinoneJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-09Merge branch 'master' into wianJonas Smedegaard
2008-08-09Merge branch 'master' into scsJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-09Merge branch 'master' into cleanJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-09Fix bogus locale no_NB -> nb.Jonas Smedegaard
2008-08-06Merge branch 'wian' into allinoneJonas Smedegaard
2008-08-06Add farbar and topbar (clones of sidebar).Jonas Smedegaard
2008-08-04Merge branches 'clean' and 'scs' into allinoneJonas Smedegaard
2008-08-04Merge branch 'master' into scsJonas Smedegaard
2008-08-04Merge branch 'master' into cleanJonas Smedegaard
2008-08-04Fix echo full git command.Jonas Smedegaard
2008-08-04Use git pull (not merge).Jonas Smedegaard
2008-08-04Use git pull (not merge).Jonas Smedegaard
2008-08-04Merge branches 'clean' and 'scs' into allinoneJonas Smedegaard
Conflicts (merged manually): Makefile
2008-08-04Merge branch 'master' into scsJonas Smedegaard
2008-08-04Merge branch 'master' into cleanJonas Smedegaard
2008-08-04Extend make and po4a to support templates.Jonas Smedegaard
2008-08-04Template PO-files 100% working with po4a.Jonas Smedegaard
2008-08-04PO-files 100% working with po4a.Jonas Smedegaard
2008-08-04Much improved Markdown support.Jonas Smedegaard
2008-08-03fix spacing typos.Jonas Smedegaard
2008-08-03Fix Locale::Po4a::Text reset flags on new file.Jonas Smedegaard
2008-08-03Update POT files.Jonas Smedegaard
2008-08-03Update danish (da) PO files.Jonas Smedegaard
2008-08-03Fix not stripping final newline of some filesJonas Smedegaard
Text parser is broken: It assumes it is parsing only a single file. po4a 0.34 partly fixed this by checking at beginning of each iteration of the loop if filename changed - but only then - not at the several places do_paragraph() is done multiple times in same iteration. This patch makes does the opposite: it ensures that all files contain a final newline. This breaks files that has no final newline (but those shouold be rare).
2008-08-02Sync Locale::Po4a::Text with po4a 0.34.Jonas Smedegaard
2008-08-02Merge branch 'clean' into allinoneJonas Smedegaard
2008-08-02Set allinone branch in Makefile.Jonas Smedegaard
2008-08-02Set scs branch in Makefile.Jonas Smedegaard
2008-08-01Merge branch 'master' into cleanJonas Smedegaard
(newly added monotone hook stripped too)
2008-08-01Sync ikiwiki.setup with ikiwiki 2.55.Jonas Smedegaard
2008-07-13Drop non-Git VCS options from config. Use clean content branches.Jonas Smedegaard