summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-10-25Fix merge noise.Jonas Smedegaard
2008-10-25Merge branch 'wian' into allinone-nbJonas Smedegaard
2008-10-25Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2008-10-25Merge branch '_scs' into allinone-nbJonas Smedegaard
2008-10-25Merge branch '_clean' into allinone-nbJonas Smedegaard
2008-10-25Merge branch '_nb' into allinone-nbJonas Smedegaard
2008-10-25Merge branch 'master' into allinone-nbJonas Smedegaard
2008-10-25Merge branch 'master' into _nbJonas Smedegaard
2008-10-25Merge branch 'master' into wianJonas Smedegaard
2008-10-25Merge branch 'master' into noneditJonas Smedegaard
2008-10-25Merge branch 'master' into _scsJonas Smedegaard
2008-10-25Merge branch 'master' into _cleanJonas Smedegaard
2008-10-25Use full (but $PATH-expanded) path for libdir.Jonas Smedegaard
2008-10-23Merge branch 'wian' into allinone-nbJonas Smedegaard
2008-10-23Merge branch 'nonedit' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_admin.setup ikiwiki_nb_admin.setup
2008-10-23Merge branch '_scs' into allinone-nbJonas Smedegaard
2008-10-23Merge branch '_clean' into allinone-nbJonas Smedegaard
2008-10-23Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.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-10-23Merge branch 'master' into wianJonas Smedegaard
2008-10-23Merge branch 'master' into noneditJonas Smedegaard
2008-10-23Merge branch 'master' into _scsJonas Smedegaard
2008-10-23Merge branch 'master' into _cleanJonas Smedegaard
2008-10-23Fix use -ikiwiki extension to Git hook.Jonas Smedegaard
2008-10-23Merge branch 'master' into noneditJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2008-10-23Merge branch 'master' into _scsJonas Smedegaard
2008-10-23Merge branch 'master' into _cleanJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2008-10-23Set wikiname to match older one: wiki -> MyWiki.Jonas Smedegaard
2008-10-23Update templates POT and danish PO.Jonas Smedegaard
2008-10-23Revert "Drop superfluous /ms regex extensions."Jonas Smedegaard
It is indeed needed for templates. This reverts commit e35add35a02e84a99b83a4090870ac634e344ca6.
2008-10-23Add directives POT.Jonas Smedegaard
2008-10-23Update basewiki POT and danish PO.Jonas Smedegaard
2008-10-23Drop superfluous /ms regex extensions.Jonas Smedegaard
2008-10-23Disable wrap on macro begin at middle of a line.Jonas Smedegaard
2008-10-22Adapt ikiwiki.setup paths to common usage.Jonas Smedegaard
2008-10-22Sync with ikiwiki 2.67.Jonas Smedegaard
2008-10-15Merge branch 'wian' into allinone-nbJonas Smedegaard
2008-10-15Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2008-10-15Merge branch '_scs' into allinone-nbJonas Smedegaard
2008-10-15Merge branch '_clean' into allinone-nbJonas Smedegaard
2008-10-15Merge branch '_nb' into allinone-nbJonas Smedegaard
2008-10-15Merge branch 'master' into allinone-nbJonas Smedegaard
2008-10-15Merge branch 'master' into _nbJonas Smedegaard
2008-10-15Merge branch 'master' into wianJonas Smedegaard
2008-10-15Merge branch 'master' into noneditJonas Smedegaard
2008-10-15Merge branch 'master' into _scsJonas Smedegaard
2008-10-15Merge branch 'master' into _cleanJonas Smedegaard
2008-10-14Ignore <URL> from html detection in po4a plugin.Jonas Smedegaard
2008-10-01Merge branch 'wian' into allinone-nbJonas Smedegaard