summaryrefslogtreecommitdiff
path: root/inc
Commit message (Collapse)AuthorAge
* Merge pull request #1155 from splitbrain/deprecatedrevAndreas Gohr2015-05-16
|\ | | | | replace deprecated getRevisions call
| * replace deprecated getRevisions callGerrit Uitslag2015-05-16
| |
* | Merge pull request #1154 from splitbrain/php7compatibilityAndreas Gohr2015-05-16
|\ \ | | | | | | Php7compatibility
| * | yet another class constructorChristopher Smith2015-05-16
| | |
| * | another class_name to __constructChristopher Smith2015-05-15
| | |
| * | update parent constructor calls to use __construct()Christopher Smith2015-05-15
| | |
| * | PHP7 Compat updates on the phpseclibChristopher Smith2015-05-15
| | | | | | | | | | | | | | | This is a quick fix in advance of the library being updated to the latest & PHP7 compatible version.
| * | more object type hints and removal of '&' operator before objectsChristopher Smith2015-05-15
| | |
| * | more class constructors to __construct()Christopher Smith2015-05-15
| | |
| * | Changes for PHP 7 CompatibilityChristopher Smith2015-05-15
| |/ | | | | | | | | | | | | - replace PHP4 style class constructor function names (based on class name) with php 5 __construct() Also remove some '&' reference operators used with objects And add some object type hints
* | Merge pull request #1152 from splitbrain/composerAndreas Gohr2015-05-16
|\ \ | | | | | | Use composer to add 3rd party libs
| * | switched geshi higlighter to composer based repositoryAndreas Gohr2015-05-15
| | |
| * | added composer setup and the first composer package php-archiveAndreas Gohr2015-05-15
| | |
* | | Show a relevant page title for other actionsChristopher Smith2015-05-15
| |/ |/| | | | | | | | | | | | | | | See Issue #1149 - Show 'admin' or the admin plugin name for admin functions - Show action name for user & site actions, e.g. login, sitemape - Show page name + action for page actions, e.g. changes, backlinks - Show a utf8 pen glyph when editing - Otherwise show the page name (as previously)
* | Revert "Show a relevant page title for other actions"Christopher Smith2015-05-15
| | | | | | | | This reverts commit c2fbf98617ceed35a8d735fbc917627e001f225b.
* | Show a relevant page title for other actionsChristopher Smith2015-05-15
|/ | | | | | | | | See Issue #1149 - Show 'admin' or the admin plugin name for admin functions - Show action name for user & site actions, e.g. login, sitemape - Show page name + action for page actions, e.g. changes, backlinks - Show a utf8 pen glyph when editing - Otherwise show the page name (as previously)
* Merge pull request #1148 from dokuwiki-translate/lang_update_33Andreas Gohr2015-05-15
|\ | | | | Translation update (hr)
| * translation updateDavor Turkalj2015-05-14
| |
* | Merge pull request #1144 from dokuwiki-translate/lang_update_25Andreas Gohr2015-05-14
|\ \ | | | | | | Translation update (fr)
| * | translation updatePietroni2015-05-13
| |/
* | Merge pull request #1145 from dokuwiki-translate/lang_update_29Andreas Gohr2015-05-14
|\ \ | | | | | | Translation update (ca)
| * | translation updateEduard Díaz2015-05-14
| |/
* / translation updateMenashe Tomer2015-05-14
|/
* Merge pull request #1072 from flammy/masterAnika Henke2015-05-09
|\ | | | | Added file-in-use reference to page
| * Added file-in-use reference to pageflammy2015-03-12
| | | | | | Added english translation for file-in-use reference
| * Added file-in-use reference to pageflammy2015-03-12
| | | | | | Added german translation for file-in-use reference
| * Added file-in-use reference to pageflammy2015-03-12
| | | | | | Added german translation for file-in-use reference
* | Merge pull request #1130 from splitbrain/cache-js-per-tplAndreas Gohr2015-05-08
|\ \ | | | | | | Cache JavaScript per template
| * | urlencode t param value in css and js callsAnika Henke2015-05-08
| | |
| * | cache JavaScript per templateAnika Henke2015-05-04
| | |
* | | Merge pull request #1138 from dokuwiki-translate/lang_update_16Andreas Gohr2015-05-07
|\ \ \ | | | | | | | | Translation update (no)
| * | | translation updateDanny Buckhof2015-05-07
| | | |
* | | | Merge pull request #1129 from splitbrain/remove-from-doku-prefsAndreas Gohr2015-05-07
|\ \ \ \ | |/ / / |/| | | Make it possible to remove entries from DOKU_PREFS cookie
| * | | make it possible to remove entries from DOKU_PREFS cookieAnika Henke2015-05-03
| |/ /
* | | Merge pull request #1136 from tled/bcrypt_hashAndreas Gohr2015-05-07
|\ \ \ | | | | | | | | mysqlauth: bcrypt hash is indicated by 2a or 2y
| * | | 2y is also used for bcrytTLed2015-05-06
| | | |
* | | | Merge pull request #1134 from ptbrown/auth-error-reportingAndreas Gohr2015-05-07
|\ \ \ \ | |/ / / |/| | | Refactor error messages from auth plugins.
| * | | Fix scrutinizer issues with authPatrick Brown2015-05-07
| | | |
| * | | Report more meaningful errors when an auth backend fails. closes #1093Patrick Brown2015-05-06
| |/ /
* / / translation updateJohan Wijnker2015-05-05
|/ /
* | Revert "use nav+ul element for "you are here""Andreas Gohr2015-05-02
| | | | | | | | | | This reverts commit 3940c519db432ec22e8c587504d86191631f9bfb as discussed in #1082.
* | Merge branch 'languagecleanup' of git://github.com/ptbrown/dokuwiki into ↵Andreas Gohr2015-05-02
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | pull-request-1105 * 'languagecleanup' of git://github.com/ptbrown/dokuwiki: Remove no longer needed language string Delete unused div (Fixes #1098) Remove unused language strings Move language string to authad plugin
| * | Remove no longer needed language stringPatrick Brown2015-04-04
| | |
| * | Delete unused div (Fixes #1098)Patrick Brown2015-04-03
| | |
| * | Remove unused language stringsPatrick Brown2015-04-03
| | |
* | | translation updateHudson FAS2015-04-28
| | |
* | | Merge pull request #1119 from anini/patch-3Andreas Gohr2015-04-25
|\ \ \ | | | | | | | | Adding Arabic Stopwords
| * | | Adding Arabic StopwordsMohammad Anini2015-04-19
| | | | | | | | | | | | Adding Arabic stopwords and keeping Engish stopwords as well, since most of the Arabic wikis contain a lot of English words.
* | | | Merge pull request #1121 from dokuwiki-translate/lang_update_49Andreas Gohr2015-04-25
|\ \ \ \ | | | | | | | | | | Translation update (uk)
| * | | | translation updateMax Lyashuk2015-04-19
| |/ / /