summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-08-15Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2008-08-15Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
2008-08-15Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2008-08-15Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2008-08-15Merge branch 'nonedit' into allinone-daJonas Smedegaard
2008-08-15Merge branch '_scs' into allinone-nbJonas Smedegaard
2008-08-15Merge branch '_scs' into allinone-daJonas Smedegaard
2008-08-15Merge branch '_clean' into allinone-nbJonas Smedegaard
2008-08-15Merge branch '_clean' into allinone-daJonas Smedegaard
2008-08-15Merge branch '_nb' into allinone-nbJonas Smedegaard
2008-08-15Merge branch '_da' into allinone-daJonas Smedegaard
2008-08-15Merge branch 'master' into _multilangJonas Smedegaard
2008-08-15Merge branch 'master' into allinone-nbJonas Smedegaard
2008-08-15Merge branch 'master' into allinone-daJonas Smedegaard
2008-08-15Merge branch 'master' into _nbJonas Smedegaard
2008-08-15Merge branch 'master' into _daJonas Smedegaard
2008-08-15Merge branch 'master' into noneditJonas Smedegaard
2008-08-15Merge branch 'master' into _scsJonas Smedegaard
2008-08-15Merge branch 'master' into _cleanJonas Smedegaard
2008-08-15Avoid Git force-updating (loose commits not pushed).Jonas Smedegaard
2008-08-15Set locale to en_US in non-localized admin setup.Jonas Smedegaard
2008-08-15Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2008-08-15Set locale to en_US in non-localized setup.Jonas Smedegaard
2008-08-15Fix typo: use _dummy_nb (not _dummy_da) for nb locale.Jonas Smedegaard
2008-08-15Ignore content_l10n, and _dummy_xx (not _xx_dummy).Jonas Smedegaard
2008-08-15Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2008-08-15Use _l10n/xx (not _xx) for locale content.Jonas Smedegaard
2008-08-15Ignore localized content.Jonas Smedegaard
2008-08-15Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
Conflicts (preserved original): Makefile
2008-08-15Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-15Merge branch 'nonedit' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-15Merge branch 'nonedit' into allinone-daJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-15List admin setup before regular in Makefile (to minimize risk of public ↵Jonas Smedegaard
visible breakage).
2008-08-15Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb_admin.setup
2008-08-15Fix use locale-specific underlay for admin setup.Jonas Smedegaard
2008-08-15Fix use locale-specific Git hook for admin setup.Jonas Smedegaard
2008-08-15Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2008-08-15Merge branch '_nb' into allinone-nbJonas Smedegaard
2008-08-15Fix use locale-specific Git hook.Jonas Smedegaard
2008-08-15Use locale-specific CGI.Jonas Smedegaard
2008-08-15Use locale-specific content. Fix danish underlay.Jonas Smedegaard
2008-08-15Add da and nb locales and enable their setups.Jonas Smedegaard
2008-08-15Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup (Changes to Makefile suppressed)
2008-08-15Rename admin setup to nb variant.Jonas Smedegaard
2008-08-15Merge branch 'wian' into allinone-nbJonas Smedegaard
2008-08-15Merge branch '_scs' into allinone-nbJonas Smedegaard
2008-08-15Apply changes from clean branch on admin file too.Jonas Smedegaard
2008-08-15Merge branch '_clean' into allinone-nbJonas Smedegaard
2008-08-15Merge branch 'nonedit' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup Also, use nb setup files in Makefile.
2008-08-15Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): Makefile (preserved non-locale settings) ikiwiki_da.setup ikiwiki_da_admin.setup
generated by cgit v1.2.3 (git 2.46.0) at 2025-02-15 17:48:32 +0000