Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-07-19 | Merge branch '_scs' into allinone-nb | Jonas Smedegaard | |
Conflicts (suppress changes): basewiki templates | |||
2010-07-19 | Merge branch '_clean' into allinone-nb | Jonas Smedegaard | |
Conflicts (suppress changes): basewiki | |||
2010-07-19 | Merge branch '_nb' into allinone-nb | Jonas Smedegaard | |
Conflicts (changes suppressed): basewiki smiley templates | |||
2010-07-19 | Fix revert submodules basewiki and templates to sync with HEAD of master ↵ | Jonas Smedegaard | |
(not scs: switch later). | |||
2010-07-19 | Fix revert submodules basewiki, javascript, openid-selector, smiley and ↵ | Jonas Smedegaard | |
templates to sync with HEAD of master (not master-nb: switch later). | |||
2010-07-19 | Fix revert submodules basewiki and templates to sync with HEAD of master ↵ | Jonas Smedegaard | |
(not clean switch later). | |||
2010-07-19 | Merge branch 'master' into allinone-nb | Jonas Smedegaard | |
Conflicts (changes suppressed): basewiki templates | |||
2010-07-19 | Merge branch 'master' into _nb | Jonas Smedegaard | |
Conflicts (override with HEAD of submodules): basewiki templates | |||
2010-07-19 | Merge branch 'master' into wian | Jonas Smedegaard | |
Conflicts: basewiki templates | |||
2010-07-19 | Merge branch 'master' into noneditnonedit | Jonas Smedegaard | |
2010-07-19 | Merge branch 'master' into _scs | Jonas Smedegaard | |
Conflicts (suppressed): basewiki templates | |||
2010-07-19 | Merge branch 'master' into _clean | Jonas Smedegaard | |
Conflicts (suppressed): basewiki | |||
2010-07-19 | Sync submodules basewiki directives and templates. | Jonas Smedegaard | |
2010-07-19 | Merge branch 'nonedit' into allinone-nb | Jonas Smedegaard | |
Conflicts (sync submodule basewiki with HEAD of allinone-nb): basewiki | |||
2010-07-19 | Merge branch '_scs' into allinone-nb | Jonas Smedegaard | |
Conflicts (sync submodule basewiki with HEAD of allinone-nb): basewiki | |||
2010-07-19 | Merge branch '_clean' into allinone-nb | Jonas Smedegaard | |
Conflicts (sync submodule basewiki with HEAD of allinone-nb): basewiki | |||
2010-07-19 | Merge branch '_nb' into allinone-nb | Jonas Smedegaard | |
Conflicts (sync submodules basewiki, basewiki_nonedit and templates_nonedit with HEAD of *_nb branch): basewiki | |||
2010-07-19 | Sync with HEAD of submodule basewiki. | Jonas Smedegaard | |
2010-07-19 | Sync with HEAD of submodule basewiki. | Jonas Smedegaard | |
2010-07-19 | Sync with HEAD of submodule basewiki. | Jonas Smedegaard | |
2010-07-19 | Sync with HEAD of submodules basewiki, javascript and openid-selector. | Jonas Smedegaard | |
2010-07-19 | Merge branch 'wian' into allinone-nb | Jonas Smedegaard | |
2010-07-19 | Merge branch 'nonedit' into allinone-nb | Jonas Smedegaard | |
2010-07-19 | Merge branch '_scs' into allinone-nb | Jonas Smedegaard | |
2010-07-19 | Merge branch '_clean' into allinone-nb | Jonas Smedegaard | |
2010-07-19 | Merge branch '_nb' into allinone-nb | Jonas Smedegaard | |
2010-07-19 | Merge branch 'master' into allinone-nb | Jonas Smedegaard | |
Conflicts (manually resolved: merge old and new parts): .gitmodules | |||
2010-07-19 | Merge branch 'master' into wian | Jonas Smedegaard | |
2010-07-19 | Merge branch 'master' into _nb | Jonas Smedegaard | |
2010-07-19 | Merge branch 'master' into nonedit | Jonas Smedegaard | |
Conflicts (manually resolved: merge old and new parts): .gitmodules | |||
2010-07-19 | Merge branch 'master' into _scs | Jonas Smedegaard | |
2010-07-19 | Merge branch 'master' into _clean | Jonas Smedegaard | |
2010-07-19 | Improve grammar (OpenID is common gender, not neuter; wikipedia link on url) ↵ | Jonas Smedegaard | |
in danish po of basewiki and templates. | |||
2010-07-18 | Improve grammar in danish po of basewiki and templates: ↵ | Jonas Smedegaard | |
signin=registrér/notér (not log på). | |||
2010-07-18 | Fix a grammar error in danish po of templates. | Jonas Smedegaard | |
2010-07-18 | Refresh (i.e. drop po line-wrapping of) danish po of templates. | Jonas Smedegaard | |
2010-07-18 | Fix a couple of grammar errors in danish po of templates. | Jonas Smedegaard | |
2010-07-17 | Update danish PO of smiley. | Jonas Smedegaard | |
2010-07-17 | Update danish PO of templates. | Jonas Smedegaard | |
2010-07-16 | Update danish PO of basewiki. | Jonas Smedegaard | |
2010-07-16 | Sync with (CVS snapshot of) po4a 0.39.1. | Jonas Smedegaard | |
2010-07-16 | Bump Project-Id-Version for PO templates. | Jonas Smedegaard | |
2010-07-16 | Bump ikiwiki_VERSION in Makefile. | Jonas Smedegaard | |
2010-07-15 | Add javascript openid-selector and themes as submodules. | Jonas Smedegaard | |
2010-07-15 | Sync POT with ikiwiki 3.20100704. | Jonas Smedegaard | |
2010-07-14 | Merge branch 'wian' into allinone-nb | Jonas Smedegaard | |
2010-07-14 | Merge branch 'master' into wian | Jonas Smedegaard | |
2010-07-14 | Merge branch 'master' into _nb | Jonas Smedegaard | |
2010-07-14 | Merge branch 'master' into nonedit | Jonas Smedegaard | |
2010-07-14 | Merge branch 'master' into _scs | Jonas Smedegaard | |