Age | Commit message (Collapse) | Author | |
---|---|---|---|
2008-08-11 | Merge branch 'master' into allinone | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki.setup | |||
2008-08-11 | Fix shorten destdir to match url. | Jonas Smedegaard | |
2008-08-11 | Merge branch 'master' into allinone | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki.setup Also, examplewiki -> samplewiki applied to admin setup too. | |||
2008-08-11 | Fix inconsistency examplewiki -> samplewiki. | Jonas Smedegaard | |
2008-08-10 | Merge branch 'nonedit' into allinone | Jonas Smedegaard | |
2008-08-10 | Merge branch 'master' into allinone | Jonas Smedegaard | |
Conflicts (manually resolved): Makefile | |||
2008-08-10 | Use nonedit branch and dummy content for main setup. | Jonas Smedegaard | |
2008-08-10 | Adapt ikiwiki.setup paths to common usage. | Jonas Smedegaard | |
2008-08-01 | Merge branch 'master' into clean | Jonas Smedegaard | |
(newly added monotone hook stripped too) | |||
2008-08-01 | Sync ikiwiki.setup with ikiwiki 2.55. | Jonas Smedegaard | |
2008-07-13 | Drop non-Git VCS options from config. Use clean content branches. | Jonas Smedegaard | |
2008-02-22 | Sync ikiwiki.setup with ikiwiki 2.32.3. | Jonas Smedegaard | |
2007-10-21 | Grab upstream pages from version 2.10. | Jonas Smedegaard | |