summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #617 from Werkov/masterChristopher Smith2014-03-16
|\ | | | | Fixed cache dependency for template's style.ini
| * Fixed cache dependency for template's style.iniMichal Koutný2014-03-16
|/ | | | Web path was used instead of filesystem one.
* Merge pull request #574 from splitbrain/FS#2124deniedtextAndreas Gohr2014-03-14
|\ | | | | Improve denied access text FS#2124
| * remove placeholder van denied.txtGerrit Uitslag2014-03-07
| |
| * removed 'not logged in' text, loginform is shown alreadyGerrit Uitslag2014-03-06
| |
| * Revert "added stripped bit to language file"Gerrit Uitslag2014-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#2124deniedtextGerrit Uitslag2014-03-04
| |\ | | | | | | | | | | | | | | | Conflicts: inc/lang/bn/lang.php inc/lang/fr/denied.txt
| * \ Merge branch 'FS#2124deniedtext' of github.com:splitbrain/dokuwiki into ↵Gerrit Uitslag2014-03-04
| |\ \ | | | | | | | | | | | | FS#2124deniedtext
| | * | added stripped bit to language fileAndreas Gohr2014-02-28
| | | | | | | | | | | | | | | | this has been done by a script and might not be 100% accurate
| * | | added login form at denied access pageGerrit Uitslag2014-03-04
| |/ / | | | | | | | | | - restore lang string as well
| * | Update localizationsGerrit Uitslag2014-02-25
| | |
| * | added new html_denied() method as wellGerrit Uitslag2014-02-25
| | |
| * | Show 'not logged in' only when logged out FS#2124Gerrit Uitslag2014-02-25
| | |
* | | Merge branch 'lang_update_119' of ↵Andreas Gohr2014-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 updateJanar Leas2014-03-12
| | | |
* | | | Merge pull request #554 from splitbrain/fileiconsAndreas Gohr2014-03-14
|\ \ \ \ | | | | | | | | | | Switched file icons against generated ones, added 32x32 versions
| * | | | adjusted the office type color againAndreas Gohr2014-03-07
| | | | |
| * | | | updated file icons once moreAndreas Gohr2014-03-06
| | | | | | | | | | | | | | | | | | | | adjusted some colors, added a few common extensions for codeblocks
| * | | | fixed index fileAndreas Gohr2014-03-06
| | | | |
| * | | | moved 16x16 icons to their original locationsAndreas Gohr2014-03-06
| | | | | | | | | | | | | | | | | | | | for backwards compatibility
| * | | | removed script, added README insteadAndreas Gohr2014-02-28
| | | | |
| * | | | file icon updatesAndreas Gohr2014-02-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now we no longer limit generation to the extensions in mime types, because file icons are used in downloadable code blocks, too. All icons were regenerated with the latest update of the generator.
| * | | | Switched file icons against generated ones, added 32x32 versionsAndreas Gohr2014-02-16
| | | | |
* | | | | Merge pull request #615 from splitbrain/event_warningAndreas Gohr2014-03-14
|\ \ \ \ \ | | | | | | | | | | | | Events: Trigger a warning if the default action is not callable
| * \ \ \ \ Merge branch 'master' into event_warningMichael Hamann2014-03-14
| |\ \ \ \ \
| * | | | | | Events: Trigger a warning if the default action is not callableMichael Hamann2014-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 branch 'lang_update_123' of ↵Andreas Gohr2014-03-14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/dokuwiki-translate/dokuwiki into pull-request-611 * 'lang_update_123' of git://github.com/dokuwiki-translate/dokuwiki: translation update Conflicts: lib/plugins/acl/lang/et/lang.php
| * | | | | | | translation updateJanar Leas2014-03-13
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #610 from dokuwiki-translate/lang_update_122Andreas Gohr2014-03-14
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Translation update (et)
| * | | | | | translation updateJanar Leas2014-03-13
| |/ / / / /
* | / / / / Add a basic test case for the cacheMichael Hamann2014-03-14
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This very basic test ensures that the useCache method works as expected for simple scenarios. This test case fails without commit a8795974051a91137b01ff88dbf5586a647b24ce and then also triggers the warning that was introduced in bc2ddb548f71b1a822dd03c3bc7c3c0e7cd9b152
* | | | | Fix caching (make the event callback public again)Michael Hamann2014-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
* | | | Merge pull request #604 from dokuwiki-translate/lang_update_111Andreas Gohr2014-03-11
|\ \ \ \ | | | | | | | | | | Translation update (ru)
| * | | | translation updateAleksandr Selivanov2014-03-11
|/ / / /
* | | | 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
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 00:02:30 +0000