gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-06-06 14:49:20 +02:00
commit a484a7310a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog
- bug #3961 Avoid Suhosin warning when in simulation mode
- bug #3897 Row Statistics and Space usage bugs
- bug #3966 Only display "table has no unique column" message when applicable
- bug #3960 NavigationBarIconic config not honored
4.0.3.0 (2013-06-05)
- bug #3941 Recent tables list always empty

10
doc/config.rst
View File

@ -1522,9 +1522,9 @@ Browse mode
:type: string
:default: true
Defines whether navigation bar buttons and the right panel top menu
contain text or symbols only. A value of true displays icons, false
displays text and 'both' displays both icons and text.
Defines whether navigation bar buttons contain text or symbols only. A
value of true displays icons, false displays text and 'both' displays
both icons and text.
.. config:option:: $cfg['ShowAll']
@ -1715,8 +1715,8 @@ Tabs display settings
If set to ``true``, will display icons instead of text for db and table
properties links (like :guilabel:`Browse`, :guilabel:`Select`,
:guilabel:`Insert`, ...). Can be set to ``'both'`` if you want icons AND
text. When set to ``false``, will only show text.
:guilabel:`Insert`, ...) and for the menu tabs. Can be set to ``'both'``
if you want icons AND text. When set to ``false``, will only show text.
.. config:option:: $cfg['PropertiesNumColumns']