Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into diff_navigation | Andreas Gohr | 2014-03-14 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (103 commits) Add a basic test case for the cache Events: Trigger a warning if the default action is not callable Fix caching (make the event callback public again) translation update translation update translation update translation update translation update translation update translation update avoid HTTP image screenshot urls. closes #595 translation update Extension manager: Fix cache extension to be .repo adjusted the office type color again another instance of empty() where an array key might not exist remove placeholder van denied.txt updated file icons once more removed 'not logged in' text, loginform is shown already Revert "added stripped bit to language file" fixed index file ... Conflicts: inc/html.php | ||
| * | Merge pull request #574 from splitbrain/FS#2124deniedtext | Andreas Gohr | 2014-03-14 |
| |\ | | | | | | | Improve denied access text FS#2124 | ||
| | * | remove placeholder van denied.txt | Gerrit Uitslag | 2014-03-07 |
| | | | |||
| | * | removed 'not logged in' text, loginform is shown already | Gerrit Uitslag | 2014-03-06 |
| | | | |||
| | * | Revert "added stripped bit to language file" | Gerrit Uitslag | 2014-03-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 524df5769a0b9b7aa35af6500c85528c2b0515fe. Conflicts: inc/lang/bn/lang.php inc/lang/fr/lang.php | ||
| | * | Merge remote-tracking branch 'origin/master' into FS#2124deniedtext | Gerrit Uitslag | 2014-03-04 |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/lang/bn/lang.php inc/lang/fr/denied.txt | ||
| | * \ | Merge branch 'FS#2124deniedtext' of github.com:splitbrain/dokuwiki into ↵ | Gerrit Uitslag | 2014-03-04 |
| | |\ \ | | | | | | | | | | | | | | | | FS#2124deniedtext | ||
| | | * | | added stripped bit to language file | Andreas Gohr | 2014-02-28 |
| | | | | | | | | | | | | | | | | | | | | this has been done by a script and might not be 100% accurate | ||
| | * | | | added login form at denied access page | Gerrit Uitslag | 2014-03-04 |
| | |/ / | | | | | | | | | | | | | - restore lang string as well | ||
| | * | | Update localizations | Gerrit Uitslag | 2014-02-25 |
| | | | | |||
| | * | | added new html_denied() method as well | Gerrit Uitslag | 2014-02-25 |
| | | | | |||
| | * | | Show 'not logged in' only when logged out FS#2124 | Gerrit Uitslag | 2014-02-25 |
| | | | | |||
| * | | | Merge branch 'lang_update_119' of ↵ | Andreas Gohr | 2014-03-14 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/dokuwiki-translate/dokuwiki into pull-request-605 * 'lang_update_119' of git://github.com/dokuwiki-translate/dokuwiki: translation update Conflicts: lib/plugins/acl/lang/et/lang.php | ||
| | * | | | translation update | Janar Leas | 2014-03-12 |
| | | | | | |||
| * | | | | Merge pull request #554 from splitbrain/fileicons | Andreas Gohr | 2014-03-14 |
| |\ \ \ \ | | | | | | | | | | | | | Switched file icons against generated ones, added 32x32 versions | ||
| | * | | | | Switched file icons against generated ones, added 32x32 versions | Andreas Gohr | 2014-02-16 |
| | | | | | | |||
| * | | | | | Merge pull request #615 from splitbrain/event_warning | Andreas Gohr | 2014-03-14 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Events: Trigger a warning if the default action is not callable | ||
| | * | | | | | Events: Trigger a warning if the default action is not callable | Michael Hamann | 2014-03-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a warning in the case that the default action is not null but also not callable which can happen when the supplied method is not public. | ||
| * | | | | | | Merge pull request #610 from dokuwiki-translate/lang_update_122 | Andreas Gohr | 2014-03-14 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Translation update (et) | ||
| | * | | | | | translation update | Janar Leas | 2014-03-13 |
| | | |/ / / | | |/| | | | |||
| * / | | | | Fix caching (make the event callback public again) | Michael Hamann | 2014-03-14 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caching had been completely broken (disabled) for caches with events because the default event handler (cache::_useCache()) was protected and thus couldn't be executed by the event handler. This was broken in c59b3e001d1e8258b1d118909257b70516c8a6b1 | ||
| * | | | | translation update | Aleksandr Selivanov | 2014-03-11 |
| | | | | | |||
| * | | | | Merge branch 'lang_update_102' of ↵ | Andreas Gohr | 2014-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 update | Janar Leas | 2014-03-08 |
| | | | | | | |||
| * | | | | | translation update | Janar Leas | 2014-03-09 |
| |/ / / / | |||
| * | | | | Merge pull request #588 from splitbrain/purge_E_ALL | Andreas Gohr | 2014-03-08 |
| |\ \ \ \ | | | | | | | | | | | | | Purge error log messages to support use of E_ALL | ||
| | * | | | | another instance of empty() where an array key might not exist | Christopher Smith | 2014-03-06 |
| | | | | | | |||
| | * | | | | use \!empty() rather than error suppression | Christopher Smith | 2014-03-06 |
| | | | | | | |||
| | * | | | | resolve notices generated in calls to updateTuple() when $metaidx[$id] ↵ | Christopher Smith | 2014-03-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | doesn't exist | ||
| | * | | | | amend $_SERVER to $INPUT->server | Christopher Smith | 2014-03-06 |
| | | | | | | |||
| | * | | | | extend to cover (PR#589) | Christopher Smith | 2014-03-06 |
| | | | | | | |||
| | * | | | | add some braces (just style, not E_ALL) | Christopher Smith | 2014-03-05 |
| | | | | | | |||
| | * | | | | set empty 'do' key to avoid errors in other tpl functions | Christopher Smith | 2014-03-05 |
| | | | | | | |||
| | * | | | | refactor to take into account missing value | Christopher Smith | 2014-03-05 |
| | | | | | | |||
| | * | | | | use isset() + ?: or error suppression where value may not be set | Christopher Smith | 2014-03-05 |
| | | | | | | |||
| | * | | | | suppress errors where list() may not fill all vars | Christopher Smith | 2014-03-05 |
| | | | | | | |||
| | * | | | | use empty() where array values might not be set | Christopher Smith | 2014-03-05 |
| | | | | | | |||
| | * | | | | fix return by reference not a var | Christopher Smith | 2014-03-05 |
| | | | | | | |||
| * | | | | | Merge pull request #590 from dokuwiki-translate/lang_update_91 | Andreas Gohr | 2014-03-08 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Translation update (de) | ||
| | * | | | | | translation update | Joerg | 2014-03-06 |
| | |/ / / / | |||
| * | | | | | translation update | Aleksandr Selivanov | 2014-03-08 |
| | | | | | | |||
| * | | | | | translation update | Janar Leas | 2014-03-06 |
| | | | | | | |||
| * | | | | | translation update | Juan De La Cruz | 2014-03-06 |
| |/ / / / | |||
| * | | | | translation update | xiqingongzi | 2014-03-05 |
| | | | | | |||
| * | | | | Merge pull request #578 from splitbrain/sessionprops | Christopher Smith | 2014-03-05 |
| |\ \ \ \ | | | | | | | | | | | | | define overridable constants for session properties FS#1913 | ||
| | * | | | | removed pre PHP 5.2 code wrt setcookie and session setting | Gerrit Uitslag | 2014-03-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | - moved cookiedir determination in the if-statement | ||
| | * | | | | define overridable constants for session properties FS#1913 | Gerrit Uitslag | 2014-02-28 |
| | | |/ / | | |/| | | |||
| * | | | | translation update | Cupen | 2014-03-05 |
| | |_|/ | |/| | | |||
| * | | | Merge branch 'master' into FS#2388 | Christopher Smith | 2014-03-02 |
| |\ \ \ | |||
| | * | | | resolve scrutinizer issue, is_a type hint doesn't allow null | Christopher Smith | 2014-03-02 |
| | | | | |