summaryrefslogtreecommitdiff
path: root/inc
Commit message (Collapse)AuthorAge
* Merge branch 'master' into ioreplaceinfileChristopher Smith2015-05-28
|\
| * update confToHash() inline documentation for new parameterChristopher Smith2015-05-28
| |
| * translation updateIkuo Obataya2015-05-28
| |
| * Merge pull request #1166 from dokuwiki-translate/lang_update_2Michael Hamann2015-05-22
| |\ | | | | | | Translation update (lt)
| | * translation updateTomas Darius Davainis2015-05-22
| | |
| * | avoid accessing nonexistant array key. fixes #1165Andreas Gohr2015-05-22
| |/
| * Merge pull request #1156 from splitbrain/refactor_admin_plugin_getAndreas Gohr2015-05-20
| |\ | | | | | | Provide a function to return admin plugin for the page request.
| | * Provide a function to return admin plugin for the page request.Christopher Smith2015-05-16
| | | | | | | | | | | | | | | | | | | | | This was previously carried out in three separate places. Refactor that code to use the new function. Update tpl_pageTitle test to use a manager level admin plugin.
| * | Merge pull request #1158 from splitbrain/local_conf_negationAndreas Gohr2015-05-19
| |\ \ | | | | | | | | Local configuration negation
| | * | Define the negation character in a constantChristopher Smith2015-05-18
| | | |
| | * | Ensure single value negation is not affected by white spaceChristopher Smith2015-05-18
| | | | | | | | | | | | | | | | differences
| | * | Ensure filtering only removes empty string valuesChristopher Smith2015-05-18
| | | | | | | | | | | | | | | | (not other values which PHP evaluates to false)
| | * | Support negating of config values include earlier in the cascadeChristopher Smith2015-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To negate a config value, prefix the value with an '!'. E.g. to disable recognition of the gopher scheme !gopher This applies to: - scheme - stopwords
| | * | Add filtering to remove blank entries from key/value config retrievalChristopher Smith2015-05-17
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | This applies to: - acronyms - entities - interwiki - mime - smileys
| * / translation updateNoel Tilliot2015-05-18
| |/
| * fix missing language code parameter for admin plugin titlesChristopher Smith2015-05-16
| | | | | | | | add unit test coverage
| * 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
| | | |
* | | | Refactor code to make it simpler.Christopher Smith2015-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes should also: - fix unlikely edge case when replacement line is the same as the old line (would have resulted in timeout) - reduce memory footprint - avoid applying string search beyond maxlines replacement limit
* | | | Limit number of lines to replace.Patrick Brown2015-05-08
| | | |
* | | | Merge branch 'master' into ioreplaceinfilePatrick Brown2015-05-07
|\| | |
| * | | Merge pull request #1138 from dokuwiki-translate/lang_update_16Andreas Gohr2015-05-07
| |\ \ \ | | | | | | | | | | Translation update (no)