summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/master' into userlinkGerrit Uitslag2014-03-10
|\ | | | | | | | | | | Conflicts: inc/parser/renderer.php inc/template.php
| * Merge pull request #602 from dokuwiki-translate/lang_update_104Andreas Gohr2014-03-09
| |\ | | | | | | Translation update (ru)
| | * translation updateAleksandr Selivanov2014-03-09
| |/
| * Merge branch 'lang_update_102' of ↵Andreas Gohr2014-03-09
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/dokuwiki-translate/dokuwiki into pull-request-599 * 'lang_update_102' of git://github.com/dokuwiki-translate/dokuwiki: translation update Conflicts: inc/lang/et/lang.php
| | * translation updateJanar Leas2014-03-08
| | |
| * | Merge pull request #600 from dokuwiki-translate/lang_update_103Andreas Gohr2014-03-09
| |\ \ | | |/ | |/| Translation update (et)
| | * translation updateJanar Leas2014-03-09
| |/
| * avoid HTTP image screenshot urls. closes #595Andreas Gohr2014-03-08
| |
| * Merge pull request #588 from splitbrain/purge_E_ALLAndreas Gohr2014-03-08
| |\ | | | | | | Purge error log messages to support use of E_ALL
| | * another instance of empty() where an array key might not existChristopher Smith2014-03-06
| | |
| | * use \!empty() rather than error suppressionChristopher Smith2014-03-06
| | |
| | * resolve notices generated in calls to updateTuple() when $metaidx[$id] ↵Christopher Smith2014-03-06
| | | | | | | | | | | | doesn't exist
| | * remove reference to reference from commentsChristopher Smith2014-03-06
| | |
| | * Fix unittests broken by previous two commitsChristopher Smith2014-03-06
| | | | | | | | | | | | | | | | | | | | | | | | Mostly this is for unit tests which use of \$_SERVER['REMOTE_USER'] It ensures the reference/alias connection between \$INPUT->server and \$_SERVER is renewed before each test. Tests using TestRequest class will replace this \$INPUT with their own.
| | * amend $_SERVER to $INPUT->serverChristopher Smith2014-03-06
| | |
| | * extend to cover (PR#589)Christopher Smith2014-03-06
| | |
| | * remove '&' from object parameters, PHP5 style not E_ALLChristopher Smith2014-03-05
| | |
| | * add some braces (just style, not E_ALL)Christopher Smith2014-03-05
| | |
| | * improvements in acl plugin to avoid missing var errorsChristopher Smith2014-03-05
| | |
| | * set empty 'do' key to avoid errors in other tpl functionsChristopher Smith2014-03-05
| | |
| | * refactor to take into account missing valueChristopher Smith2014-03-05
| | |
| | * use isset() + ?: or error suppression where value may not be setChristopher Smith2014-03-05
| | |
| | * suppress errors where list() may not fill all varsChristopher Smith2014-03-05
| | |
| | * use empty() where array values might not be setChristopher Smith2014-03-05
| | |
| | * fix return by reference not a varChristopher Smith2014-03-05
| | |
| * | Merge pull request #590 from dokuwiki-translate/lang_update_91Andreas Gohr2014-03-08
| |\ \ | | | | | | | | Translation update (de)
| | * | translation updateJoerg2014-03-06
| | |/
| * | Merge pull request #596 from dokuwiki-translate/lang_update_99Andreas Gohr2014-03-08
| |\ \ | | | | | | | | Translation update (ru)
| | * | translation updateAleksandr Selivanov2014-03-08
| | | |
| * | | Extension manager: Fix cache extension to be .repoMichael Hamann2014-03-08
| |/ / | | | | | | | | | The dot was missing i.e. the cache files had no real extension at all.
| * | Merge pull request #593 from dokuwiki-translate/lang_update_95Andreas Gohr2014-03-06
| |\ \ | | | | | | | | Translation update (et)
| | * | translation updateJanar Leas2014-03-06
| |/ /
| * | Merge pull request #591 from dokuwiki-translate/lang_update_93Andreas Gohr2014-03-06
| |\ \ | | |/ | |/| Translation update (es)
| | * translation updateJuan De La Cruz2014-03-06
| |/
| * fix misspelled variable name,Christopher Smith2014-03-05
| |
| * Merge pull request #541 from splitbrain/multidomainadAndreas Gohr2014-03-05
| |\ | | | | | | Show a domain dropdown when multiple AD domains are configured
| | * added missing language stringsAndreas Gohr2014-02-28
| | |
| | * Show a domain dropdown when multiple AD domains are configuredAndreas Gohr2014-02-14
| | | | | | | | | | | | | | | | | | | | | | | | This integrates the functionality of the now outdated addomain plugin directly into the authad plugin and makes multi-domain setups usable without SSO. See also https://github.com/cosmocode/dokuwiki-plugin-addomain
| * | Merge pull request #585 from dokuwiki-translate/lang_update_90Andreas Gohr2014-03-05
| |\ \ | | | | | | | | Translation update (zh)
| | * | translation updatexiqingongzi2014-03-05
| |/ /
| * | Merge pull request #578 from splitbrain/sessionpropsChristopher Smith2014-03-05
| |\ \ | | | | | | | | define overridable constants for session properties FS#1913
| | * | removed pre PHP 5.2 code wrt setcookie and session settingGerrit Uitslag2014-03-04
| | | | | | | | | | | | | | | | - moved cookiedir determination in the if-statement
| | * | define overridable constants for session properties FS#1913Gerrit Uitslag2014-02-28
| | | |
| * | | Merge pull request #584 from dokuwiki-translate/lang_update_89Andreas Gohr2014-03-05
| |\ \ \ | | | | | | | | | | Translation update (zh)
| | * | | translation updateCupen2014-03-05
| |/ / /
| * | | Merge pull request #581 from splitbrain/FS#2388_mergedChristopher Smith2014-03-02
| |\ \ \ | | | | | | | | | | FS#2388_merged
| | * \ \ Merge branch 'master' into FS#2388Christopher Smith2014-03-02
| | |\ \ \ | | |/ / / | |/| | |
| * | | | resolve scrutinizer issue, is_a type hint doesn't allow nullChristopher Smith2014-03-02
| | | | |
| * | | | correct mis-spelled var name and correct empty password fields testChristopher Smith2014-03-02
| | | | |
| * | | | Merge pull request #546 from splitbrain/phrase_matchChristopher Smith2014-03-02
| |\ \ \ \ | | | | | | | | | | | | Add FULLTEXT_PHRASE_MATCH event for allowing plugins to match phrases FS#2936