Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'origin/pr/783' | Andreas Gohr | 2014-07-04 |
|\ | | | | | | | | | | | | | | | | | * origin/pr/783: translation update Conflicts: inc/lang/es/edit.txt lib/plugins/extension/lang/es/lang.php | ||
| * | translation update | Jonathan Hernández | 2014-07-04 |
| | | |||
* | | Merge remote-tracking branch 'origin/pr/787' | Andreas Gohr | 2014-07-04 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | * origin/pr/787: translation update Conflicts: inc/lang/es/edit.txt | ||
| * | | translation update | Jonathan Hernández | 2014-07-04 |
| |/ | |||
* | | Merge pull request #781 from dokuwiki-translate/lang_update_71 | Andreas Gohr | 2014-07-04 |
|\ \ | | | | | | | Translation update (es) | ||
| * | | translation update | Jonathan Hernández | 2014-07-04 |
| |/ | |||
* | | Merge pull request #786 from dokuwiki-translate/lang_update_75 | Andreas Gohr | 2014-07-04 |
|\ \ | | | | | | | Translation update (es) | ||
| * | | translation update | Jonathan Hernández | 2014-07-04 |
| |/ | |||
* | | Merge pull request #785 from dokuwiki-translate/lang_update_74 | Andreas Gohr | 2014-07-04 |
|\ \ | | | | | | | Translation update (es) | ||
| * | | translation update | Jonathan Hernández | 2014-07-04 |
| |/ | |||
* | | Merge pull request #784 from dokuwiki-translate/lang_update_73 | Andreas Gohr | 2014-07-04 |
|\ \ | |/ |/| | Translation update (es) | ||
| * | translation update | Jonathan Hernández | 2014-07-04 |
|/ | |||
* | Merge pull request #776 from dokuwiki-translate/lang_update_65 | Andreas Gohr | 2014-07-01 |
|\ | | | | | Translation update (sv) | ||
| * | translation update | Mikael Bergström | 2014-07-01 |
|/ | |||
* | Merge pull request #775 from dokuwiki-translate/lang_update_63 | Andreas Gohr | 2014-06-30 |
|\ | | | | | Translation update (pt-br) | ||
| * | translation update | Ednei | 2014-06-30 |
|/ | |||
* | icreased message version | Andreas Gohr | 2014-06-25 |
| | |||
* | Merge pull request #766 from splitbrain/media_acl_fix | Andreas Gohr | 2014-06-25 |
|\ | | | | | Quick fix for #765 - ACL checks in the media manager ajax calls | ||
| * | Quick fix for #765 - ACL checks in the media manager ajax calls | Michael Hamann | 2014-06-25 |
|/ | | | | This should be superseded by a proper rewrite of the media manager code | ||
* | fixed template color replacement preview | Andreas Gohr | 2014-06-22 |
| | |||
* | allow config presets with installer | Andreas Gohr | 2014-06-22 |
| | | | | | | | | | | | | | this adds the ability to place a install.conf file next to the install.php which contains additional config options to be written to conf/local.php on completion of the installer. The install.conf is automatically deleted then. This is useful for automated DokuWiki installers or downloaders that take care of downloading DokuWiki and then drop the user in the default install dialog for initial setup. These tools may set up host specific things options like rewrites, image magic path or file permission settings in this preset. | ||
* | fix IE upload when Array prototype has been modified | Andreas Gohr | 2014-06-19 |
| | | | | | | The edittable plugin broke uploading in IE8 (and maybe others) because the Handsontable script adds a function to the Array prototype and the uploading script did not properly check that. | ||
* | Replace two non-free icons by free alternatives | Tanguy Ortolo | 2014-06-15 |
| | |||
* | Merge pull request #756 from dokuwiki-translate/lang_update_36 | Andreas Gohr | 2014-06-15 |
|\ | | | | | Translation update (lv) | ||
| * | translation update | Aivars Miška | 2014-06-10 |
| | | |||
* | | Merge pull request #757 from dokuwiki-translate/lang_update_39 | Andreas Gohr | 2014-06-15 |
|\ \ | | | | | | | Translation update (fr) | ||
| * | | translation update | YoBoY | 2014-06-10 |
| |/ | |||
* | | Merge pull request #758 from dokuwiki-translate/lang_update_46 | Andreas Gohr | 2014-06-15 |
|\ \ | | | | | | | Translation update (hu) | ||
| * | | translation update | Mátyás Jani | 2014-06-12 |
| |/ | |||
* | | Merge pull request #719 from splitbrain/trailingcolons | Andreas Gohr | 2014-06-15 |
|\ \ | |/ |/| | Move trailing colons to the language strings | ||
| * | Merge remote-tracking branch 'origin/master' into trailingcolons | Gerrit Uitslag | 2014-06-05 |
| |\ | |/ |/| | |||
* | | Merge pull request #750 from dokuwiki-translate/lang_update_27 | Gerrit Uitslag | 2014-06-05 |
|\ \ | | | | | | | Translation update (tr) | ||
| * | | translation update | İlker R. Kapaç | 2014-05-31 |
| | | | |||
| | * | Merge remote-tracking branch 'origin/master' into trailingcolons | Gerrit Uitslag | 2014-06-03 |
| | |\ | |_|/ |/| | | | | | | | | | | | Conflicts: inc/lang/lv/lang.php inc/lang/pt/lang.php | ||
* | | | Merge pull request #751 from dokuwiki-translate/lang_update_31 | Anika Henke | 2014-06-01 |
|\ \ \ | | | | | | | | | Translation update (ko) | ||
| * | | | translation update | Myeongjin | 2014-06-01 |
| |/ / | |||
* | | | Merge pull request #749 from dokuwiki-translate/lang_update_26 | Anika Henke | 2014-06-01 |
|\ \ \ | | | | | | | | | Translation update (pt) | ||
| * | | | translation update | Paulo Silva | 2014-05-30 |
| |/ / | |||
* | | | Merge pull request #748 from dokuwiki-translate/lang_update_25 | Anika Henke | 2014-06-01 |
|\ \ \ | |/ / |/| | | Translation update (lv) | ||
| * | | translation update | Aivars Miška | 2014-05-30 |
|/ / | |||
* | | Merge pull request #747 from dokuwiki-translate/lang_update_24 | Andreas Gohr | 2014-05-29 |
|\ \ | | | | | | | Translation update (pt) | ||
| * | | translation update | Murilo | 2014-05-29 |
|/ / | |||
* | | Merge pull request #746 from dokuwiki-translate/lang_update_23 | Andreas Gohr | 2014-05-29 |
|\ \ | | | | | | | Translation update (es) | ||
| * | | translation update | Antonio Castilla | 2014-05-29 |
|/ / | |||
* | | Merge pull request #744 from dokuwiki-translate/lang_update_20 | Andreas Gohr | 2014-05-29 |
|\ \ | | | | | | | Translation update (es) | ||
| * | | translation update | Antonio Castilla | 2014-05-29 |
|/ / | |||
| * | Merge remote-tracking branch 'origin/master' into trailingcolons | Gerrit Uitslag | 2014-05-26 |
| |\ | |/ |/| | | | | | | | Conflicts: inc/lang/cs/lang.php inc/lang/hu/lang.php | ||
* | | made $capture public in metadata renderer | Andreas Gohr | 2014-05-26 |
| | | | | | | | | some plugins (eg. the tag plugin) rely on it | ||
* | | Merge pull request #739 from dokuwiki-translate/lang_update_3 | Andreas Gohr | 2014-05-26 |
|\ \ | | | | | | | Translation update (fr) | ||
| * | | translation update | Schplurtz le Déboulonné | 2014-05-26 |
| | | |