summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-08-30Sync with HEADs of submodules basewiki_da javascript openid-selector smiley ↵Jonas Smedegaard
templates_da.
2010-08-30Merge branch 'nb' into _multilangJonas Smedegaard
2010-08-30Merge branch 'da' into _multilangJonas Smedegaard
2010-08-30Merge branch '_nb' into nbJonas Smedegaard
2010-08-30Merge branch '_da' into daJonas Smedegaard
2010-08-30Merge branch 'nb' into _multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-08-30Merge branch 'da' into _multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2010-08-30Merge branch 'master' into _nbJonas Smedegaard
2010-08-30Merge branch 'master' into _daJonas Smedegaard
2010-08-30Merge branch 'master' into _multilangJonas Smedegaard
2010-08-30Use qw{} in add_plugins and disable_plugins.Jonas Smedegaard
2010-08-30Merge branch '_nb' into nbJonas Smedegaard
2010-08-30Merge branch '_da' into daJonas Smedegaard
2010-08-30Merge branch 'master' into _multilangJonas Smedegaard
2010-08-30Merge branch 'master' into _nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-08-30Merge branch 'master' into _daJonas Smedegaard
Conflicts (manually resolve): ikiwiki_da.setup
2010-08-30Always enable VCS (not only for admin setup.Jonas Smedegaard
2010-08-30Merge branch 'nb' into _multilangJonas Smedegaard
Conflicts (manually resolve): Makefile basewiki ikiwiki_nb.setup templates
2010-08-30Merge branch 'da' into _multilangJonas Smedegaard
2010-08-30Avoid setting CGI script suid: upsets apache2-suexec.Jonas Smedegaard
2010-08-30Merge branch '_nb' into nbJonas Smedegaard
2010-08-30Merge branch '_da' into daJonas Smedegaard
2010-08-30Merge branch 'master' into _nbJonas Smedegaard
2010-08-30Merge branch 'master' into _daJonas Smedegaard
2010-08-30Merge branch 'master' into _multilangJonas Smedegaard
2010-08-30Avoid setting CGI script suid: upsets apache2-suexec.Jonas Smedegaard
2010-07-19Sync submodules basewiki, smiley and templates with HEAD of master-nb, and ↵Jonas Smedegaard
javascript and openid-selector with HEAD of master-da.
2010-07-19Sync submodules basewiki, javascript, openid-selector, smiley and templates ↵Jonas Smedegaard
with HEAD of master-da.
2010-07-19Merge branch '_nb' into nbJonas Smedegaard
2010-07-19Merge branch '_da' into daJonas Smedegaard
2010-07-19Fix revert submodules basewiki, javascript, openid-selector, smiley and ↵Jonas Smedegaard
templates to sync with HEAD of master (not master-nb: 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-19Merge branch '_nb' into nbJonas Smedegaard
2010-07-19Merge branch '_da' into daJonas Smedegaard
2010-07-19Merge branch 'master' into _multilangJonas Smedegaard
2010-07-19Merge branch 'master' into _nbJonas Smedegaard
Conflicts (override with HEAD of submodules): basewiki templates
2010-07-19Merge branch 'master' into _daJonas Smedegaard
Conflicts (override with HEAD of submodules): basewiki templates
2010-07-19Sync submodules basewiki directives and templates.Jonas Smedegaard
2010-07-19Sync with HEAD of submodule basewiki.Jonas Smedegaard
2010-07-19Merge branch '_nb' into nbJonas Smedegaard
2010-07-19Merge branch '_da' into daJonas Smedegaard
2010-07-19Sync with HEAD of submodules basewiki, javascript and openid-selector.Jonas Smedegaard
2010-07-19Sync with HEAD of submodules basewiki, javascript and openid-selector.Jonas Smedegaard
2010-07-19Merge branch '_nb' into nbJonas Smedegaard
2010-07-19Merge branch '_da' into daJonas Smedegaard
2010-07-19Merge branch 'master' into _multilangJonas Smedegaard
Conflicts (manually resolved: merge old and new parts): .gitmodules
2010-07-19Merge branch 'master' into _nbJonas Smedegaard
2010-07-19Merge branch 'master' into _daJonas Smedegaard
2010-07-19Improve grammar (OpenID is common gender, not neuter; wikipedia link on url) ↵Jonas Smedegaard
in danish po of basewiki and templates.
2010-07-18Improve grammar in danish po of basewiki and templates: ↵Jonas Smedegaard
signin=registrér/notér (not log på).
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-14 15:49:34 +0000