summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-08-31Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
Conflicts (resolved manually): ikiwiki_nb.setup ikiwiki_nb_admin.setup
2010-08-31Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2010-08-31Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2010-08-31Merge branch 'wian' into allinone-nbJonas Smedegaard
2010-08-31Merge branch 'wian' into allinone-daJonas Smedegaard
2010-08-31Merge branch '_scs' into allinone-nbJonas Smedegaard
2010-08-31Merge branch '_scs' into allinone-daJonas Smedegaard
2010-08-31Merge branch '_clean' into allinone-nbJonas Smedegaard
2010-08-31Merge branch '_clean' into allinone-daJonas Smedegaard
2010-08-31Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (resolved manually): ikiwiki_nb.setup
2010-08-31Merge branch 'nb' into _multilangJonas Smedegaard
Conflicts (resolved manually): ikiwiki_nb.setup
2010-08-31Merge branch 'da' into _multilangJonas Smedegaard
Conflicts (resolved manually): ikiwiki_da.setup
2010-08-31Merge branch '_da' into allinone-daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2010-08-31Merge branch '_nb' into nbJonas Smedegaard
2010-08-31Merge branch '_da' into daJonas Smedegaard
2010-08-31Merge branch 'master' into _multilangJonas Smedegaard
Conflicts (manually resolve): ikiwiki.setup
2010-08-31Merge branch 'master' into _nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-08-31Merge branch 'master' into _daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2010-08-31Merge branch 'master' into wianJonas Smedegaard
2010-08-31Merge branch 'master' into _scsJonas Smedegaard
2010-08-31Merge branch 'master' into _cleanJonas Smedegaard
2010-08-31Generalize paths and URLs iki ikiwiki setup file.Jonas Smedegaard
2010-08-30Fix set locale nb_NO (not bogus no_NB).Jonas Smedegaard
2010-08-30Fix enable prefix_directives.Jonas Smedegaard
2010-08-30Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2010-08-30Merge branch 'nb' into _multilangJonas Smedegaard
2010-08-30Merge branch 'da' into _multilangJonas Smedegaard
2010-08-30Fix enable prefix_directives.Jonas Smedegaard
2010-08-30Fix enable prefix_directives.Jonas Smedegaard
2010-08-30Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2010-08-30Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
2010-08-30Use qw{} in add_plugins and disable_plugins.Jonas Smedegaard
2010-08-30Use qw{} in add_plugins and disable_plugins.Jonas Smedegaard
2010-08-30Use qw{} in add_plugins and disable_plugins.Jonas Smedegaard
2010-08-30Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2010-08-30Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
2010-08-30Avoid setting CGI script suid: upsets apache2-suexec.Jonas Smedegaard
2010-08-30Avoid setting CGI script suid: upsets apache2-suexec.Jonas Smedegaard
2010-08-30Avoid setting CGI script suid: upsets apache2-suexec.Jonas Smedegaard
2010-08-30Sync with HEADs of submodules basewiki_da templates_da basewiki smiley_da ↵Jonas Smedegaard
smiley_nb templates templates_nb.
2010-08-30Sync with HEADs of submodules basewiki_da javascript openid-selector smiley ↵Jonas Smedegaard
templates_da.
2010-08-30Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2010-08-30Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
2010-08-30Enable historyurl and diffurl for admin site.Jonas Smedegaard
2010-08-30Enable historyurl and diffurl for admin site.Jonas Smedegaard
2010-08-30Enable historyurl and diffurl for admin site.Jonas Smedegaard
2010-08-30Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2010-08-30Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
2010-08-30Always enable VCS (not only for admin setup.Jonas Smedegaard
2010-08-30Always enable VCS (not only for admin setup.Jonas Smedegaard