Branch: refs/heads/QA_4_2
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 2e645ede7f005902e73a449bd75e739216234083
https://github.com/phpmyadmin/phpmyadmin/commit/2e645ede7f005902e73a449bd75…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-06-05 (Thu, 05 Jun 2014)
Changed paths:
M ChangeLog
M libraries/insert_edit.lib.php
Log Message:
-----------
bug #4436 Insert form numeric field with function drop-down list
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: fea0fe03ef6fd8c0f07c044be992e25b56ceffad
https://github.com/phpmyadmin/phpmyadmin/commit/fea0fe03ef6fd8c0f07c044be99…
Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de>
Date: 2014-06-04 (Wed, 04 Jun 2014)
Changed paths:
M libraries/TableSearch.class.php
M libraries/replication_gui.lib.php
M libraries/schema/Pdf_Relation_Schema.class.php
M libraries/server_status.lib.php
M libraries/sqlparser.lib.php
M libraries/structure.lib.php
M libraries/sysinfo.lib.php
M libraries/tbl_columns_definition_form.lib.php
M libraries/tbl_relation.lib.php
Log Message:
-----------
Code style fixes
Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: ceddfffac4099c31794d606b6e4b887f90fdffa3
https://github.com/phpmyadmin/phpmyadmin/commit/ceddfffac4099c31794d606b6e4…
Author: Hugues Peccatte <hugues.peccatte(a)gmail.com>
Date: 2014-06-03 (Tue, 03 Jun 2014)
Changed paths:
M libraries/display_export.lib.php
M libraries/insert_edit.lib.php
Log Message:
-----------
Update PHPDoc.
Add return.
Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com>
Commit: c0b5648cf6d04c8d44db11bacbacffef21cfcce5
https://github.com/phpmyadmin/phpmyadmin/commit/c0b5648cf6d04c8d44db11bacba…
Author: Hugues Peccatte <hugues.peccatte(a)gmail.com>
Date: 2014-06-03 (Tue, 03 Jun 2014)
Changed paths:
M import.php
M import_status.php
M libraries/DisplayResults.class.php
M libraries/Menu.class.php
M libraries/ServerStatusData.class.php
M libraries/Table.class.php
M libraries/Theme_Manager.class.php
M libraries/Types.class.php
M libraries/create_addfield.lib.php
M libraries/display_export.lib.php
M libraries/gis/GIS_Geometry.class.php
M libraries/mult_submits.inc.php
M libraries/mult_submits.lib.php
M libraries/plugins/auth/AuthenticationSignon.class.php
M libraries/plugins/export/ExportOdt.class.php
M libraries/plugins/export/ExportSql.class.php
M libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php
M libraries/relation.lib.php
M libraries/replication_gui.lib.php
M libraries/server_engines.lib.php
M libraries/server_privileges.lib.php
M libraries/sql_query_form.lib.php
M libraries/sqlparser.lib.php
M libraries/structure.lib.php
M libraries/tbl_columns_definition_form.lib.php
M test/classes/PMA_Table_test.php
M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
M test/classes/plugin/export/PMA_ExportCsv_test.php
M test/classes/plugin/export/PMA_ExportLatex_test.php
M test/classes/plugin/export/PMA_ExportTexytext_test.php
M test/classes/plugin/export/PMA_ExportXml_test.php
M test/classes/plugin/import/ImportLdi_test.php
M test/classes/plugin/import/ImportMediawiki_test.php
M test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
M test/classes/schema/Pdf_Relation_Schema_test.php
M test/libraries/PMA_ConfigFile_test.php
M test/libraries/PMA_SetupIndex_test.php
M test/libraries/PMA_Tracker_test.php
M test/libraries/PMA_build_html_for_db_test.php
M test/libraries/PMA_mult_submits_test.php
M test/libraries/PMA_server_plugins_test.php
M test/libraries/PMA_server_privileges_test.php
M test/libraries/common/PMA_showMessage_test_disabled.php
M test/libraries/core/PMA_headerLocation_test.php
M test/libraries/rte/PMA_RTN_getEditorForm_test.php
Log Message:
-----------
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c8e33b2a9623...c0b5648cf6d0
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: c8e33b2a96232c63cc9ecbb77c6e3b72d8891f67
https://github.com/phpmyadmin/phpmyadmin/commit/c8e33b2a96232c63cc9ecbb77c6…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-06-03 (Tue, 03 Jun 2014)
Changed paths:
M libraries/mult_submits.lib.php
M test/classes/PMA_Table_test.php
M test/classes/plugin/import/ImportLdi_test.php
M test/classes/plugin/import/ImportMediawiki_test.php
M test/libraries/PMA_ConfigFile_test.php
M test/libraries/PMA_SetupIndex_test.php
M test/libraries/PMA_Tracker_test.php
M test/libraries/PMA_build_html_for_db_test.php
M test/libraries/PMA_server_plugins_test.php
M test/libraries/PMA_server_privileges_test.php
Log Message:
-----------
Fix coding style
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 673fce81453033b92f80eab5ceabb1f480727755
https://github.com/phpmyadmin/phpmyadmin/commit/673fce81453033b92f80eab5cea…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-06-03 (Tue, 03 Jun 2014)
Changed paths:
M libraries/DisplayResults.class.php
M libraries/Menu.class.php
M libraries/ServerStatusData.class.php
M libraries/Table.class.php
M libraries/Theme_Manager.class.php
M libraries/Types.class.php
M libraries/create_addfield.lib.php
M libraries/display_export.lib.php
M libraries/relation.lib.php
M libraries/replication_gui.lib.php
M libraries/server_engines.lib.php
M libraries/server_privileges.lib.php
M libraries/sql_query_form.lib.php
M libraries/sqlparser.lib.php
Log Message:
-----------
Fix coding style
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: 84f135d048f14bba6f1ddb1a35eb04621dc9ab7a
https://github.com/phpmyadmin/phpmyadmin/commit/84f135d048f14bba6f1ddb1a35e…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-06-03 (Tue, 03 Jun 2014)
Changed paths:
M libraries/gis/GIS_Geometry.class.php
M libraries/plugins/auth/AuthenticationSignon.class.php
M libraries/plugins/export/ExportOdt.class.php
M libraries/plugins/export/ExportSql.class.php
M libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php
M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
M test/classes/plugin/export/PMA_ExportCsv_test.php
M test/classes/plugin/export/PMA_ExportLatex_test.php
M test/classes/plugin/export/PMA_ExportTexytext_test.php
M test/classes/plugin/export/PMA_ExportXml_test.php
M test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
M test/classes/schema/Pdf_Relation_Schema_test.php
M test/libraries/common/PMA_showMessage_test_disabled.php
M test/libraries/core/PMA_headerLocation_test.php
M test/libraries/rte/PMA_RTN_getEditorForm_test.php
Log Message:
-----------
Fix coding style
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bd762244ecb2...84f135d048f1
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: bd762244ecb238187c11360fef66102be6d3d31e
https://github.com/phpmyadmin/phpmyadmin/commit/bd762244ecb238187c11360fef6…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-06-03 (Tue, 03 Jun 2014)
Changed paths:
M import.php
M import_status.php
M libraries/mult_submits.inc.php
M libraries/relation.lib.php
M libraries/structure.lib.php
M libraries/tbl_columns_definition_form.lib.php
M test/libraries/PMA_mult_submits_test.php
Log Message:
-----------
Fix coding style
Signed-off-by: Marc Delisle <marc(a)infomarc.info>