summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-08-20Merge branch '_nb' into allinone-nbJonas Smedegaard
2008-08-20Merge branch 'master' into allinone-nbJonas Smedegaard
2008-08-20Merge branch 'master' into _nbJonas Smedegaard
2008-08-20Fix branch checkout in git.mk.Jonas Smedegaard
2008-08-15Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2008-08-15Merge branch '_scs' into allinone-nbJonas Smedegaard
2008-08-15Merge branch '_clean' into allinone-nbJonas Smedegaard
2008-08-15Merge branch '_nb' into allinone-nbJonas Smedegaard
2008-08-15Merge branch 'master' into allinone-nbJonas Smedegaard
2008-08-15Merge branch 'master' into _nbJonas Smedegaard
2008-08-15Merge branch 'master' into noneditJonas Smedegaard
2008-08-15Merge branch 'master' into _scsJonas Smedegaard
2008-08-15Merge branch 'master' into _cleanJonas Smedegaard
2008-08-15Avoid Git force-updating (loose commits not pushed).Jonas Smedegaard
2008-08-15Merge branch 'nonedit' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-15List admin setup before regular in Makefile (to minimize risk of public ↵Jonas Smedegaard
visible breakage).
2008-08-15Fix use locale-specific underlay for admin setup.Jonas Smedegaard
2008-08-15Fix use locale-specific Git hook for admin setup.Jonas Smedegaard
2008-08-15Merge branch '_nb' into allinone-nbJonas Smedegaard
2008-08-15Fix use locale-specific Git hook.Jonas Smedegaard
2008-08-15Rename admin setup to nb variant.Jonas Smedegaard
2008-08-15Merge branch 'wian' into allinone-nbJonas Smedegaard
2008-08-15Merge branch '_scs' into allinone-nbJonas Smedegaard
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 _scsJonas Smedegaard
2008-08-11Merge branch 'master' into _cleanJonas 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 _scsJonas Smedegaard
2008-08-11Merge branch 'master' into _cleanJonas 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