summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-08-15Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup (Changes to Makefile suppressed)
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-15Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): Makefile (preserved non-locale settings) ikiwiki_da.setup ikiwiki_da_admin.setup
2008-08-14Merge branch 'allinone' into allinone-multilangJonas Smedegaard
2008-08-14Merge ikiwiki_nb.setup from '_nb' branch.Jonas Smedegaard
Merge '_nb' branch, but re-add dropped ikiwiki.setup, to only add (not rename) nb variant.
2008-08-14Merge ikiwiki_da.setup fork from 'da' branch.Jonas Smedegaard
Merge an early snapshot of 'da' branch, but revert Makefile changes, and re-add dropped ikiwiki.setup, to only add (not rename) da variant.
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-11Merge branch 'nonedit' into allinone-daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da_admin.setup
2008-08-11Merge branch 'nonedit' into allinoneJonas Smedegaard
2008-08-11Fix (again) use admin.example.org as host for admin site.Jonas Smedegaard
2008-08-11Merge branch 'nonedit' into allinone-daJonas Smedegaard
2008-08-11Merge branch 'nonedit' into allinoneJonas Smedegaard
2008-08-11Fix (again) use admin.example.org as destdir for admin site.Jonas Smedegaard
2008-08-11Clean admin setup.Jonas Smedegaard
2008-08-11Merge branch 'nonedit' into allinone-daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2008-08-11Merge branch 'nonedit' into allinoneJonas Smedegaard
2008-08-11Merge branch '_scs' into allinone-daJonas Smedegaard
2008-08-11Merge branch '_scs' into allinoneJonas Smedegaard
2008-08-11Merge branch '_clean' into allinone-daJonas Smedegaard
2008-08-11Merge branch '_clean' into allinoneJonas 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 allinoneJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
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 'nonedit' into allinoneJonas Smedegaard
2008-08-11Merge branch '_scs' into allinone-daJonas Smedegaard
2008-08-11Merge branch '_scs' into allinoneJonas Smedegaard
2008-08-11Merge branch '_clean' into allinone-daJonas Smedegaard
2008-08-11Merge branch '_clean' into allinoneJonas 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 allinoneJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup Also, examplewiki -> samplewiki applied to admin setup too.
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-25 22:57:01 +0000