Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9d3da1b4084928f03bab680b908c47a396b64f27 https://github.com/phpmyadmin/phpmyadmin/commit/9d3da1b4084928f03bab680b908c... Author: Pavel Rochnyack pavel2000@ngs.ru Date: 2016-08-01 (Mon, 01 Aug 2016)

Changed paths: M libraries/controllers/database/DatabaseStructureController.php

Log Message: ----------- Fix replication status output in database tables list.

Issue is second part to #12416

Signed-off-by: Pavel Rochnyack pavel2000@ngs.ru

Commit: 7b17fe8cefb0e90c0188cd6a44c53d532333df37 https://github.com/phpmyadmin/phpmyadmin/commit/7b17fe8cefb0e90c0188cd6a44c5... Author: Masahiro Nishi grooversmail@gmail.com Date: 2016-08-03 (Wed, 03 Aug 2016)

Changed paths: M po/ja.po

Log Message: ----------- Translated using Weblate (Japanese)

Currently translated at 70.3% (2259 of 3213 strings)

[CI skip]

Commit: 1816bb0d2ce571a8c353c8ba5d88958917a97bf6 https://github.com/phpmyadmin/phpmyadmin/commit/1816bb0d2ce571a8c353c8ba5d88... Author: Weblate noreply@weblate.org Date: 2016-08-03 (Wed, 03 Aug 2016)

Changed paths: M libraries/mult_submits.lib.php

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6

Commit: f6d1c901882b6d7292d3eeac8b45388b343cbabf https://github.com/phpmyadmin/phpmyadmin/commit/f6d1c901882b6d7292d3eeac8b45... Author: Michal Čihař michal@cihar.com Date: 2016-08-03 (Wed, 03 Aug 2016)

Changed paths: M libraries/controllers/database/DatabaseStructureController.php

Log Message: ----------- Merge pull request #12423 from rpv-tomsk/fix-replication-status

Fix replication status output in database tables list.

Commit: 5385099b4013512c39baf7031c38ea9f3ae137ff https://github.com/phpmyadmin/phpmyadmin/commit/5385099b4013512c39baf7031c38... Author: Michal Čihař michal@cihar.com Date: 2016-08-03 (Wed, 03 Aug 2016)

Changed paths: M ChangeLog

Log Message: ----------- Changelog for issue #12423

Fixed replication status in database listing

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 7823e39013c125afd71946d02064e034524afdeb https://github.com/phpmyadmin/phpmyadmin/commit/7823e39013c125afd71946d02064... Author: Michal Čihař michal@cihar.com Date: 2016-08-03 (Wed, 03 Aug 2016)

Log Message: ----------- Merge commit '1816bb0d2ce571a8c353c8ba5d88958917a97bf6'

Commit: 3aa380a1e17246066d0300a67c716ee9039d236c https://github.com/phpmyadmin/phpmyadmin/commit/3aa380a1e17246066d0300a67c71... Author: Michal Čihař michal@cihar.com Date: 2016-08-03 (Wed, 03 Aug 2016)

Changed paths: M ChangeLog M libraries/controllers/database/DatabaseStructureController.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0bb57c9465cc...3aa380a1e172