Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 59fff74447ef71aeae04783c3ea7e8c5f8e8ed2c
https://github.com/phpmyadmin/phpmyadmin/commit/59fff74447ef71aeae04783c3ea…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M po/si.po
Log Message:
-----------
Translated using Weblate (Sinhala)
Currently translated at 79.2% (2110 of 2665)
Commit: 2c3cf1a43458bb5a7bea34c5a13a8c4d5197e1c4
https://github.com/phpmyadmin/phpmyadmin/commit/2c3cf1a43458bb5a7bea34c5a13…
Author: Peter Rosa <peter.rosa(a)pro.sk>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M po/sk.po
Log Message:
-----------
Translated using Weblate (Slovak)
Currently translated at 73.7% (1963 of 2665)
Commit: 0f8c79de005bc43e725381bde623d26b7fec9fa6
https://github.com/phpmyadmin/phpmyadmin/commit/0f8c79de005bc43e725381bde62…
Author: Weblate <noreply(a)weblate.org>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M db_create.php
M db_operations.php
M db_routines.php
M db_structure.php
M libraries/DatabaseInterface.class.php
M libraries/display_create_database.lib.php
M libraries/display_structure.lib.php
A libraries/mysql_charsets.inc.php
M libraries/mysql_charsets.lib.php
A libraries/server_collations.lib.php
M libraries/server_common.lib.php
M libraries/sqlparser.lib.php
M libraries/tbl_columns_definition_form.inc.php
M server_collations.php
M tbl_operations.php
M tbl_row_action.php
M tbl_select.php
M tbl_structure.php
M tbl_zoom_select.php
M test/libraries/PMA_build_html_for_db_test.php
M test/libraries/PMA_operations_test.php
M test/libraries/rte/PMA_RTN_getEditorForm_test.php
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d458b9913c28...0f8c79de005b
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 5e3f7a080a40f0b3c25e730ed67667d6a8c0097c
https://github.com/phpmyadmin/phpmyadmin/commit/5e3f7a080a40f0b3c25e730ed67…
Author: xmujay <xmujay(a)gmail.com>
Date: 2013-06-10 (Mon, 10 Jun 2013)
Changed paths:
A libraries/server_collations.lib.php
M libraries/server_common.lib.php
M server_collations.php
Log Message:
-----------
refactor server_collations.php
1. split long function
2. add server_common.lib.php
Commit: 6d00ce0622aeb1cbcd9f87afbead49a0727882ec
https://github.com/phpmyadmin/phpmyadmin/commit/6d00ce0622aeb1cbcd9f87afbea…
Author: xmujay <xmujay(a)gmail.com>
Date: 2013-06-10 (Mon, 10 Jun 2013)
Changed paths:
M libraries/server_collations.lib.php
M server_collations.php
Log Message:
-----------
rename function name for a better indication
Commit: d23aad1d5b0ccab054452798062cd1bcb6aa39c9
https://github.com/phpmyadmin/phpmyadmin/commit/d23aad1d5b0ccab054452798062…
Author: xmujay <xmujay(a)gmail.com>
Date: 2013-06-10 (Mon, 10 Jun 2013)
Changed paths:
M db_create.php
M db_operations.php
M db_routines.php
M db_structure.php
M libraries/DatabaseInterface.class.php
M libraries/display_create_database.lib.php
M libraries/display_structure.lib.php
A libraries/mysql_charsets.inc.php
M libraries/mysql_charsets.lib.php
M libraries/sqlparser.lib.php
M libraries/tbl_columns_definition_form.inc.php
M server_collations.php
M tbl_operations.php
M tbl_row_action.php
M tbl_select.php
M tbl_structure.php
M tbl_zoom_select.php
M test/libraries/PMA_build_html_for_db_test.php
M test/libraries/PMA_operations_test.php
M test/libraries/rte/PMA_RTN_getEditorForm_test.php
Log Message:
-----------
refactor mysql_charsets.inc.php
Commit: d458b9913c282492ecc7b0fb9f19f69827018d80
https://github.com/phpmyadmin/phpmyadmin/commit/d458b9913c282492ecc7b0fb9f1…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M db_create.php
M db_operations.php
M db_routines.php
M db_structure.php
M libraries/DatabaseInterface.class.php
M libraries/display_create_database.lib.php
M libraries/display_structure.lib.php
A libraries/mysql_charsets.inc.php
M libraries/mysql_charsets.lib.php
A libraries/server_collations.lib.php
M libraries/server_common.lib.php
M libraries/sqlparser.lib.php
M libraries/tbl_columns_definition_form.inc.php
M server_collations.php
M tbl_operations.php
M tbl_row_action.php
M tbl_select.php
M tbl_structure.php
M tbl_zoom_select.php
M test/libraries/PMA_build_html_for_db_test.php
M test/libraries/PMA_operations_test.php
M test/libraries/rte/PMA_RTN_getEditorForm_test.php
Log Message:
-----------
Merge pull request #410 from xmujay/0609week_serverview
refactor server_collations.php 1. split long function 2. add server_common.lib.php
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e63a34fcaba6...d458b9913c28
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 4299eed61c756eb32bfbcf7ebead94ed642a2d71
https://github.com/phpmyadmin/phpmyadmin/commit/4299eed61c756eb32bfbcf7ebea…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M po/si.po
Log Message:
-----------
Translated using Weblate (Sinhala)
Currently translated at 78.9% (2103 of 2665)
Commit: 5b6acf863094e128f68a2ff0b02e3cd9fa3bf4a6
https://github.com/phpmyadmin/phpmyadmin/commit/5b6acf863094e128f68a2ff0b02…
Author: Peter Rosa <peter.rosa(a)pro.sk>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M po/sk.po
Log Message:
-----------
Translated using Weblate (Slovak)
Currently translated at 73.4% (1955 of 2665)
Commit: 41783a137972254db24247443a306e2e7e0be6c7
https://github.com/phpmyadmin/phpmyadmin/commit/41783a137972254db24247443a3…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M po/si.po
Log Message:
-----------
Translated using Weblate (Sinhala)
Currently translated at 78.9% (2104 of 2665)
Commit: 3aaa58bfe7ff33fd2fe21b1a1d394ace5576ed67
https://github.com/phpmyadmin/phpmyadmin/commit/3aaa58bfe7ff33fd2fe21b1a1d3…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M po/si.po
Log Message:
-----------
Translated using Weblate (Sinhala)
Currently translated at 78.9% (2104 of 2665)
Commit: a378df734497355a07df19eac44c0e0c5357973a
https://github.com/phpmyadmin/phpmyadmin/commit/a378df734497355a07df19eac44…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M po/si.po
Log Message:
-----------
Translated using Weblate (Sinhala)
Currently translated at 78.9% (2104 of 2665)
Commit: b86f4b0e20fbc38d55bbadc788f2e9a6f9ca1804
https://github.com/phpmyadmin/phpmyadmin/commit/b86f4b0e20fbc38d55bbadc788f…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M po/si.po
Log Message:
-----------
Translated using Weblate (Sinhala)
Currently translated at 78.9% (2104 of 2665)
Commit: 90f1da0e02f243206b8aea8726b88867fb62ac32
https://github.com/phpmyadmin/phpmyadmin/commit/90f1da0e02f243206b8aea8726b…
Author: Peter Rosa <peter.rosa(a)pro.sk>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M po/sk.po
Log Message:
-----------
Translated using Weblate (Slovak)
Currently translated at 73.4% (1956 of 2665)
Commit: e63a34fcaba67d08f732dcdae297962d4f93f7e9
https://github.com/phpmyadmin/phpmyadmin/commit/e63a34fcaba67d08f732dcdae29…
Author: Weblate <noreply(a)weblate.org>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M libraries/dbi/DBIDummy.class.php
M phpunit.xml.dist
M phpunit.xml.nocoverage
M test/bootstrap-dist.php
M test/classes/PMA_Advisor_test.php
M test/classes/PMA_Config_test.php
M test/classes/PMA_DBQbe_test.php
M test/classes/PMA_DbSearch_test.php
M test/classes/PMA_DisplayResults_test.php
M test/classes/PMA_Footer_test.php
M test/classes/PMA_Header_test.php
M test/classes/PMA_Menu_test.php
M test/classes/PMA_Message_test.php
M test/classes/PMA_Table_test.php
M test/classes/PMA_Theme_Manager_test.php
M test/classes/PMA_Theme_test.php
M test/classes/config/PMA_Form_test.php
M test/libraries/PMA_SQL_parser_test.php
M test/libraries/PMA_build_html_for_db_test.php
M test/libraries/PMA_generateCommonUrl_test.php
M test/libraries/PMA_operations_test.php
M test/libraries/PMA_sanitize_test.php
M test/libraries/PMA_transformation_test.php
M test/libraries/common/PMA_checkParameters_test.php
M test/libraries/common/PMA_getDbLink_test.php
M test/libraries/common/PMA_showDocu_test.php
M test/libraries/common/PMA_showMessage_test_disabled.php
M test/libraries/common/PMA_showPHPDocu_test.php
M test/libraries/core/PMA_fatalError_test.php
M test/libraries/core/PMA_getLinks_test.php
M test/libraries/core/PMA_getTableCount_test_dis.php
M test/libraries/core/PMA_headerLocation_test.php
M test/libraries/core/PMA_warnMissingExtension_test.php
M test/libraries/database_interface_test.php
M test/libraries/rte/PMA_EVN_getEditorForm_test.php
M test/libraries/rte/PMA_RTN_getEditorForm_test.php
M test/libraries/rte/PMA_RTN_getExecuteForm_test.php
M test/libraries/rte/PMA_TRI_getEditorForm_test.php
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ae2c8d5dfcc1...e63a34fcaba6
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: c818cc69cf6e9f5fc460fffb169e4edfb8eccf6e
https://github.com/phpmyadmin/phpmyadmin/commit/c818cc69cf6e9f5fc460fffb169…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M test/classes/PMA_Footer_test.php
Log Message:
-----------
Allow test to run standalone
Commit: f211f633275b83e1cc6c908deb97d00c43f861c2
https://github.com/phpmyadmin/phpmyadmin/commit/f211f633275b83e1cc6c908deb9…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M test/classes/PMA_Config_test.php
Log Message:
-----------
Allow test to run standalone
Commit: ba9cff27360f3b2535dafb6b34b9eb983e39c0cb
https://github.com/phpmyadmin/phpmyadmin/commit/ba9cff27360f3b2535dafb6b34b…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M test/bootstrap-dist.php
M test/classes/PMA_Advisor_test.php
M test/classes/PMA_Config_test.php
M test/classes/PMA_DbSearch_test.php
M test/classes/PMA_DisplayResults_test.php
M test/classes/PMA_Footer_test.php
M test/classes/PMA_Header_test.php
M test/classes/PMA_Message_test.php
M test/classes/PMA_Table_test.php
M test/classes/PMA_Theme_Manager_test.php
M test/classes/PMA_Theme_test.php
M test/libraries/PMA_build_html_for_db_test.php
M test/libraries/PMA_generateCommonUrl_test.php
M test/libraries/PMA_operations_test.php
M test/libraries/PMA_sanitize_test.php
M test/libraries/PMA_transformation_test.php
M test/libraries/common/PMA_getDbLink_test.php
M test/libraries/common/PMA_showDocu_test.php
M test/libraries/common/PMA_showMessage_test_disabled.php
M test/libraries/common/PMA_showPHPDocu_test.php
M test/libraries/core/PMA_fatalError_test.php
M test/libraries/core/PMA_getLinks_test.php
M test/libraries/core/PMA_getTableCount_test_dis.php
M test/libraries/core/PMA_headerLocation_test.php
M test/libraries/core/PMA_warnMissingExtension_test.php
M test/libraries/rte/PMA_EVN_getEditorForm_test.php
M test/libraries/rte/PMA_RTN_getEditorForm_test.php
M test/libraries/rte/PMA_RTN_getExecuteForm_test.php
M test/libraries/rte/PMA_TRI_getEditorForm_test.php
Log Message:
-----------
Set token in single place for all tests
Commit: e11113f5a924d93d8df0f9761c77841b6d695c4a
https://github.com/phpmyadmin/phpmyadmin/commit/e11113f5a924d93d8df0f9761c7…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M test/libraries/PMA_generateCommonUrl_test.php
Log Message:
-----------
Adjust to new token value
Commit: 262d1b1a11c80df724b919c3b85c9f6613ce3707
https://github.com/phpmyadmin/phpmyadmin/commit/262d1b1a11c80df724b919c3b85…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M test/classes/PMA_Message_test.php
Log Message:
-----------
Allow to run standalone
Commit: bb922686e00b4f8174dda8f3cfafa103cc89f01a
https://github.com/phpmyadmin/phpmyadmin/commit/bb922686e00b4f8174dda8f3cfa…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M test/bootstrap-dist.php
Log Message:
-----------
Globally set language
Commit: a1b6d4bb4c0950a176f41207073eab2e10b51355
https://github.com/phpmyadmin/phpmyadmin/commit/a1b6d4bb4c0950a176f41207073…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M test/libraries/PMA_generateCommonUrl_test.php
Log Message:
-----------
Use correctly set language
Commit: 8b9fa8aa3601ab30851d87dd7b523fdccc0f7740
https://github.com/phpmyadmin/phpmyadmin/commit/8b9fa8aa3601ab30851d87dd7b5…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M test/classes/PMA_Advisor_test.php
M test/classes/PMA_DbSearch_test.php
M test/classes/PMA_DisplayResults_test.php
M test/classes/PMA_Footer_test.php
M test/classes/PMA_Header_test.php
M test/classes/PMA_Menu_test.php
M test/classes/PMA_Message_test.php
M test/classes/PMA_Table_test.php
M test/classes/PMA_Theme_Manager_test.php
M test/classes/PMA_Theme_test.php
M test/libraries/PMA_build_html_for_db_test.php
M test/libraries/PMA_generateCommonUrl_test.php
M test/libraries/common/PMA_checkParameters_test.php
M test/libraries/common/PMA_getDbLink_test.php
M test/libraries/common/PMA_showDocu_test.php
M test/libraries/common/PMA_showPHPDocu_test.php
M test/libraries/core/PMA_getLinks_test.php
M test/libraries/core/PMA_headerLocation_test.php
M test/libraries/core/PMA_warnMissingExtension_test.php
M test/libraries/rte/PMA_RTN_getEditorForm_test.php
M test/libraries/rte/PMA_RTN_getExecuteForm_test.php
Log Message:
-----------
Do not set language in every test
Commit: e463da3285f6228fdd64c5c8535d60ed398f86ca
https://github.com/phpmyadmin/phpmyadmin/commit/e463da3285f6228fdd64c5c8535…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M test/classes/PMA_DBQbe_test.php
Log Message:
-----------
Possibly undefined variable
Commit: eb77c27e8dc50c43fe1d2153a92af845b0039074
https://github.com/phpmyadmin/phpmyadmin/commit/eb77c27e8dc50c43fe1d2153a92…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M test/classes/PMA_DBQbe_test.php
Log Message:
-----------
Make it work with separated globals
Commit: 4b787d450589f078d4e992f6ba170bbad9ae718f
https://github.com/phpmyadmin/phpmyadmin/commit/4b787d450589f078d4e992f6ba1…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M test/libraries/database_interface_test.php
Log Message:
-----------
Do not rely too much on previous state
Commit: 498b7a701213e1f6c5193acdba975d71b84a28be
https://github.com/phpmyadmin/phpmyadmin/commit/498b7a701213e1f6c5193acdba9…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M test/bootstrap-dist.php
Log Message:
-----------
Nedd to have defined ajax flag for most of the tets as well
Commit: 83712de59aa2e2b994c101c480ade70d86d4e62b
https://github.com/phpmyadmin/phpmyadmin/commit/83712de59aa2e2b994c101c480a…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M test/classes/PMA_DbSearch_test.php
Log Message:
-----------
Do not rely on previous globals
Commit: 158389ea3e36c5b70aa54cc49a1f3302c1edfccf
https://github.com/phpmyadmin/phpmyadmin/commit/158389ea3e36c5b70aa54cc49a1…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M test/libraries/PMA_SQL_parser_test.php
Log Message:
-----------
Make parser test work with error reporting as well
Commit: 1cff9b72290bce50a4155c600c9858550157206d
https://github.com/phpmyadmin/phpmyadmin/commit/1cff9b72290bce50a4155c600c9…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M test/classes/config/PMA_Form_test.php
Log Message:
-----------
Missing include
Commit: 24179371792b182769a8f5f64b7d9854886413b2
https://github.com/phpmyadmin/phpmyadmin/commit/24179371792b182769a8f5f64b7…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M libraries/dbi/DBIDummy.class.php
Log Message:
-----------
Define another query used in testsuite
Commit: fad06584f54e29d19cd169ee8a2e8bc3c030f772
https://github.com/phpmyadmin/phpmyadmin/commit/fad06584f54e29d19cd169ee8a2…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M phpunit.xml.dist
M phpunit.xml.nocoverage
Log Message:
-----------
Enable backupGlobals directive in phpunit
Commit: ae2c8d5dfcc166b150a5ccf630416ab906ccd115
https://github.com/phpmyadmin/phpmyadmin/commit/ae2c8d5dfcc166b150a5ccf6304…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M libraries/display_import_ajax.lib.php
M libraries/plugins/export/PMA_ExportPdf.class.php
M libraries/plugins/import/upload/UploadApc.class.php
M libraries/plugins/import/upload/UploadProgress.class.php
M libraries/plugins/import/upload/UploadSession.class.php
M po/sk.po
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/dd0f5aafb781...ae2c8d5dfcc1
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 68dfc347f9d7842ae138244058dd603867034272
https://github.com/phpmyadmin/phpmyadmin/commit/68dfc347f9d7842ae138244058d…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M libraries/relation.lib.php
Log Message:
-----------
Fixed formatting of documentation URL (can contain %, so it can not be used as format string)
Commit: f414eb577b13f908f4bea09d69ddc944b7f4629c
https://github.com/phpmyadmin/phpmyadmin/commit/f414eb577b13f908f4bea09d69d…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M ChangeLog
M libraries/schema/Export_Relation_Schema.class.php
M libraries/schema/User_Schema.class.php
R libraries/schema/Visio_Relation_Schema.class.php
Log Message:
-----------
bug #3631 Drop not working Visio schema export.
Commit: 29519cb165d94f7e6984a53d668074e9468b3dc2
https://github.com/phpmyadmin/phpmyadmin/commit/29519cb165d94f7e6984a53d668…
Author: Peter Rosa <peter.rosa(a)pro.sk>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M po/sk.po
Log Message:
-----------
Translated using Weblate (Slovak)
Currently translated at 76.1% (1981 of 2603)
Commit: b369f6a91218998b80f5558d3adab8a118a96388
https://github.com/phpmyadmin/phpmyadmin/commit/b369f6a91218998b80f5558d3ad…
Author: Weblate <noreply(a)weblate.org>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M ChangeLog
M libraries/relation.lib.php
M libraries/schema/Export_Relation_Schema.class.php
M libraries/schema/User_Schema.class.php
R libraries/schema/Visio_Relation_Schema.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Commit: 67543568b110fefd39e742d8a5679fdde252a06b
https://github.com/phpmyadmin/phpmyadmin/commit/67543568b110fefd39e742d8a56…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Changed paths:
M ChangeLog
M libraries/relation.lib.php
M libraries/schema/Export_Relation_Schema.class.php
M libraries/schema/User_Schema.class.php
R libraries/schema/Visio_Relation_Schema.class.php
Log Message:
-----------
Merge commit 'f414eb577b13f908f4bea09d69ddc944b7f4629c'
Conflicts:
libraries/schema/Visio_Relation_Schema.class.php
Commit: 3af2a1216239b1ce3bffecfbe76c28e7b08b8558
https://github.com/phpmyadmin/phpmyadmin/commit/3af2a1216239b1ce3bffecfbe76…
Author: Michal ÄŒihaÅ™ <mcihar(a)suse.cz>
Date: 2013-06-11 (Tue, 11 Jun 2013)
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_0'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0ee0d8e8c56f...3af2a1216239