summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-08-15Apply changes from clean branch on admin file too.Jonas Smedegaard
2008-08-15Merge branch '_clean' into allinone-nbJonas Smedegaard
2008-08-15Merge branch 'nonedit' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup Also, use nb setup files in Makefile.
2008-08-14Use and adapt new ikiwiki_nb.setup. Drop ikiwiki.setup.Jonas Smedegaard
2008-08-14Fork ikiwiki.setup as ikiwiki_nb.setup.Jonas Smedegaard
2008-08-11Fix (again) use admin.example.org as host for admin site.Jonas Smedegaard
2008-08-11Fix (again) use admin.example.org as destdir for admin site.Jonas Smedegaard
2008-08-11Merge branch 'master' into noneditJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2008-08-11Merge branch 'master' into _cleanJonas Smedegaard
2008-08-11Merge branch 'master' into _scsJonas Smedegaard
2008-08-11Fix shorten destdir to match url.Jonas 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 _cleanJonas Smedegaard
2008-08-11Merge branch 'master' into _scsJonas Smedegaard
2008-08-11Fix inconsistency examplewiki -> samplewiki.Jonas 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-10Revert to master branch (to ease merging).Jonas Smedegaard
2008-08-10Revert to master branch (to ease merging).Jonas Smedegaard
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 '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 '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-06Add farbar and topbar (clones of sidebar).Jonas 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-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