Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d9c3b9cbedb44c3db2b0807d741b229e7a9b6d06 https://github.com/phpmyadmin/phpmyadmin/commit/d9c3b9cbedb44c3db2b0807d741b... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-26 (Wed, 26 Nov 2014)

Changed paths: M ChangeLog M db_tracking.php M js/db_tracking.js

Log Message: ----------- rfe #1564 Improve action message on Tracking page

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 5cd85cf5fda24ea848c34cf15379e38f861e8e1c https://github.com/phpmyadmin/phpmyadmin/commit/5cd85cf5fda24ea848c34cf15379... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-26 (Wed, 26 Nov 2014)

Changed paths: M libraries/tracking.lib.php

Log Message: ----------- Database column is redundant

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 805352c1fde376f645bbab8755452f939a18b461 https://github.com/phpmyadmin/phpmyadmin/commit/805352c1fde376f645bbab875545... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-26 (Wed, 26 Nov 2014)

Changed paths: M libraries/tracking.lib.php

Log Message: ----------- Add @return doc comment

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 80c0ba810a9aa8119079bc4e367d50599c8e451f https://github.com/phpmyadmin/phpmyadmin/commit/80c0ba810a9aa8119079bc4e367d... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-26 (Wed, 26 Nov 2014)

Changed paths: M js/messages.php A js/tbl_tracking.js M libraries/Tracker.class.php M libraries/tracking.lib.php M tbl_tracking.php

Log Message: ----------- Allow deleting individual versions of tracking data

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 9bf8246139e7cc0565795c23936f7e353f77a3ca https://github.com/phpmyadmin/phpmyadmin/commit/9bf8246139e7cc0565795c23936f... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-26 (Wed, 26 Nov 2014)

Changed paths: M db_tracking.php

Log Message: ----------- Improve action message

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 88075755866572a6f9c0f1e27f06e4b22b8abc10 https://github.com/phpmyadmin/phpmyadmin/commit/88075755866572a6f9c0f1e27f06... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-26 (Wed, 26 Nov 2014)

Changed paths: M ChangeLog M db_tracking.php M js/db_tracking.js M js/messages.php A js/tbl_tracking.js M libraries/Tracker.class.php M libraries/tracking.lib.php M tbl_tracking.php

Log Message: ----------- Merge branch 'tracking'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1206bcedd700...880757558665