Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dfae4d2f081c066837896cd1be60fcb54a98eec6 https://github.com/phpmyadmin/phpmyadmin/commit/dfae4d2f081c066837896cd1be60... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-01-02 (Fri, 02 Jan 2015) Changed paths: M db_tracking.php M libraries/Menu.class.php M libraries/Table.class.php M libraries/Tracker.class.php M libraries/bookmark.lib.php M libraries/central_columns.lib.php M libraries/common.inc.php M libraries/core.lib.php M libraries/dbi/DBIDummy.class.php M libraries/relation.lib.php M libraries/server_privileges.lib.php M libraries/server_user_groups.lib.php M libraries/tracking.lib.php M test/libraries/PMA_Tracker_test.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_server_user_groups_test.php M test/libraries/PMA_tbl_tracking_test.php Log Message: ----------- Bug #4676 - Auto configuration issues Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: e75d4ec8b427bc7918db038b978080841050692f https://github.com/phpmyadmin/phpmyadmin/commit/e75d4ec8b427bc7918db038b9780... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-01-02 (Fri, 02 Jan 2015) Changed paths: M ChangeLog M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/relation.lib.php M libraries/relation_cleanup.lib.php M po/hu.po M po/sk.po M test/libraries/PMA_relation_cleanup_test.php Log Message: ----------- Merge branch 'QA_4_3' into zeroconf Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: d8bea6fcbe03d7ef5449df07936df62d126af0b9 https://github.com/phpmyadmin/phpmyadmin/commit/d8bea6fcbe03d7ef5449df07936d... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-01-02 (Fri, 02 Jan 2015) Changed paths: M test/libraries/PMA_Tracker_test.php Log Message: ----------- Fix a failing test Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 09fff10681e0f607e73ae5dd01d659a842dde49c https://github.com/phpmyadmin/phpmyadmin/commit/09fff10681e0f607e73ae5dd01d6... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-01-02 (Fri, 02 Jan 2015) Changed paths: M libraries/Tracker.class.php M test/libraries/PMA_Tracker_test.php Log Message: ----------- Fix tracking query and related test Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: eee442e4a7d98642b781a157e6cdf374ceca4bc0 https://github.com/phpmyadmin/phpmyadmin/commit/eee442e4a7d98642b781a157e6cd... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-01-02 (Fri, 02 Jan 2015) Changed paths: M libraries/Tracker.class.php M test/libraries/PMA_Tracker_test.php Log Message: ----------- Update another tracking query and its corresponding unit test Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 2947c166a16898c9003dc54da38e8e8b27b87eb4 https://github.com/phpmyadmin/phpmyadmin/commit/2947c166a16898c9003dc54da38e... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-01-02 (Fri, 02 Jan 2015) Changed paths: M libraries/relation.lib.php Log Message: ----------- Do not read SQL file until it is really required Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 9bc80b7c8430d3018c969ccddfd48571574ac7f9 https://github.com/phpmyadmin/phpmyadmin/commit/9bc80b7c8430d3018c969ccddfd4... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-01-02 (Fri, 02 Jan 2015) Changed paths: M libraries/RecentFavoriteTable.class.php Log Message: ----------- Do not save the configuration table name statically Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 31a1b7396c71eff0a4006c8eb31605e90755a0a7 https://github.com/phpmyadmin/phpmyadmin/commit/31a1b7396c71eff0a4006c8eb316... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-01-02 (Fri, 02 Jan 2015) Changed paths: M libraries/Table.class.php Log Message: ----------- Saving table UI prefs were failing due to errors in the query Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 62631f77bf7a7867dd1b1d7e8bc1825c2f8df7da https://github.com/phpmyadmin/phpmyadmin/commit/62631f77bf7a7867dd1b1d7e8bc1... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-01-02 (Fri, 02 Jan 2015) Changed paths: M libraries/RecentFavoriteTable.class.php Log Message: ----------- Simplify checking for empty Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 9beef683416a9e5abc05335584b668c498d25db3 https://github.com/phpmyadmin/phpmyadmin/commit/9beef683416a9e5abc05335584b6... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-01-04 (Sun, 04 Jan 2015) Changed paths: M prefs_forms.php Log Message: ----------- Do not unset configuration storage details here Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 9c097139efc382b78226f04eae91ac37b4aa6968 https://github.com/phpmyadmin/phpmyadmin/commit/9c097139efc382b78226f04eae91... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-01-04 (Sun, 04 Jan 2015) Changed paths: M doc/config.rst Log Message: ----------- This note does not make sense anymore since tables are no longer created automatically without asked by the user. Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 964881b40d69e47dbbfbe3c8212806477fcf1345 https://github.com/phpmyadmin/phpmyadmin/commit/964881b40d69e47dbbfbe3c82128... Author: Marc Delisle <marc@infomarc.info> Date: 2015-01-04 (Sun, 04 Jan 2015) Changed paths: M db_tracking.php M doc/config.rst M libraries/Menu.class.php M libraries/RecentFavoriteTable.class.php M libraries/Table.class.php M libraries/Tracker.class.php M libraries/bookmark.lib.php M libraries/central_columns.lib.php M libraries/common.inc.php M libraries/core.lib.php M libraries/dbi/DBIDummy.class.php M libraries/relation.lib.php M libraries/server_privileges.lib.php M libraries/server_user_groups.lib.php M libraries/tracking.lib.php M prefs_forms.php M test/libraries/PMA_Tracker_test.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_server_user_groups_test.php M test/libraries/PMA_tbl_tracking_test.php Log Message: ----------- Merge remote-tracking branch 'madhuracj/zeroconf' into QA_4_3 Commit: 459f1a6c16c930b7f2547aaebe229580dc0f31b6 https://github.com/phpmyadmin/phpmyadmin/commit/459f1a6c16c930b7f2547aaebe22... Author: Marc Delisle <marc@infomarc.info> Date: 2015-01-04 (Sun, 04 Jan 2015) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 56baec61608186afe3557377e651d5dfce33ddd2 https://github.com/phpmyadmin/phpmyadmin/commit/56baec61608186afe3557377e651... Author: Marc Delisle <marc@infomarc.info> Date: 2015-01-04 (Sun, 04 Jan 2015) Changed paths: M ChangeLog M db_tracking.php M doc/config.rst M libraries/Menu.class.php M libraries/RecentFavoriteTable.class.php M libraries/Table.class.php M libraries/Tracker.class.php M libraries/bookmark.lib.php M libraries/central_columns.lib.php M libraries/common.inc.php M libraries/core.lib.php M libraries/dbi/DBIDummy.class.php M libraries/relation.lib.php M libraries/server_privileges.lib.php M libraries/server_user_groups.lib.php M libraries/tracking.lib.php M prefs_forms.php M test/libraries/PMA_Tracker_test.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_server_user_groups_test.php M test/libraries/PMA_tbl_tracking_test.php Log Message: ----------- Merge branch 'QA_4_3' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fb4cd93fdef9...56baec616081