Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1b1d68293b7cc3c06ddd6a60c2b0c29b3d9ae859 https://github.com/phpmyadmin/phpmyadmin/commit/1b1d68293b7cc3c06ddd6a60c2b0... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Use proper check to verify if index is set in the Request
Fix #12759
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: b1e14110de7d2872569684c78c0a0e76ab14ff24 https://github.com/phpmyadmin/phpmyadmin/commit/b1e14110de7d2872569684c78c0a... Author: pralin itgo1004@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M po/ja.po
Log Message: ----------- Translated using Weblate (Japanese)
Currently translated at 70.7% (2280 of 3222 strings)
[CI skip]
Commit: 2d4c88ab1515e4f3c012a482346880c8f592fea6 https://github.com/phpmyadmin/phpmyadmin/commit/2d4c88ab1515e4f3c012a4823468... Author: Weblate noreply@weblate.org Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M ChangeLog M libraries/server_privileges.lib.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 17e4e9e5c06baa5be5feae72a8d1d844e39f5f02 https://github.com/phpmyadmin/phpmyadmin/commit/17e4e9e5c06baa5be5feae72a8d1... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog for #12759
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 6baa646c74f041f3646017333eb86e414821f034 https://github.com/phpmyadmin/phpmyadmin/commit/6baa646c74f041f3646017333eb8... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Check if the cfgrelation tables are actually set before using them
Fix #12760
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 1ee52c8e4cf65e6cc2bc31ca7d07b291da60b2b8 https://github.com/phpmyadmin/phpmyadmin/commit/1ee52c8e4cf65e6cc2bc31ca7d07... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog for #12760
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 9fdc05ce3818fbab3ef9ba185f000c8d6f57368f https://github.com/phpmyadmin/phpmyadmin/commit/9fdc05ce3818fbab3ef9ba185f00... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M po/ja.po
Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6
Commit: 6473f6910a2558149e0c0237693968e737396b86 https://github.com/phpmyadmin/phpmyadmin/commit/6473f6910a2558149e0c02376939... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)
Changed paths: M ChangeLog M libraries/server_privileges.lib.php
Log Message: ----------- Merge branch 'QA_4_6'
Conflicts: po/ja.po
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d879ecaaa862...6473f6910a25