Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 41a497d169acaf59f317346feba5d2081840f031 https://github.com/phpmyadmin/phpmyadmin/commit/41a497d169acaf59f317346feba5... Author: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com> Date: 2013-06-26 (Wed, 26 Jun 2013) Changed paths: M js/messages.php A js/tbl_find_replace.js M libraries/Menu.class.php M libraries/TableSearch.class.php A tbl_find_replace.php M tbl_select.php M tbl_zoom_select.php A themes/original/img/b_find_replace.png A themes/pmahomme/img/b_find_replace.png Log Message: ----------- Implement 'find and replace in a column' feature Commit: cdca143ce81c87b2d25e0b08e1a158f668d0ff7e https://github.com/phpmyadmin/phpmyadmin/commit/cdca143ce81c87b2d25e0b08e1a1... Author: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com> Date: 2013-06-26 (Wed, 26 Jun 2013) Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog entry for rfe #1405 Commit: 0402843d89e51be8e645799d7cfad0ef230c8439 https://github.com/phpmyadmin/phpmyadmin/commit/0402843d89e51be8e645799d7cfa... Author: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com> Date: 2013-06-26 (Wed, 26 Jun 2013) Changed paths: M ChangeLog M doc/faq.rst M js/tbl_relation.js M libraries/Table.class.php M libraries/operations.lib.php M libraries/pmd_common.php M libraries/tbl_relation.lib.php M pmd_relation_upd.php M tbl_relation.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin into findNreplace Conflicts: ChangeLog Commit: a1be4d5fcc34f5c2f92b5dacae23eb2765d7d46f https://github.com/phpmyadmin/phpmyadmin/commit/a1be4d5fcc34f5c2f92b5dacae23... Author: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com> Date: 2013-06-27 (Thu, 27 Jun 2013) Changed paths: M libraries/TableSearch.class.php Log Message: ----------- Adhere to English style guide Commit: 77f5cee667e7c4f4cc45382469446b873d7f5aaf https://github.com/phpmyadmin/phpmyadmin/commit/77f5cee667e7c4f4cc4538246944... Author: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com> Date: 2013-07-02 (Tue, 02 Jul 2013) Changed paths: M themes/original/img/b_find_replace.png M themes/pmahomme/img/b_find_replace.png Log Message: ----------- Update icons for find and replace feature Commit: 0a210880564504b9db813084053be134f737f46f https://github.com/phpmyadmin/phpmyadmin/commit/0a210880564504b9db813084053b... Author: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com> Date: 2013-07-02 (Tue, 02 Jul 2013) Changed paths: M ChangeLog M README M composer.json M doc/faq.rst M doc/require.rst M import.php M libraries/File.class.php M libraries/Message.class.php M libraries/OutputBuffering.class.php M libraries/Tracker.class.php M libraries/build_html_for_db.lib.php M libraries/charset_conversion.lib.php M libraries/common.inc.php M libraries/dbi/DBIDummy.class.php M libraries/dbi/DBIMysqli.class.php M libraries/display_import.lib.php M libraries/display_import_ajax.lib.php M libraries/file_listing.lib.php M libraries/opendocument.lib.php M libraries/parse_analyze.inc.php M libraries/plugins/PluginObserver.class.php M libraries/plugins/transformations/Application_Octetstream_Download.class.php M libraries/plugins/transformations/Application_Octetstream_Hex.class.php M libraries/plugins/transformations/Image_JPEG_Inline.class.php M libraries/plugins/transformations/Image_JPEG_Link.class.php M libraries/plugins/transformations/Image_PNG_Inline.class.php M libraries/plugins/transformations/TEMPLATE M libraries/plugins/transformations/Text_Plain_Append.class.php M libraries/plugins/transformations/Text_Plain_Dateformat.class.php M libraries/plugins/transformations/Text_Plain_External.class.php M libraries/plugins/transformations/Text_Plain_Formatted.class.php M libraries/plugins/transformations/Text_Plain_Imagelink.class.php M libraries/plugins/transformations/Text_Plain_Link.class.php M libraries/plugins/transformations/Text_Plain_Longtoipv4.class.php M libraries/plugins/transformations/Text_Plain_Sql.class.php M libraries/plugins/transformations/Text_Plain_Substring.class.php M libraries/properties/options/OptionsPropertyGroup.class.php M libraries/server_bin_log.lib.php M libraries/server_databases.lib.php M libraries/server_plugins.lib.php M libraries/server_status_variables.lib.php M libraries/sql.lib.php M libraries/tbl_relation.lib.php M libraries/transformations.lib.php M po/bn.po M po/da.po M po/fa.po M po/hu.po M po/it.po M po/pt_BR.po M po/ur.po M server_collations.php M server_plugins.php M sql.php M tbl_relation.php M test/Environment_test.php M test/bootstrap-dist.php M test/classes/PMA_DisplayResults_test.php M test/classes/navigation/PMA_Node_Column_test.php M test/classes/navigation/PMA_Node_test.php A test/classes/plugin/import/ImportCsv_test.php A test/classes/plugin/import/ImportLdi_test.php A test/classes/plugin/import/ImportOds_test.php A test/classes/plugin/import/ImportSql_test.php A test/libraries/PMA_ConfigFile_test.php A test/libraries/PMA_Tracker_test.php A test/libraries/PMA_config_functions_test.php A test/libraries/PMA_ip_allow_deny_test.php M test/libraries/PMA_mysql_charsets_test.php A test/libraries/PMA_server_binlong_test.php A test/libraries/PMA_server_common_test.php M test/libraries/PMA_transformation_test.php M test/libraries/database_interface_test.php A test/test_data/db_test.csv A test/test_data/db_test.ods A test/test_data/db_test_ldi.csv A test/test_data/pma_bookmark.sql Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin into findNreplace Conflicts: ChangeLog Commit: aa2960f88effb5d29df9d4f3fbf42d6b4e9d3668 https://github.com/phpmyadmin/phpmyadmin/commit/aa2960f88effb5d29df9d4f3fbf4... Author: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com> Date: 2013-07-02 (Tue, 02 Jul 2013) Changed paths: M js/tbl_find_replace.js Log Message: ----------- Remove tabs and trailing white spaces Commit: 9861c96e2db8d402f2c26a51de5f22ee9d123d3e https://github.com/phpmyadmin/phpmyadmin/commit/9861c96e2db8d402f2c26a51de5f... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2013-07-03 (Wed, 03 Jul 2013) Changed paths: M ChangeLog M js/messages.php A js/tbl_find_replace.js M libraries/Menu.class.php M libraries/TableSearch.class.php A tbl_find_replace.php M tbl_select.php M tbl_zoom_select.php A themes/original/img/b_find_replace.png A themes/pmahomme/img/b_find_replace.png Log Message: ----------- Merge branch 'findNreplace' of git://github.com/kasunchathuranga/phpmyadmin into kasunchathuranga-findNreplace Commit: 2620985de2c442de89ecb91c2f11a9e6600432b1 https://github.com/phpmyadmin/phpmyadmin/commit/2620985de2c442de89ecb91c2f11... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2013-07-03 (Wed, 03 Jul 2013) Changed paths: M themes/original/img/sprites.png M themes/original/sprites.lib.php M themes/pmahomme/img/sprites.png M themes/pmahomme/sprites.lib.php Log Message: ----------- Generate image sprites including new find and replace icon Commit: 9465f380308e9608a2a1b673688df5b2fdb44d4e https://github.com/phpmyadmin/phpmyadmin/commit/9465f380308e9608a2a1b673688d... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2013-07-03 (Wed, 03 Jul 2013) Changed paths: M ChangeLog M js/messages.php A js/tbl_find_replace.js M libraries/Menu.class.php M libraries/TableSearch.class.php A tbl_find_replace.php M tbl_select.php M tbl_zoom_select.php A themes/original/img/b_find_replace.png M themes/original/img/sprites.png M themes/original/sprites.lib.php A themes/pmahomme/img/b_find_replace.png M themes/pmahomme/img/sprites.png M themes/pmahomme/sprites.lib.php Log Message: ----------- Merge branch 'kasunchathuranga-findNreplace' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e11831164404...9465f380308e