Merge commit '1c481a5'
Merge branch 'QA_4_1'
BugFix #4305

Signed-off-by: Umair Khan <omerjerk@gmail.com>
Display session expiry msg after auto-redirect.

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
Merge pull request #989 from dhananjay92/minor_improvements

Display session expiry msg after auto-redirect.
Merge pull request #981 from mebjas/QA_4_1

Testcases for PMA_ConfigTest modified
Merge remote-tracking branch 'origin/QA_4_1'
Test encoded binary output

Otherwise PHP sometimes refuses to match binary content using PCRE.

Signed-off-by: Michal Čihař <michal@cihar.com>
Fix regexp to match

Signed-off-by: Michal Čihař <michal@cihar.com>
Merge remote-tracking branch 'origin/QA_4_1'
Merge pull request #986 from omerjerk/QA_4_1

BugFix #4305
Show default value for number of fields

We fall back to this value when it's not filled in, so it's better to
show it in the form as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
Expand More menu here as well

It can happend that Operations tab is hidden in the menu.

Signed-off-by: Michal Čihař <michal@cihar.com>
bug fix #4040:Since we are not reseting theme on reset settings, so removed the block that were unsetting theme in seesion

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
Fix coding style

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge pull request #992 from smita786/QA_4_1

bug fix #4040
ChangeLog entry

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit '3e5fb52'
Merge commit '908df2a'
Merge commit 'cc7f1bf'