Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-08-31 | Merge branch '_multilang' into allinone-multilang | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup ikiwiki_nb.setup | |||
2010-08-31 | Fix use qw{} in add_plugins and disable_plugins. | Jonas Smedegaard | |
2010-08-31 | Fix generalize paths and URLs iki ikiwiki setup file. | Jonas Smedegaard | |
2010-08-31 | Merge branch 'allinone-da' into allinone-multilang | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2010-08-31 | Merge branch '_multilang' into allinone-multilang | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki.setup | |||
2010-08-31 | Merge branch 'da' into _multilang | Jonas Smedegaard | |
Conflicts (resolved manually): ikiwiki_da.setup | |||
2010-08-31 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2010-08-31 | Merge branch '_da' into da | Jonas Smedegaard | |
2010-08-31 | Merge branch 'master' into _da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2010-08-30 | Fix enable prefix_directives. | Jonas Smedegaard | |
2010-08-30 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2010-08-30 | Merge branch 'da' into _multilang | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2010-08-30 | Merge branch 'master' into _da | Jonas Smedegaard | |
2010-08-30 | Merge branch 'allinone-da' into allinone-multilang | Jonas Smedegaard | |
2010-08-30 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
2010-08-30 | Merge branch 'master' into _da | Jonas Smedegaard | |
Conflicts (manually resolve): ikiwiki_da.setup | |||
2010-08-30 | Merge branch '_multilang' into allinone-multilang | Jonas Smedegaard | |
Conflicts (manually resolved): Makefile smiley | |||
2010-08-30 | Avoid setting CGI script suid: upsets apache2-suexec. | Jonas Smedegaard | |
2010-08-30 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
2010-08-30 | Merge branch 'master' into _da | Jonas Smedegaard | |
2010-07-23 | Drop nonedit branches: Disable plugin editpage instead. | Jonas Smedegaard | |
2010-07-23 | Drop nonedit branches: Disable plugin editpage instead. | Jonas Smedegaard | |
2010-07-14 | Fix use content_LL (not content) as underlay in ikiwiki_LL.setup. | Jonas Smedegaard | |
2010-07-14 | Use git submodule, synced with allinone* branches, and restructure to use ↵ | Jonas Smedegaard | |
trailing _LL (not _l10n/LL) for add-on languages. | |||
2010-07-14 | Add basewiki_LL and templates_LL, and use those (not ...l10n/LL subdir) in ↵ | Jonas Smedegaard | |
ikiwiki_LL.setup. | |||
2010-07-13 | Merge branch 'allinone-da' into allinone-multilang | Jonas Smedegaard | |
2010-07-13 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
Conflicts (resolved manually): ikiwiki_da.setup | |||
2010-07-11 | Use main basewiki and templates dir (not ...l10n subdir) in ikiwiki_da.config. | Jonas Smedegaard | |
2008-11-17 | Merge branch 'allinone-da' into allinone-multilang | Jonas Smedegaard | |
2008-11-17 | Fix branding_logo_text -> branding_logo_tagline. | Jonas Smedegaard | |
2008-11-13 | Merge branch 'nonedit' into allinone-da | Jonas Smedegaard | |
2008-11-13 | Merge branch '_multilang' into allinone-multilang | Jonas Smedegaard | |
2008-11-13 | Enable prefix_directives. | Jonas Smedegaard | |
2008-11-01 | Merge branch 'allinone-da' into allinone-multilang | Jonas Smedegaard | |
2008-11-01 | Add varioki sample strings to non-admin config. | Jonas Smedegaard | |
2008-10-29 | Use standard extension. | Jonas Smedegaard | |
2008-10-25 | Merge branch '_multilang' into allinone-multilang | Jonas Smedegaard | |
2008-10-25 | Use full libdir path for non-default locale configs. | Jonas Smedegaard | |
2008-10-25 | Use full libdir path for non-admin config. | Jonas Smedegaard | |
2008-10-25 | Merge branch 'master' into _da | Jonas Smedegaard | |
2008-10-23 | Merge branch 'allinone-da' into allinone-multilang | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2008-10-23 | Merge branch '_multilang' into allinone-multilang | Jonas Smedegaard | |
Conflicts (manually resolved): .gitignore ikiwiki.setup ikiwiki_da.setup ikiwiki_nb.setup | |||
2008-10-23 | Fix use single-quotes. | Jonas Smedegaard | |
2008-10-23 | Merge branch 'nonedit' into allinone-da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_admin.setup ikiwiki_da_admin.setup | |||
2008-10-23 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2008-10-23 | Merge branch 'master' into allinone-da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da_admin.setup | |||
2008-10-23 | Merge branch 'master' into _multilang | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki.setup | |||
2008-10-23 | Merge branch 'master' into _da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2008-08-30 | Merge branch '_multilang' into allinone-multilang | Jonas Smedegaard | |
2008-08-30 | Set (commented out) locale-specific html extension in configs. | Jonas Smedegaard | |