summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-08-30Merge branch '_da' into allinone-daJonas Smedegaard
2010-08-30Merge branch 'master' into _daJonas Smedegaard
Conflicts (manually resolve): ikiwiki_da.setup
2010-08-30Merge branch 'master' into _cleanJonas Smedegaard
2010-08-30Merge branch 'master' into wianJonas Smedegaard
2010-08-30Merge branch 'master' into _scsJonas Smedegaard
2010-08-30Always enable VCS (not only for admin setup.Jonas Smedegaard
2010-08-30Merge branch 'wian' into allinone-daJonas Smedegaard
2010-08-30Merge branch '_scs' into allinone-daJonas Smedegaard
2010-08-30Merge branch '_clean' into allinone-daJonas Smedegaard
2010-08-30Merge branch '_da' into allinone-daJonas Smedegaard
2010-08-30Merge branch 'master' into _daJonas Smedegaard
2010-08-30Merge branch 'master' into wianJonas Smedegaard
2010-08-30Merge branch 'master' into _cleanJonas Smedegaard
2010-08-30Merge branch 'master' into _scsJonas Smedegaard
2010-08-30Avoid setting CGI script suid: upsets apache2-suexec.Jonas Smedegaard
2010-08-27Merge branch 'wian' into allinone-daJonas Smedegaard
2010-08-27Sync plugins farbar and topbar with Ikiwiki 3.20100722 sidebar.Jonas Smedegaard
2010-07-23Drop nonedit branches: Disable plugin editpage instead.Jonas Smedegaard
2010-07-21Merge branch 'wian' into allinone-daJonas Smedegaard
Conflicts (suppress changes): templates
2010-07-21Sync submodules templates(_nonedit) with HEAD of allinone(-nonedit)-da.Jonas Smedegaard
2010-07-20Sync submodule templates with HEAD of wian.Jonas Smedegaard
2010-07-19Sync submodule directives with HEAD of master.Jonas Smedegaard
2010-07-19Merge branch 'wian' into allinone-daJonas Smedegaard
Conflicts (suppress changes): basewiki
2010-07-19Merge branch 'nonedit' into allinone-daJonas Smedegaard
2010-07-19Merge branch '_scs' into allinone-daJonas Smedegaard
Conflicts (suppress changes): basewiki templates
2010-07-19Merge branch '_clean' into allinone-daJonas Smedegaard
Conflicts (suppress changes): basewiki
2010-07-19Merge branch '_da' into allinone-daJonas Smedegaard
Conflicts (sync submodules with HEAD of allinone-da): basewiki smiley templates
2010-07-19Fix revert submodules basewiki and templates to sync with HEAD of master ↵Jonas Smedegaard
(not scs: switch later).
2010-07-19Fix revert submodules basewiki, javascript, openid-selector, smiley and ↵Jonas Smedegaard
templates to sync with HEAD of master (not master-da: switch later).
2010-07-19Fix revert submodules basewiki and templates to sync with HEAD of master ↵Jonas Smedegaard
(not clean switch later).
2010-07-19Merge branch 'master' into allinone-daJonas Smedegaard
Conflicts (changes suppressed): basewiki templates
2010-07-19Merge branch 'master' into _daJonas Smedegaard
Conflicts (override with HEAD of submodules): basewiki templates
2010-07-19Merge branch 'master' into wianJonas Smedegaard
Conflicts: basewiki templates
2010-07-19Merge branch 'master' into noneditnoneditJonas Smedegaard
2010-07-19Merge branch 'master' into _scsJonas Smedegaard
Conflicts (suppressed): basewiki templates
2010-07-19Merge branch 'master' into _cleanJonas Smedegaard
Conflicts (suppressed): basewiki
2010-07-19Sync submodules basewiki directives and templates.Jonas Smedegaard
2010-07-19Merge branch 'nonedit' into allinone-daJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-da): basewiki
2010-07-19Merge branch '_scs' into allinone-daJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-da): basewiki
2010-07-19Merge branch '_clean' into allinone-daJonas Smedegaard
Conflicts (sync submodule basewiki with HEAD of allinone-da): basewiki
2010-07-19Merge branch '_da' into allinone-daJonas Smedegaard
Conflicts (use HEAD of submodule allinone-da): basewiki
2010-07-19Sync with HEAD of submodule basewiki.Jonas Smedegaard
2010-07-19Sync with HEAD of submodule basewiki.Jonas Smedegaard
2010-07-19Sync with HEAD of submodule basewiki.Jonas Smedegaard
2010-07-19Sync with HEAD of submodules basewiki, javascript and openid-selector.Jonas Smedegaard
2010-07-19Merge branch 'wian' into allinone-daJonas Smedegaard
2010-07-19Merge branch 'nonedit' into allinone-daJonas Smedegaard
2010-07-19Merge branch '_scs' into allinone-daJonas Smedegaard
2010-07-19Merge branch '_clean' into allinone-daJonas Smedegaard
2010-07-19Merge branch '_da' into allinone-daJonas Smedegaard
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-15 14:57:07 +0000