Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 06c4939e3f6b06c7ff44c8a6cb5e8e303808888a https://github.com/phpmyadmin/phpmyadmin/commit/06c4939e3f6b06c7ff44c8a6cb5e... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-06-17 (Mon, 17 Jun 2013)

Changed paths: M libraries/operations.lib.php

Log Message: ----------- Show database name in 'Check referential integrity' operation as it already supports cross database relations

Commit: 4dc2b2ecc42261fbf00e6fc823427f7393bc024b https://github.com/phpmyadmin/phpmyadmin/commit/4dc2b2ecc42261fbf00e6fc82342... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-06-18 (Tue, 18 Jun 2013)

Changed paths: M libraries/Table.class.php

Log Message: ----------- Make 'full name' optional in getUniqueColumns() method as sometimes full name is not required

Commit: 1e0e37c14a53e5fa7b6ae32c800470e028c6ec2e https://github.com/phpmyadmin/phpmyadmin/commit/1e0e37c14a53e5fa7b6ae32c8004... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-06-18 (Tue, 18 Jun 2013)

Changed paths: M js/tbl_relation.js M tbl_relation.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php

Log Message: ----------- Improved relation view interface

Commit: 2570db554c538b9d462b48905bca0ce2c7ee7056 https://github.com/phpmyadmin/phpmyadmin/commit/2570db554c538b9d462b48905bca... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-06-18 (Tue, 18 Jun 2013)

Changed paths: M js/tbl_relation.js

Log Message: ----------- Improve comments on the behavior of new relation view interface

Commit: 05e84653242606eeba078c73e204fe00a5a5d4e1 https://github.com/phpmyadmin/phpmyadmin/commit/05e84653242606eeba078c73e204... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-06-18 (Tue, 18 Jun 2013)

Changed paths: M tbl_relation.php

Log Message: ----------- Pass parameter values without backquotes to avoid confusions

Commit: 768f736bcbe5370a2bc40a45e784c3db28f21838 https://github.com/phpmyadmin/phpmyadmin/commit/768f736bcbe5370a2bc40a45e784... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-06-18 (Tue, 18 Jun 2013)

Changed paths: M doc/faq.rst

Log Message: ----------- Update FAQs to reflect the ability to set cross database relations

Commit: 71e4dd5f526831fc8a33c1fb7e85660a0ba49253 https://github.com/phpmyadmin/phpmyadmin/commit/71e4dd5f526831fc8a33c1fb7e85... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-06-18 (Tue, 18 Jun 2013)

Changed paths: M doc/faq.rst

Log Message: ----------- Update FAQs to reflect new process of selecting foreign columns

Commit: 247e79b84067b0f8d31962448812e20bec3367a7 https://github.com/phpmyadmin/phpmyadmin/commit/247e79b84067b0f8d31962448812... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-06-24 (Mon, 24 Jun 2013)

Changed paths: M ChangeLog M browse_foreigners.php M db_tracking.php M doc/config.rst M doc/faq.rst M js/ajax.js R js/jquery/jquery-1.8.3.js A js/jquery/jquery-1.8.3.min.js R js/jquery/jquery-ui-1.9.2.custom.js A js/jquery/jquery-ui-1.9.2.custom.min.js M js/makegrid.js M js/server_privileges.js M libraries/Config.class.php M libraries/DisplayResults.class.php M libraries/Footer.class.php M libraries/Header.class.php M libraries/Menu.class.php A libraries/StringCType.class.php A libraries/StringMB.class.php A libraries/StringNative.class.php A libraries/StringNativeType.class.php M libraries/Util.class.php M libraries/charset_conversion.lib.php M libraries/common.inc.php M libraries/config.default.php M libraries/config.values.php M libraries/config/FormDisplay.class.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/display_create_table.lib.php M libraries/display_structure.lib.php M libraries/navigation/NavigationHeader.class.php M libraries/navigation/NavigationTree.class.php M libraries/navigation/Nodes/Node_Database.class.php M libraries/navigation/Nodes/Node_Table.class.php M libraries/operations.lib.php M libraries/parse_analyze.inc.php M libraries/plugins/import/ImportOds.class.php M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php M libraries/relation.lib.php M libraries/replication.inc.php M libraries/replication_gui.lib.php M libraries/schema/User_Schema.class.php M libraries/server_bin_log.lib.php M libraries/server_common.lib.php M libraries/server_privileges.lib.php M libraries/sql.lib.php M libraries/sql_query_form.lib.php M libraries/sqlparser.lib.php M libraries/string.lib.php R libraries/string_mb.lib.php R libraries/string_native.lib.php R libraries/string_type_ctype.lib.php R libraries/string_type_native.lib.php M libraries/structure.lib.php A libraries/tbl_relation.lib.php M pmd_general.php M pmd_save_pos.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/kn.po M po/ko.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/zh_CN.po M po/zh_TW.po R scripts/compress-js M scripts/create-release.sh M server_databases.php M server_replication.php M server_status.php M setup/index.php M sql.php M tbl_relation.php M tbl_structure.php M tbl_tracking.php M test/classes/PMA_DisplayResults_test.php M test/classes/PMA_Footer_test.php M test/classes/PMA_Menu_test.php M test/classes/PMA_Table_test.php M test/classes/plugin/import/ImportMediawiki_test.php M test/classes/plugin/import/ImportShp_test.php M test/classes/plugin/import/ImportXml_test.php M test/classes/plugin/transformations/Image_JPEG_Inline_test.php M test/classes/plugin/transformations/Image_PNG_Inline_test.php M test/classes/plugin/transformations/Text_Plain_Append_test.php M test/classes/plugin/transformations/Text_Plain_Dateformat_test.php M test/classes/plugin/transformations/Text_Plain_Download_test.php M test/classes/plugin/transformations/Text_Plain_External_test.php M test/classes/plugin/transformations/Text_Plain_Hex_test.php M test/classes/plugin/transformations/Text_Plain_Longtoipv4_test.php M test/libraries/PMA_STR_sub_test.php A test/libraries/PMA_StringCType_test.php A test/libraries/PMA_StringMB_test.php A test/libraries/PMA_StringNativeType_test.php A test/libraries/PMA_StringNative_test.php M test/libraries/PMA_build_html_for_db_test.php M test/libraries/PMA_iconv_wrapper_test.php M test/libraries/PMA_operations_test.php A test/libraries/PMA_string_test.php M test/libraries/PMA_transformation_test.php M test/libraries/common/PMA_buildActionTitles_test.php M test/libraries/common/PMA_getIcon_test.php A test/test_data/phpmyadmin.mediawiki A test/test_data/phpmyadmin_importXML_For_Testing.xml M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php

Log Message: ----------- Merge branch 'master' into relView

Conflicts: tbl_relation.php

Commit: 45b08202349421c0b2ac3b414b288422e130b42a https://github.com/phpmyadmin/phpmyadmin/commit/45b08202349421c0b2ac3b414b28... Author: Isaac Bennetch bennetch@gmail.com Date: 2013-06-26 (Wed, 26 Jun 2013)

Changed paths: M doc/faq.rst M js/tbl_relation.js M libraries/Table.class.php M libraries/operations.lib.php M libraries/tbl_relation.lib.php M tbl_relation.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php

Log Message: ----------- Merge pull request #438 from kasunchathuranga/relView

Relational view interface improvements

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/31aa840d854c...45b082023494