summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-07-14Merge branch '_clean' into allinone-nbJonas Smedegaard
2010-07-14Merge branch '_nb' into allinone-nbJonas Smedegaard
2010-07-14Merge branch 'master' into allinone-nbJonas Smedegaard
2010-07-14Merge branch 'master' into _cleanJonas Smedegaard
2010-07-14Merge branch 'master' into _nbJonas Smedegaard
2010-07-14No longer gitginore basewiki or templates_nonedit.Jonas Smedegaard
2010-07-13Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2010-07-13Use main basewiki and templates dir (not ...l10n subdir) in ↵Jonas Smedegaard
ikiwiki_nb_admin.config.
2010-07-13Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (resolve manually): ikiwiki_nb.setup
2010-07-13Add basewiki_nonedit and templates_nonedit as submodules, and no longer ↵Jonas Smedegaard
gitignore them.
2010-07-11Use main basewiki and templates dir (not ...l10n subdir) in ikiwiki_nb.config.Jonas Smedegaard
2010-07-11Merge branch 'wian' into allinone-nbJonas Smedegaard
Conflicts: basewiki templates
2010-07-11Merge branch '_scs' into allinone-nbJonas Smedegaard
Conflicts: basewiki templates
2010-07-11Sync with allinone-nb branch of basewiki, smiley and templates.Jonas Smedegaard
2010-07-11Merge branch '_nb' into allinone-nbJonas Smedegaard
2010-07-11Sync with master-nb branch of basewiki, smiley and templates.Jonas Smedegaard
2010-07-11Sync with scs branch of basewiki and templates.Jonas Smedegaard
2010-07-11Sync with wian branch of templates.Jonas Smedegaard
2010-07-11Merge branch '_nb' into allinone-nbJonas Smedegaard
2010-07-11Sync with clean branch of basewiki, smiley and templates.Jonas Smedegaard
2010-07-11Sync with clean branch of basewiki.Jonas Smedegaard
2010-07-11Merge branch 'wian' into allinone-nbJonas Smedegaard
2010-07-11Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2010-07-11Merge branch '_scs' into allinone-nbJonas Smedegaard
2010-07-11Merge branch '_clean' into allinone-nbJonas Smedegaard
2010-07-11Merge branch '_nb' into allinone-nbJonas Smedegaard
2010-07-11Merge branch 'master' into allinone-nbJonas Smedegaard
Conflicts: Makefile (manually resolved)
2010-07-11Merge branch 'master' into _nbJonas Smedegaard
2010-07-11Merge branch 'master' into wianJonas Smedegaard
2010-07-11Merge branch 'master' into noneditJonas Smedegaard
Conflicts: Makefile (resolved manually)
2010-07-11Merge branch 'master' into _scsJonas Smedegaard
2010-07-11Merge branch 'master' into _cleanJonas Smedegaard
2010-07-11Rewrite Makefiles and README to reflect use of Git submodule (not ↵Jonas Smedegaard
multi-layered Gits).
2010-07-11Add basewiki, directives, smiley and templates as submodules, and no longer ↵Jonas Smedegaard
gitignore them.
2009-05-25Sync with po4a 0.36.1.Jonas Smedegaard
2009-05-25Strip old superfluous comments from PO files.Jonas Smedegaard
2009-05-25Regenerate PO-files using po4a 0.36.1.Jonas Smedegaard
2008-11-17Fix branding_logo_text -> branding_logo_tagline.Jonas Smedegaard
2008-11-17Merge branch 'wian' into allinone-nbJonas Smedegaard
2008-11-17Fix branding_logo_text -> branding_logo_tagline.Jonas Smedegaard
2008-11-13Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2008-11-13Enable prefix_directives.Jonas Smedegaard
2008-11-13Merge branch '_clean' into allinone-nbJonas Smedegaard
2008-11-13Enable prefix_directives.Jonas Smedegaard
2008-11-01Add varioki sample strings to non-admin config.Jonas Smedegaard
2008-11-01Merge branch 'wian' into allinone-nbJonas Smedegaard
2008-11-01Add varioki sample strings.Jonas Smedegaard
2008-10-25Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2008-10-25Use full libdir path for admin config.Jonas Smedegaard
2008-10-25Use full libdir path for non-admin config.Jonas Smedegaard
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-16 07:56:13 +0000