Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1b0fde1b59a6dc7fd959971deda0c222282597e1 https://github.com/phpmyadmin/phpmyadmin/commit/1b0fde1b59a6dc7fd959971deda0... Author: Michal Čihař michal@cihar.com Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Remove duplicated code
Signed-off-by: Michal Čihař michal@cihar.com
Commit: d052c4721ee28444217707afa04b6dc91e281a5b https://github.com/phpmyadmin/phpmyadmin/commit/d052c4721ee28444217707afa04b... Author: Michal Čihař michal@cihar.com Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Merge branch 'QA_4_6'
Commit: 1277bc466690b86b280d97df99fc8c8bc4c9f5c4 https://github.com/phpmyadmin/phpmyadmin/commit/1277bc466690b86b280d97df99fc... Author: Michal Čihař michal@cihar.com Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths: M libraries/relation.lib.php
Log Message: ----------- Remove unused parameter
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 18c0786eae6f9180ffc8f4b3436341c5f6e12dbe https://github.com/phpmyadmin/phpmyadmin/commit/18c0786eae6f9180ffc8f4b34363... Author: Michal Čihař michal@cihar.com Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths: M libraries/DisplayResults.php M libraries/Message.php M libraries/RecentFavoriteTable.php M libraries/Table.php M libraries/central_columns.lib.php M libraries/normalization.lib.php M libraries/sql.lib.php M libraries/user_preferences.lib.php M test/classes/MessageTest.php
Log Message: ----------- Improve addMessage calls
- add call which accepts HTML markup - use separator where applicable - extend testcase to see HTML markup handling
Signed-off-by: Michal Čihař michal@cihar.com
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7aa93f824d64...18c0786eae6f