Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 24f1cb2265189210bffbc8b761718760f4703f5f
https://github.com/phpmyadmin/phpmyadmin/commit/24f1cb2265189210bffbc8b7617…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M ChangeLog
M libraries/navigation/NavigationTree.class.php
Log Message:
-----------
rfe #1634 Don't group tables in tree if the result has only one group
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 9baeeec06160b994a4a0eeac3c1380eda0610abf
https://github.com/phpmyadmin/phpmyadmin/commit/9baeeec06160b994a4a0eeac3c1…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-06-05 (Fri, 05 Jun 2015)
Changed paths:
M ChangeLog
M po/nb.po
M templates/columns_definitions/column_definitions_form.phtml
M templates/tbl_relation/internal_relational_row.phtml
M test/libraries/PMA_tbl_relation_test.php
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/aa64b6e83077...9baeeec06160
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: d20342605303c636ae74f3ab2eb0ad150ca90f94
https://github.com/phpmyadmin/phpmyadmin/commit/d20342605303c636ae74f3ab2eb…
Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com>
Date: 2015-06-04 (Thu, 04 Jun 2015)
Changed paths:
M test/libraries/PMA_tbl_relation_test.php
Log Message:
-----------
Comment out an assert, to be fixed after some time
Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com>