summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-08-11Merge branch 'nonedit' into allinone-daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2008-08-11Merge branch '_scs' into allinone-daJonas Smedegaard
2008-08-11Merge branch '_clean' into allinone-daJonas Smedegaard
2008-08-11Merge branch '_da' into allinone-daJonas Smedegaard
2008-08-11Merge branch 'master' into allinone-daJonas Smedegaard
2008-08-11Merge branch 'master' into _daJonas Smedegaard
2008-08-11Merge branch 'master' into noneditJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2008-08-11Merge branch 'master' into _scsJonas Smedegaard
2008-08-11Merge branch 'master' into _cleanJonas Smedegaard
2008-08-11Fix shorten destdir to match url.Jonas Smedegaard
2008-08-11Merge branch 'nonedit' into allinone-daJonas Smedegaard
2008-08-11Merge branch '_scs' into allinone-daJonas Smedegaard
2008-08-11Merge branch '_clean' into allinone-daJonas Smedegaard
2008-08-11Merge branch '_da' into allinone-daJonas Smedegaard
2008-08-11Merge branch 'master' into allinone-daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da_admin.setup
2008-08-11Merge branch 'master' into _daJonas Smedegaard
2008-08-11Merge branch 'master' into noneditJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup Also, examplewiki -> samplewiki applied to admin setup too.
2008-08-11Merge branch 'master' into _scsJonas Smedegaard
2008-08-11Merge branch 'master' into _cleanJonas Smedegaard
2008-08-11Fix inconsistency examplewiki -> samplewiki.Jonas Smedegaard
2008-08-11Fix inconsistency examplewiki -> samplewiki.Jonas Smedegaard
2008-08-11Add trailing -da to git wrapper paths.Jonas Smedegaard
2008-08-11Merge branch 'nonedit' into allinone-daJonas Smedegaard
2008-08-11Fix add trailing -admin to git wrapper path.Jonas Smedegaard
2008-08-11Fix shorten destdir to match url.Jonas Smedegaard
2008-08-11Fix use allinone branch (not clean).Jonas Smedegaard
2008-08-11Use localized paths admin setup.Jonas Smedegaard
2008-08-10Clean and localize admin setup.Jonas Smedegaard
2008-08-10Merge branch 'da' into allinone-daJonas Smedegaard
2008-08-10Enable da locale.Jonas Smedegaard
2008-08-10Move ikiwiki_admin.setup -> ikiwiki_da_admin.setup.Jonas Smedegaard
2008-08-10Merge branch 'nonedit' into allinone-daJonas Smedegaard
Conflicts (manually resolved): Makefile ikiwiki_da.setup
2008-08-10Merge branch '_scs' into allinone-daJonas Smedegaard
2008-08-10Merge branch 'clean' into allinone-daJonas Smedegaard
2008-08-10Revert to master branch (to ease merging).Jonas Smedegaard
2008-08-10Change (again) to clean branch.Jonas Smedegaard
2008-08-10Revert to master branch (to ease merging).Jonas Smedegaard
2008-08-10Use and adapt new ikiwiki_da.setup. Drop ikiwiki.setup.Jonas Smedegaard
2008-08-10Fork ikiwiki.setup as ikiwiki_da.setup.Jonas Smedegaard
2008-08-10Merge branch 'master' into noneditJonas Smedegaard
Conflicts (manually resolved): Makefile
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 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