summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-10-05Merge branch '_da' into daJonas Smedegaard
2010-10-05Merge branch 'master' into _daJonas Smedegaard
2010-10-05Create dummy git repos for dummy content (not-git folders may upset ↵Jonas Smedegaard
Ikiwiki). Clean dummy content dirs in clean (not ultraclean).
2010-10-04Merge branch '_da' into daJonas Smedegaard
2010-10-04Merge branch 'master' into _daJonas Smedegaard
2010-10-04Really really fix make space after hash optional in plugin h1title.Jonas Smedegaard
2010-10-04Merge branch '_da' into daJonas Smedegaard
2010-10-04Merge branch 'master' into _daJonas Smedegaard
2010-10-04Fix fix to make space after hash optional in plugin h1title.Jonas Smedegaard
2010-10-04Merge branch '_da' into daJonas Smedegaard
2010-10-04Merge branch 'master' into _daJonas Smedegaard
2010-10-04Strip non-git VCS cruft from ikiwiki config.Jonas Smedegaard
2010-10-04Use $SRCDIR favored over $PWD in ikiwiki config.Jonas Smedegaard
2010-10-01Merge branch '_da' into daJonas Smedegaard
2010-10-01Merge branch 'master' into _daJonas Smedegaard
2010-10-01Fix make space after hash optional in plugin h1title.Jonas Smedegaard
2010-09-16Merge branch '_da' into daJonas Smedegaard
2010-09-16Merge branch 'master' into _daJonas Smedegaard
2010-09-16Add plugin h1title.Jonas Smedegaard
2010-09-03Merge branch '_da' into daJonas Smedegaard
2010-09-03Merge branch 'master' into _daJonas Smedegaard
Conflicts (resolved manually): ikiwiki_da.setup
2010-09-03Fix always prepend basedir in ikiwiki config, and tidy our vars.Jonas Smedegaard
2010-09-01Merge branch '_da' into daJonas Smedegaard
2010-09-01Merge branch 'master' into _daJonas Smedegaard
2010-09-01Fix have install target depend on init.Jonas Smedegaard
2010-09-01Merge branch '_da' into daJonas Smedegaard
2010-09-01Merge branch 'master' into _daJonas Smedegaard
2010-09-01Drop TODO (locale files are now in same dir as smiley plugin).Jonas Smedegaard
2010-09-01Merge branch '_da' into daJonas Smedegaard
2010-09-01Merge branch 'master' into _daJonas Smedegaard
2010-09-01Create dummy_MODULES in init target.Jonas Smedegaard
2010-08-31Merge branch '_da' into daJonas Smedegaard
2010-08-31Merge branch 'master' into _daJonas Smedegaard
2010-08-31Fix generalize gitrepo in ikiwiki setup file.Jonas Smedegaard
2010-08-31Merge branch '_da' into daJonas Smedegaard
2010-08-31Merge branch 'master' into _daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2010-08-31Generalize paths and URLs iki ikiwiki setup file.Jonas Smedegaard
2010-08-30Fix enable prefix_directives.Jonas Smedegaard
2010-08-30Merge branch '_da' into daJonas Smedegaard
2010-08-30Merge branch 'master' into _daJonas Smedegaard
2010-08-30Use qw{} in add_plugins and disable_plugins.Jonas Smedegaard
2010-08-30Merge branch '_da' into daJonas Smedegaard
2010-08-30Merge branch 'master' into _daJonas Smedegaard
Conflicts (manually resolve): ikiwiki_da.setup
2010-08-30Always enable VCS (not only for admin setup.Jonas Smedegaard
2010-08-30Merge branch '_da' into daJonas Smedegaard
2010-08-30Merge branch 'master' into _daJonas Smedegaard
2010-08-30Avoid setting CGI script suid: upsets apache2-suexec.Jonas Smedegaard
2010-07-19Sync submodules basewiki, javascript, openid-selector, smiley and templates ↵Jonas Smedegaard
with HEAD of master-da.
2010-07-19Merge branch '_da' into daJonas Smedegaard
2010-07-19Fix revert submodules basewiki, javascript, openid-selector, smiley and ↵Jonas Smedegaard
templates to sync with HEAD of master (not master-da: switch later).