summaryrefslogtreecommitdiff
path: root/ikiwiki_nb.setup
AgeCommit message (Collapse)Author
2010-08-31Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup ikiwiki_nb.setup
2010-08-31Fix use qw{} in add_plugins and disable_plugins.Jonas Smedegaard
2010-08-31Fix generalize paths and URLs iki ikiwiki setup file.Jonas Smedegaard
2010-08-31Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
Conflicts (resolved manually): ikiwiki_nb.setup ikiwiki_nb_admin.setup
2010-08-31Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
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 '_nb' into nbJonas Smedegaard
2010-08-31Merge branch 'master' into _nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-08-30Fix enable prefix_directives.Jonas Smedegaard
2010-08-30Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-08-30Merge branch 'nb' into _multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-08-30Merge branch 'master' into _nbJonas Smedegaard
2010-08-30Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2010-08-30Merge branch '_nb' into allinone-nbJonas Smedegaard
2010-08-30Merge branch 'master' into _nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-08-30Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): Makefile smiley
2010-08-30Merge branch 'nb' into _multilangJonas Smedegaard
Conflicts (manually resolve): Makefile basewiki ikiwiki_nb.setup templates
2010-08-30Avoid setting CGI script suid: upsets apache2-suexec.Jonas Smedegaard
2010-08-30Merge branch '_nb' into allinone-nbJonas Smedegaard
2010-08-30Merge branch 'master' into _nbJonas Smedegaard
2010-07-23Drop nonedit branches: Disable plugin editpage instead.Jonas Smedegaard
2010-07-23Drop nonedit branches: Disable plugin editpage instead.Jonas Smedegaard
2010-07-14Fix use content_LL (not content) as underlay in ikiwiki_LL.setup.Jonas Smedegaard
2010-07-14Use git submodule, synced with allinone* branches, and restructure to use ↵Jonas Smedegaard
trailing _LL (not _l10n/LL) for add-on languages.
2010-07-14Add basewiki_LL and templates_LL, and use those (not ...l10n/LL subdir) in ↵Jonas Smedegaard
ikiwiki_LL.setup.
2010-07-13Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (resolve manually): ikiwiki_nb.setup
2010-07-11Use main basewiki and templates dir (not ...l10n subdir) in ikiwiki_nb.config.Jonas Smedegaard
2008-11-17Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2008-11-17Fix branding_logo_text -> branding_logo_tagline.Jonas Smedegaard
2008-11-13Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2008-11-13Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2008-11-13Enable prefix_directives.Jonas Smedegaard
2008-11-01Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2008-11-01Add varioki sample strings to non-admin config.Jonas Smedegaard
2008-10-25Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2008-10-25Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2008-10-25Use full libdir path for non-default locale configs.Jonas Smedegaard
2008-10-25Use full libdir path for non-admin config.Jonas Smedegaard
2008-10-25Fix merge noise.Jonas Smedegaard
2008-10-25Merge branch 'master' into _nbJonas Smedegaard
2008-10-23Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup ikiwiki_nb_admin.setup
2008-10-23Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): .gitignore ikiwiki.setup ikiwiki_da.setup ikiwiki_nb.setup
2008-10-23Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2008-10-23Merge branch 'master' into _multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2008-10-23Merge branch 'master' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb_admin.setup
2008-10-23Merge branch 'master' into _nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2008-08-30Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2008-08-30Set (commented out) locale-specific html extension in configs.Jonas Smedegaard
2008-08-30Merge branch '_multilang' into allinone-multilangJonas Smedegaard
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-15 12:57:10 +0000