Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-08-30 | Merge branch 'nb' into _multilang | Jonas Smedegaard | |
2010-08-30 | Merge branch 'da' into _multilang | Jonas Smedegaard | |
2010-08-30 | Fix enable prefix_directives. | Jonas Smedegaard | |
2010-08-30 | Fix enable prefix_directives. | Jonas Smedegaard | |
2010-08-30 | Sync with HEADs of submodules basewiki_da javascript openid-selector smiley ↵ | Jonas Smedegaard | |
templates_da. | |||
2010-08-30 | Merge branch 'nb' into _multilang | Jonas Smedegaard | |
2010-08-30 | Merge branch 'da' into _multilang | Jonas Smedegaard | |
2010-08-30 | Merge branch '_nb' into nb | Jonas Smedegaard | |
2010-08-30 | Merge branch '_da' into da | Jonas Smedegaard | |
2010-08-30 | Merge branch 'nb' into _multilang | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_nb.setup | |||
2010-08-30 | Merge branch 'da' into _multilang | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2010-08-30 | Merge branch 'master' into _nb | Jonas Smedegaard | |
2010-08-30 | Merge branch 'master' into _da | Jonas Smedegaard | |
2010-08-30 | Merge branch 'master' into _multilang | Jonas Smedegaard | |
2010-08-30 | Use qw{} in add_plugins and disable_plugins. | Jonas Smedegaard | |
2010-08-30 | Merge branch '_nb' into nb | Jonas Smedegaard | |
2010-08-30 | Merge branch '_da' into da | Jonas Smedegaard | |
2010-08-30 | Merge branch 'master' into _multilang | Jonas Smedegaard | |
2010-08-30 | Merge branch 'master' into _nb | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_nb.setup | |||
2010-08-30 | Merge branch 'master' into _da | Jonas Smedegaard | |
Conflicts (manually resolve): ikiwiki_da.setup | |||
2010-08-30 | Always enable VCS (not only for admin setup. | Jonas Smedegaard | |
2010-08-30 | Merge branch 'nb' into _multilang | Jonas Smedegaard | |
Conflicts (manually resolve): Makefile basewiki ikiwiki_nb.setup templates | |||
2010-08-30 | Merge branch 'da' into _multilang | Jonas Smedegaard | |
2010-08-30 | Avoid setting CGI script suid: upsets apache2-suexec. | Jonas Smedegaard | |
2010-08-30 | Merge branch '_nb' into nb | Jonas Smedegaard | |
2010-08-30 | Merge branch '_da' into da | Jonas Smedegaard | |
2010-08-30 | Merge branch 'master' into _nb | Jonas Smedegaard | |
2010-08-30 | Merge branch 'master' into _da | Jonas Smedegaard | |
2010-08-30 | Merge branch 'master' into _multilang | Jonas Smedegaard | |
2010-08-30 | Avoid setting CGI script suid: upsets apache2-suexec. | Jonas Smedegaard | |
2010-07-19 | Sync submodules basewiki, smiley and templates with HEAD of master-nb, and ↵ | Jonas Smedegaard | |
javascript and openid-selector with HEAD of master-da. | |||
2010-07-19 | Sync submodules basewiki, javascript, openid-selector, smiley and templates ↵ | Jonas Smedegaard | |
with HEAD of master-da. | |||
2010-07-19 | Merge branch '_nb' into nb | Jonas Smedegaard | |
2010-07-19 | Merge branch '_da' into da | Jonas Smedegaard | |
2010-07-19 | Fix revert submodules basewiki, javascript, openid-selector, smiley and ↵ | Jonas Smedegaard | |
templates to sync with HEAD of master (not master-nb: switch later). | |||
2010-07-19 | Fix revert submodules basewiki, javascript, openid-selector, smiley and ↵ | Jonas Smedegaard | |
templates to sync with HEAD of master (not master-da: switch later). | |||
2010-07-19 | Merge branch '_nb' into nb | Jonas Smedegaard | |
2010-07-19 | Merge branch '_da' into da | Jonas Smedegaard | |
2010-07-19 | Merge branch 'master' into _multilang | Jonas Smedegaard | |
2010-07-19 | Merge branch 'master' into _nb | Jonas Smedegaard | |
Conflicts (override with HEAD of submodules): basewiki templates | |||
2010-07-19 | Merge branch 'master' into _da | Jonas Smedegaard | |
Conflicts (override with HEAD of submodules): basewiki templates | |||
2010-07-19 | Sync submodules basewiki directives and templates. | Jonas Smedegaard | |
2010-07-19 | Sync with HEAD of submodule basewiki. | Jonas Smedegaard | |
2010-07-19 | Merge branch '_nb' into nb | Jonas Smedegaard | |
2010-07-19 | Merge branch '_da' into da | Jonas Smedegaard | |
2010-07-19 | Sync with HEAD of submodules basewiki, javascript and openid-selector. | Jonas Smedegaard | |
2010-07-19 | Sync with HEAD of submodules basewiki, javascript and openid-selector. | Jonas Smedegaard | |
2010-07-19 | Merge branch '_nb' into nb | Jonas Smedegaard | |
2010-07-19 | Merge branch '_da' into da | Jonas Smedegaard | |
2010-07-19 | Merge branch 'master' into _multilang | Jonas Smedegaard | |
Conflicts (manually resolved: merge old and new parts): .gitmodules |