summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* refactor info functions testChristopher Smith2013-02-25
| | | | | | | | pageinfo() test no longer required, unit test committed elsewhere and verified against both previous and updated versions of pageinfo() fn. basicinfo() and mediainfo() tests separated each into their own test file.
* Merge branch 'master' into FS#2415Christopher Smith2013-02-25
|\
| * Fix current mode icons in rtl languagesMichael Hamann2013-02-25
| |
| * Fix search button in rtl languages in ChromeMichael Hamann2013-02-25
| | | | | | | | | | For some reason without position: relative the search button is hidden in rtl languages.
| * make scrolling possible in media manager on smaller screens (FS#2723)Anika Henke2013-02-24
| |
| * Fix sample handling in toolbar in tb_format FS#2691Michael Hamann2013-02-24
| | | | | | | | | | The previous fix in e38f3066cedb80722b3488e7ab3b2809b6db5363 fixed this bug only in tb_formatln.
| * fix security caution for 'remote' setting (was 'xmlrpc')Christopher Smith2013-02-24
| |
| * Merge pull request #185 from splitbrain/FS#2724Andreas Gohr2013-02-24
| |\ | | | | | | FS#2724. fix 'are you sure' when using refresh after using tpl_actiondropdown
| | * add security token back, but not for anonymous usersChristopher Smith2013-02-19
| | |
| | * remove security token from tpl_actiondropdown - its not necessary, we're not ↵Christopher Smith2013-02-18
| | | | | | | | | | | | posting any system change
| | * change tpl_actiondropdown request method to 'get'Christopher Smith2013-02-18
| | |
| * | Merge pull request #190 from splitbrain/FS2731Andreas Gohr2013-02-24
| |\ \ | | | | | | | | Fix double encoding in rss syntax FS#2731
| | * | Fix double encoding in rss syntax FS#2731Michael Hamann2013-02-23
| | | |
| * | | fixed typosAndreas Gohr2013-02-24
| | | |
| * | | Simplified Chinese language updatelainme2013-02-24
| | | |
| * | | Italian language updateLorenzo Radaelli2013-02-24
| | | |
| * | | Merge pull request #189 from splitbrain/FS#2415_TDDAndreas Gohr2013-02-22
| |\ \ \ | | |/ / | |/| | unit tests for pageinfo()
| | * | add unit test for pageinfo()Christopher Smith2013-02-21
| | | |
| * | | little change to syntax we had on the life siteAndreas Gohr2013-02-22
| |/ /
| * | Merge pull request #188 from arbrk1/patch-1Michael Hamann2013-02-20
| |\ \ | | | | | | | | Change function call from actionOk into actionOK (correct name)
| | * | Update inc/template.phparbrk12013-02-20
| | | | | | | | | | | | changed nonexistant actionOk to actionOK
| * | | Fix remaining missing $INPUT uses FS#2577Michael Hamann2013-02-20
| | | | | | | | | | | | | | | | | | | | | | | | This adds $INPUT in all places where it was still missing and available. $INPUT is now also used in places where using $_REQUEST/... was okay in order to make the code consistent.
| * | | Revert the search depth behavior changes from #154Michael Hamann2013-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts parts of the changes from #154: Before merging the pull request, a depth of 1 returned just the pages in the root namespace. With the changes in the pull request, a depth of 1 also returned pages in subnamespaces of the root namespace (as it was also tested in the test case). This reverts this part of the changes and a depth of 1 returns just the pages in the root namespace again.
| * | | Fix handling of failed authentication loadingMichael Hamann2013-02-20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | In the case of a failed authentication initialization, the authentication setup was simply continued with an unset $auth object. This restores the previous behavior (before merging #141) of simply returning after unsetting $auth. Furthermore this re-introduces the check if $auth is set before checking $auth and removes a useless check if $auth is true (could never be false).
| * / fixed auth_browseruid on IE9Dominik Eckelmann2013-02-20
| |/ | | | | | | IE9 send different HTTP_ACCEPT_LANGUAGE header on ajax request. This causes different results from auth_browseruid. This patch removes the HTTP_ACCEPT_LANGUAGE from the browser id calculation.
| * Merge pull request #184 from splitbrain/FS#2718Andreas Gohr2013-02-18
| |\ | | | | | | FS#2718, fix IE9, 10 not executing js after @media layout changes
| | * force screen_mode to string type (IE returns a number which is always ↵Christopher Smith2013-02-17
| | | | | | | | | | | | triggering the default option in the following switch/case block
| * | fixed line endingsAnika Henke2013-02-18
| | |
| * | removed a bunch of functions which were deprecated in 2005/2006Anika Henke2013-02-18
| | |
| * | removed unnecessary css partsAnika Henke2013-02-17
| | |
| * | improved disabled acl permission styling (FS#2714)Anika Henke2013-02-17
| |/
| * Merge pull request #183 from splitbrain/configmgr_and_disabled_pluginsAndreas Gohr2013-02-17
| |\ | | | | | | Config Manager & Disabled Plugins.
| | * improve comments on settings::update() methodChristopher Smith2013-02-17
| | |
| | * tidy up authtype setting class (incl. fix issue with auth change/logoff ↵Christopher Smith2013-02-17
| | | | | | | | | | | | occurring when only one auth plugin is enabled and other settings are updated)
| | * add property to show disabled plugins, set it to false (to hide by default)Christopher Smith2013-02-17
| | |
| * | Merge pull request #181 from splitbrain/authpluginconfigAndreas Gohr2013-02-17
| |\ \ | | | | | | | | Auth plugin config
| | * | litte fixesKlap-in2013-02-16
| | | |
| | * | Merge remote-tracking branch 'origin/master' into authpluginconfigKlap-in2013-02-16
| | |\|
| | * | Merge remote-tracking branch 'origin/master' into authpluginconfigKlap-in2013-02-16
| | |\ \
| | * | | separate default settings from non-existing settingsKlap-in2013-02-16
| | | | | | | | | | | | | | | | | | | | setting type read from metadata eqaul to empty string is default 'setting' class (a textarea), everything else should be a existing class otherwise 'setting_no_class' is loaded
| | * | | Complete metadata and defaults of auth plugin configsKlap-in2013-02-16
| | | | |
| * | | | Display media file size only if file exists (prevents PHP warning)Michael Hamann2013-02-17
| | | | |
| * | | | Merge pull request #179 from splitbrain/FS#2720Christopher Smith2013-02-17
| |\ \ \ \ | | |_|_|/ | |/| | | FS#2720, FS#2719
| | * | | replace remaining hardcoded 'colspan' values with ->colspanChristopher Smith2013-02-17
| | | | |
| | * | | Merge remote-tracking branch 'whoopdedo/diffmarkup' into FS#2720Christopher Smith2013-02-17
| | |\ \ \
| | | * | | Remove the prefix from inline diffs.Tom N Harris2013-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The line prefix was not actually indicating what it should indicate. In particular, anything in a "changed" block would show a "!" even if the entire line was added or deleted. Better to print nothing than something that's wrong.
| | | * | | Fix width of indicator column.Tom N Harris2013-02-16
| | | | | |
| | | * | | Monospace font for header prefix.Tom N Harris2013-02-16
| | | | | |
| | | * | | Move inline diff headers into a vertical column.Tom N Harris2013-02-16
| | | | |/ | | | |/|
| | * | | ensure diff formatters escape their outputChristopher Smith2013-02-17
| | | | |