Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 80087a021544bb0b1cf4fe6c35ca6edbe2d55189 https://github.com/phpmyadmin/phpmyadmin/commit/80087a021544bb0b1cf4fe6c35ca... Author: Marc Delisle <marc@infomarc.info> Date: 2016-11-21 (Mon, 21 Nov 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 99.5% (3207 of 3222 strings) [CI skip] Commit: 1a27a8eeff3501964a77d248ed02e4d90ad64f50 https://github.com/phpmyadmin/phpmyadmin/commit/1a27a8eeff3501964a77d248ed02... Author: Marc Delisle <marc@infomarc.info> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 99.6% (3210 of 3222 strings) [CI skip] Commit: 637d55bb4459ffceae9a5d0be36ab022ac583e10 https://github.com/phpmyadmin/phpmyadmin/commit/637d55bb4459ffceae9a5d0be36a... Author: Carlos Ferreira <c.ferreira@acsiiweb.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 100.0% (3222 of 3222 strings) [CI skip] Commit: 5daee71272efd87a24fe58f90303e82a5b6caf6d https://github.com/phpmyadmin/phpmyadmin/commit/5daee71272efd87a24fe58f90303... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php Log Message: ----------- 4.6.5 release and ChangeLog Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: 253894e2995ae4175f4429bf5cdaedfb6a722988 https://github.com/phpmyadmin/phpmyadmin/commit/253894e2995ae4175f4429bf5cda... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M ChangeLog M README M doc/conf.py M import.php M index.php M js/config.js M js/microhistory.js M libraries/Config.php M libraries/DbQbe.php M libraries/Error.php M libraries/ErrorHandler.php M libraries/Message.php M libraries/SavedSearches.php M libraries/Tracker.php M libraries/VersionInformation.php M libraries/core.lib.php M libraries/export.lib.php M libraries/ip_allow_deny.lib.php M libraries/plugins/AuthenticationPlugin.php M libraries/plugins/auth/AuthenticationConfig.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php M libraries/tbl_partition_definition.inc.php M libraries/tracking.lib.php M prefs_manage.php M test/classes/ErrorTest.php M test/classes/MessageTest.php M test/libraries/core/PMA_isAllowedDomain_test.php M test/libraries/core/PMA_safeUnserialize_test.php M test/libraries/core/PMA_sanitizeMySQLHost_test.php Log Message: ----------- Resolve merge conflicts with ChangeLog Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: b1136b88b16ec398ab4422bb3c3d55c17f6afc45 https://github.com/phpmyadmin/phpmyadmin/commit/b1136b88b16ec398ab4422bb3c3d... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php Log Message: ----------- Prepare for 4.6.6-dev Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: 2c4ffca9e2c2ed1abe4ed41d6af2f3c33b808dff https://github.com/phpmyadmin/phpmyadmin/commit/2c4ffca9e2c2ed1abe4ed41d6af2... Author: ratajs <simonrataj@seznam.cz> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M po/cs.po Log Message: ----------- Translated using Weblate (Czech) Currently translated at 93.2% (3006 of 3222 strings) [CI skip] Commit: 6497f5ab77e09505942317f1c152ab1a9976f669 https://github.com/phpmyadmin/phpmyadmin/commit/6497f5ab77e09505942317f1c152... Author: Weblate <noreply@weblate.org> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M ChangeLog M README M doc/conf.py M import.php M index.php M js/config.js M js/microhistory.js M libraries/Config.php M libraries/DbQbe.php M libraries/Error.php M libraries/ErrorHandler.php M libraries/Message.php M libraries/SavedSearches.php M libraries/Tracker.php M libraries/VersionInformation.php M libraries/core.lib.php M libraries/export.lib.php M libraries/ip_allow_deny.lib.php M libraries/plugins/AuthenticationPlugin.php M libraries/plugins/auth/AuthenticationConfig.php M libraries/plugins/auth/AuthenticationCookie.php M libraries/plugins/auth/AuthenticationHttp.php M libraries/tbl_partition_definition.inc.php M libraries/tracking.lib.php M prefs_manage.php M test/classes/ErrorTest.php M test/classes/MessageTest.php M test/libraries/core/PMA_isAllowedDomain_test.php M test/libraries/core/PMA_safeUnserialize_test.php M test/libraries/core/PMA_sanitizeMySQLHost_test.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: deeb3e62dfb3a2a03928164a3fc0fd2f283b3ff5 https://github.com/phpmyadmin/phpmyadmin/commit/deeb3e62dfb3a2a03928164a3fc0... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M libraries/navigation/nodes/Node.php M libraries/navigation/nodes/NodeDatabase.php Log Message: ----------- Avoid use of improper parameters in escapeString Fix #12735 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: a600ff34ff31376da3d59d577c34a9e0705e94d1 https://github.com/phpmyadmin/phpmyadmin/commit/a600ff34ff31376da3d59d577c34... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M libraries/relation.lib.php Log Message: ----------- Fix some more instances of wrong arguments Issue #12735 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: b9ee59500fc746b99d4ec1e4c038cddb8ccf5cfb https://github.com/phpmyadmin/phpmyadmin/commit/b9ee59500fc746b99d4ec1e4c038... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12735 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: 84c977b2a43a47bda60fd3611c90506fbe0d886d https://github.com/phpmyadmin/phpmyadmin/commit/84c977b2a43a47bda60fd3611c90... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M ChangeLog M libraries/navigation/nodes/Node.php M libraries/navigation/nodes/NodeDatabase.php M libraries/relation.lib.php Log Message: ----------- Merge branch 'QA_4_6' Conflicts: ChangeLog README doc/conf.py libraries/Config.php po/cs.po po/fr.po Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fb161a7bebe6...84c977b2a43a