Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-09-03 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2010-09-03 | Merge branch 'master' into _da | Jonas Smedegaard | |
Conflicts (resolved manually): ikiwiki_da.setup | |||
2010-08-31 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2010-08-31 | Merge branch 'master' into _da | Jonas Smedegaard | |
2010-08-31 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2010-08-31 | Merge branch 'master' into _da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2010-08-30 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2010-08-30 | Merge branch 'master' into _da | Jonas Smedegaard | |
2010-08-30 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
2010-08-30 | Merge branch 'master' into _da | Jonas Smedegaard | |
Conflicts (manually resolve): ikiwiki_da.setup | |||
2010-08-30 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
2010-08-30 | Merge branch 'master' into _da | Jonas Smedegaard | |
2010-07-23 | Drop nonedit branches: Disable plugin editpage instead. | Jonas Smedegaard | |
2010-07-13 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
Conflicts (resolved manually): ikiwiki_da.setup | |||
2010-07-11 | Use main basewiki and templates dir (not ...l10n subdir) in ikiwiki_da.config. | Jonas Smedegaard | |
2008-11-17 | Fix branding_logo_text -> branding_logo_tagline. | Jonas Smedegaard | |
2008-11-13 | Merge branch 'nonedit' into allinone-da | Jonas Smedegaard | |
2008-11-01 | Add varioki sample strings to non-admin config. | Jonas Smedegaard | |
2008-10-29 | Use standard extension. | Jonas Smedegaard | |
2008-10-25 | Use full libdir path for non-admin config. | Jonas Smedegaard | |
2008-10-25 | Merge branch 'master' into _da | Jonas Smedegaard | |
2008-10-23 | Fix use single-quotes. | Jonas Smedegaard | |
2008-10-23 | Merge branch 'nonedit' into allinone-da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_admin.setup ikiwiki_da_admin.setup | |||
2008-10-23 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2008-10-23 | Merge branch 'master' into allinone-da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da_admin.setup | |||
2008-10-23 | Merge branch 'master' into _da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2008-08-11 | Merge branch 'nonedit' into allinone-da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2008-08-11 | Merge branch 'master' into _da | Jonas Smedegaard | |
2008-08-11 | Merge branch 'master' into _da | Jonas Smedegaard | |
2008-08-11 | Fix inconsistency examplewiki -> samplewiki. | Jonas Smedegaard | |
2008-08-11 | Add trailing -da to git wrapper paths. | Jonas Smedegaard | |
2008-08-10 | Merge branch 'nonedit' into allinone-da | Jonas Smedegaard | |
Conflicts (manually resolved): Makefile ikiwiki_da.setup | |||
2008-08-10 | Merge branch 'clean' into allinone-da | Jonas Smedegaard | |
2008-08-10 | Use and adapt new ikiwiki_da.setup. Drop ikiwiki.setup. | Jonas Smedegaard | |
2008-08-10 | Fork ikiwiki.setup as ikiwiki_da.setup. | Jonas Smedegaard | |