summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-11Merge branch 'nonedit' into allinoneJonas 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-10Merge branch 'scs' into allinoneJonas Smedegaard
2008-08-10Merge branch 'clean' into allinoneJonas Smedegaard
2008-08-10Merge branch 'nonedit' into allinoneJonas Smedegaard
2008-08-10Change (again) to scs branch.Jonas 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-10Merge branch 'wian' into allinoneJonas Smedegaard
2008-08-10Merge branch 'scs' into allinoneJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-10Merge branch 'clean' into allinoneJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-10Merge branch 'master' into allinoneJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-10Merge branch 'master' into noneditJonas Smedegaard
Conflicts (manually resolved): Makefile
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
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-11 19:28:20 +0000