Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 2575cccf2dfbb0ca7b7953fe0c4a8e54d1f85b96
https://github.com/phpmyadmin/phpmyadmin/commit/2575cccf2dfbb0ca7b7953fe0c4…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2012-04-25 (Wed, 25 Apr 2012)
Changed paths:
M libraries/dbi/mysqli.dbi.lib.php
Log Message:
-----------
Coding style improvements (Last parameter comment requires a blank newline after it)
Commit: 8efb8624080e9cbda7871498e8823e36444ea594
https://github.com/phpmyadmin/phpmyadmin/commit/8efb8624080e9cbda7871498e88…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2012-04-25 (Wed, 25 Apr 2012)
Changed paths:
M libraries/dbi/mysqli.dbi.lib.php
Log Message:
-----------
More coding style fixes
Commit: a817542fda9d84172ea378cc607156ca5d8c1b42
https://github.com/phpmyadmin/phpmyadmin/commit/a817542fda9d84172ea378cc607…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2012-04-25 (Wed, 25 Apr 2012)
Changed paths:
M libraries/Table.class.php
M libraries/common.lib.php
M server_privileges.php
Log Message:
-----------
Coding style improvements (Closing parenthesis of a multi-line function call must be on a line by itself)
Commit: 50e6f3b387379becc11911ff755f3d54579c69f7
https://github.com/phpmyadmin/phpmyadmin/commit/50e6f3b387379becc11911ff755…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2012-04-25 (Wed, 25 Apr 2012)
Changed paths:
M export.php
M libraries/Config.class.php
M libraries/auth/swekey/swekey.php
M libraries/common.lib.php
M libraries/core.lib.php
M libraries/export/htmlword.php
M libraries/export/odt.php
M libraries/export/texytext.php
M libraries/mult_submits.inc.php
M libraries/rte/rte_list.lib.php
M user_password.php
Log Message:
-----------
Coding style improvements (ControlSignature)
Commit: d6e05d74b5c312c65e20f1a1ac3e5cc9320fd630
https://github.com/phpmyadmin/phpmyadmin/commit/d6e05d74b5c312c65e20f1a1ac3…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2012-04-25 (Wed, 25 Apr 2012)
Changed paths:
M libraries/Config.class.php
M libraries/Table.class.php
M libraries/display_tbl.lib.php
M server_privileges.php
Log Message:
-----------
Various coding style fixes
Commit: 4ff76ff31c08d3a92cc6e08f84794fe9603141f4
https://github.com/phpmyadmin/phpmyadmin/commit/4ff76ff31c08d3a92cc6e08f847…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2012-04-25 (Wed, 25 Apr 2012)
Changed paths:
M libraries/auth/swekey/swekey.php
M libraries/import/sql.php
M libraries/replication.inc.php
M libraries/sysinfo.lib.php
M pmd_relation_new.php
M prefs_manage.php
M server_databases.php
M server_variables.php
M setup/frames/index.inc.php
M tbl_select.php
M tbl_tracking.php
Log Message:
-----------
Coding style improvements (Inline control structures are discouraged)
Commit: 1064ea932d6c57da2093695e1120ce46f3bbdc98
https://github.com/phpmyadmin/phpmyadmin/commit/1064ea932d6c57da2093695e112…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2012-04-25 (Wed, 25 Apr 2012)
Changed paths:
M libraries/auth/swekey/swekey.auth.lib.php
M libraries/auth/swekey/swekey.php
Log Message:
-----------
Coding style fixes
Commit: da0c3bbd1355f0e0b5716bbec5958a09835db517
https://github.com/phpmyadmin/phpmyadmin/commit/da0c3bbd1355f0e0b5716bbec59…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2012-04-25 (Wed, 25 Apr 2012)
Changed paths:
M ChangeLog
M js/tbl_structure.js
M libraries/Table.class.php
M libraries/tbl_properties.inc.php
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/bs.po
M po/ca.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/id.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kk.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/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(a)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(a)latin.po
M po/zh_CN.po
M po/zh_TW.po
M tbl_alter.php
M tbl_structure.php
M test/libraries/rte/PMA_RTN_getDataFromRequest_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_RTN_getQueryFromRequest_test.php
M themes/original/css/theme_right.css.php
M themes/pmahomme/css/theme_right.css.php
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Conflicts:
libraries/Table.class.php
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ad57f68...da0c3bb
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 53221806bdb6bb645f48863e570bf974ea20632b
https://github.com/phpmyadmin/phpmyadmin/commit/53221806bdb6bb645f48863e570…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2012-04-25 (Wed, 25 Apr 2012)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/bs.po
M po/ca.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/id.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kk.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/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(a)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(a)latin.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Refresh .po files
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: b5bca9ce0bf3f481d8204d32354e8893e3c77220
https://github.com/phpmyadmin/phpmyadmin/commit/b5bca9ce0bf3f481d8204d32354…
Author: Jo Michael <me(a)mynetx.net>
Date: 2012-04-09 (Mon, 09 Apr 2012)
Changed paths:
M libraries/Table.class.php
M libraries/tbl_properties.inc.php
M tbl_alter.php
Log Message:
-----------
Move columns in table columns editor
Commit: 2760d808b4076f30ec1afa940fbfbc570d3b86f4
https://github.com/phpmyadmin/phpmyadmin/commit/2760d808b4076f30ec1afa940fb…
Author: Jo Michael <me(a)mynetx.net>
Date: 2012-04-12 (Thu, 12 Apr 2012)
Changed paths:
M ChangeLog
M Documentation.html
M db_structure.php
M gis_data_editor.php
M index.php
M js/OpenStreetMap.js
M js/common.js
M js/config.js
M js/db_operations.js
M js/db_structure.js
M js/export.js
M js/functions.js
M js/gis_data_editor.js
M js/import.js
A js/jquery/jquery-1.6.2.js
R js/jquery/jquery-1.7.2.js
M js/keyhandler.js
M js/makegrid.js
M js/pmd/history.js
M js/pmd/move.js
M js/querywindow.js
M js/rte/common.js
M js/rte/routines.js
M js/server_plugins.js
M js/server_privileges.js
M js/server_status.js
M js/server_status_monitor.js
M js/server_synchronize.js
M js/server_variables.js
M js/sql.js
M js/tbl_change.js
M js/tbl_chart.js
M js/tbl_gis_visualization.js
M js/tbl_relation.js
M js/tbl_select.js
M js/tbl_structure.js
M libraries/Config.class.php
M libraries/PMA.php
M libraries/auth/cookie.auth.lib.php
M libraries/common.inc.php
M libraries/common.lib.php
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/config/user_preferences.forms.php
M libraries/data_drizzle.inc.php
M libraries/data_mysql.inc.php
M libraries/db_info.inc.php
M libraries/db_structure.lib.php
M libraries/display_change_password.lib.php
M libraries/display_create_database.lib.php
M libraries/display_import.lib.php
M libraries/display_select_lang.lib.php
M libraries/display_tbl.lib.php
M libraries/export/htmlword.php
M libraries/export/odt.php
M libraries/export/sql.php
M libraries/export/texytext.php
M libraries/gis/pma_gis_factory.php
M libraries/gis/pma_gis_geometry.php
M libraries/gis/pma_gis_geometrycollection.php
M libraries/gis/pma_gis_linestring.php
M libraries/gis/pma_gis_multilinestring.php
M libraries/gis/pma_gis_multipoint.php
M libraries/gis/pma_gis_multipolygon.php
M libraries/gis/pma_gis_point.php
M libraries/gis/pma_gis_polygon.php
M libraries/gis/pma_gis_visualization.php
M libraries/gis_visualization.lib.php
M libraries/import/shp.php
M libraries/navigation_header.inc.php
M libraries/server_links.inc.php
M libraries/server_variables_doc.php
M libraries/tbl_properties.inc.php
M libraries/user_preferences.lib.php
M navigation.php
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/bs.po
M po/ca.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/id.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kk.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/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(a)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(a)latin.po
M po/zh_CN.po
M po/zh_TW.po
M scripts/create-release.sh
M server_binlog.php
M server_collations.php
M server_databases.php
M server_engines.php
M server_plugins.php
M server_status.php
M server_synchronize.php
M server_variables.php
M setup/frames/index.inc.php
M setup/frames/menu.inc.php
M setup/frames/servers.inc.php
M setup/index.php
M setup/scripts.js
M sql.php
M tbl_alter.php
M tbl_change.php
M tbl_gis_visualization.php
M tbl_operations.php
M tbl_structure.php
M test/bootstrap-dist.php
M test/classes/PMA_Theme_test.php
M test/classes/_data/gen_version_info/info.inc.php
M test/classes/_data/incorrect_theme/info.inc.php
M test/classes/gis/PMA_GIS_Factory_test.php
M test/classes/gis/PMA_GIS_Geom_test.php
M test/classes/gis/PMA_GIS_Geometry_test.php
M test/classes/gis/PMA_GIS_Linestring_test.php
M test/classes/gis/PMA_GIS_Multilinestring_test.php
M test/classes/gis/PMA_GIS_Multipoint_test.php
M test/classes/gis/PMA_GIS_Multipolygon_test.php
M test/classes/gis/PMA_GIS_Point_test.php
M test/classes/gis/PMA_GIS_Polygon_test.php
M test/libraries/PMA_GIS_modifyQuery_test.php
M test/libraries/common/PMA_checkParameters_test.php
M test/theme.php
M themes/original/css/theme_right.css.php
M themes/pmahomme/css/theme_right.css.php
M url.php
M user_password.php
M webapp.php
Log Message:
-----------
Merge branch 'master' into move_columns
Commit: 37ac76c46124b6694a26949df9dd5df38c393f57
https://github.com/phpmyadmin/phpmyadmin/commit/37ac76c46124b6694a26949df9d…
Author: Jo Michael <me(a)mynetx.net>
Date: 2012-04-14 (Sat, 14 Apr 2012)
Changed paths:
M ChangeLog
M js/tbl_structure.js
M tbl_alter.php
M tbl_structure.php
M themes/original/css/theme_right.css.php
M themes/pmahomme/css/theme_right.css.php
Log Message:
-----------
rfe #3517835 [structure] Move columns easily
Commit: 315f2f745455e6c21ac4a99c75dd17078e4c909e
https://github.com/phpmyadmin/phpmyadmin/commit/315f2f745455e6c21ac4a99c75d…
Author: Jo Michael <me(a)mynetx.net>
Date: 2012-04-14 (Sat, 14 Apr 2012)
Changed paths:
M js/tbl_structure.js
Log Message:
-----------
Fixed missing event variable in move_columns dialog Go-button callback
Commit: 75d296af15d43553cbf1fa03ebfb079d0dd5ad7b
https://github.com/phpmyadmin/phpmyadmin/commit/75d296af15d43553cbf1fa03ebf…
Author: Jo Michael <me(a)mynetx.net>
Date: 2012-04-19 (Thu, 19 Apr 2012)
Changed paths:
M tbl_alter.php
Log Message:
-----------
Use PMA_DBI_get_columns_full for moving columns
Commit: cdfe73d17f4fc3a52410dd86866348968271b377
https://github.com/phpmyadmin/phpmyadmin/commit/cdfe73d17f4fc3a52410dd86866…
Author: Jo Michael <me(a)mynetx.net>
Date: 2012-04-22 (Sun, 22 Apr 2012)
Changed paths:
M tbl_alter.php
Log Message:
-----------
Use PMA_Table::generateAlter for moving columns
Commit: 93f918adb49143bc5a767fe0c4a10970eb8dd29a
https://github.com/phpmyadmin/phpmyadmin/commit/93f918adb49143bc5a767fe0c4a…
Author: Jo Michael <me(a)mynetx.net>
Date: 2012-04-23 (Mon, 23 Apr 2012)
Changed paths:
M tbl_alter.php
Log Message:
-----------
Move columns: Test whether Comment field is set
Commit: f76f0920a450a0c124fee86977dd29cc4e81640e
https://github.com/phpmyadmin/phpmyadmin/commit/f76f0920a450a0c124fee86977d…
Author: Jo Michael <me(a)mynetx.net>
Date: 2012-04-23 (Mon, 23 Apr 2012)
Changed paths:
M tbl_alter.php
Log Message:
-----------
Move columns: feed generateAlter with same input as when editing single columns
Commit: 503e45aba5570c41fb4e9bad142f0a59b112cc1f
https://github.com/phpmyadmin/phpmyadmin/commit/503e45aba5570c41fb4e9bad142…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2012-04-25 (Wed, 25 Apr 2012)
Changed paths:
M ChangeLog
M js/tbl_structure.js
M libraries/Table.class.php
M libraries/tbl_properties.inc.php
M tbl_alter.php
M tbl_structure.php
M themes/original/css/theme_right.css.php
M themes/pmahomme/css/theme_right.css.php
Log Message:
-----------
Fix merge conflicts
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d24ae82...503e45a