[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 004f4f: Render HTML content in PMA_displayTableHeaders() f...
Michal Čihař
mcihar at suse.cz
Wed May 23 11:39:36 CEST 2012
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 004f4f5258a0820975e2da9fa02a6d3ba6622368
https://github.com/phpmyadmin/phpmyadmin/commit/004f4f5258a0820975e2da9fa02a6d3ba6622368
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)
Changed paths:
M db_operations.php
M db_search.php
M libraries/common.lib.php
M libraries/display_tbl.lib.php
M libraries/schema/User_Schema.class.php
M pmd_pdf.php
M server_privileges.php
M tbl_operations.php
M tbl_select.php
M tbl_structure.php
M test/libraries/common/PMA_generate_slider_effect_test.php
Log Message:
-----------
Render HTML content in PMA_displayTableHeaders() function at once, in display_tbl.lib.php file
Commit: dfc73d3494445ff9430e5d0b4f33f800c6e480e0
https://github.com/phpmyadmin/phpmyadmin/commit/dfc73d3494445ff9430e5d0b4f33f800c6e480e0
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)
Changed paths:
M db_operations.php
M db_printview.php
M db_search.php
M libraries/PDF.class.php
M libraries/PMA.php
M libraries/auth/config.auth.lib.php
M libraries/auth/cookie.auth.lib.php
M libraries/auth/http.auth.lib.php
M libraries/auth/signon.auth.lib.php
M libraries/common.lib.php
M libraries/config/Form.class.php
M libraries/config/FormDisplay.class.php
M libraries/config/FormDisplay.tpl.php
M libraries/config/config_functions.lib.php
M libraries/config/user_preferences.forms.php
M libraries/display_tbl.lib.php
M libraries/schema/User_Schema.class.php
M pmd_pdf.php
M server_privileges.php
M tbl_operations.php
M tbl_printview.php
M tbl_select.php
M tbl_structure.php
R test/libraries/common/PMA_display_html_checkbox_test.php
A test/libraries/common/PMA_getCheckbox_test.php
Log Message:
-----------
Resolved conflicts after merge
Commit: 527de32834d22522b7e16936d5676359a0083c29
https://github.com/phpmyadmin/phpmyadmin/commit/527de32834d22522b7e16936d5676359a0083c29
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)
Changed paths:
M libraries/gis/pma_gis_multipoint.php
M po/bg.po
M po/et.po
M po/it.po
M po/si.po
M po/sv.po
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 77cd55796b940258b35d0f1244edd2f212460688
https://github.com/phpmyadmin/phpmyadmin/commit/77cd55796b940258b35d0f1244edd2f212460688
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)
Changed paths:
M libraries/db_common.inc.php
M libraries/db_info.inc.php
M libraries/header_printview.inc.php
M libraries/header_scripts.inc.php
M libraries/server_common.inc.php
M libraries/tbl_common.inc.php
M libraries/tbl_info.inc.php
M libraries/tbl_properties.inc.php
M libraries/tbl_replace_fields.inc.php
M phpmyadmin.css.php
M tbl_printview.php
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 071e04da29c6af79d5ebea844b10cba3e6e63f92
https://github.com/phpmyadmin/phpmyadmin/commit/071e04da29c6af79d5ebea844b10cba3e6e63f92
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)
Changed paths:
M libraries/common.lib.php
M libraries/display_tbl.lib.php
Log Message:
-----------
Fix the indentation issues of some functions
Commit: 7ac4b4b8227b8cb601e0e79af5bd0c9a1ab104c7
https://github.com/phpmyadmin/phpmyadmin/commit/7ac4b4b8227b8cb601e0e79af5bd0c9a1ab104c7
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-09 (Wed, 09 May 2012)
Changed paths:
M export.php
M file_echo.php
M libraries/Config.class.php
M libraries/Theme.class.php
M libraries/Types.class.php
M libraries/auth/cookie.auth.lib.php
M libraries/common.inc.php
M libraries/common.lib.php
M libraries/config/messages.inc.php
M libraries/core.lib.php
M libraries/header_http.inc.php
M libraries/header_meta_style.inc.php
M libraries/select_lang.lib.php
M libraries/string.lib.php
M libraries/string_mb.lib.php
M libraries/string_native.lib.php
M libraries/string_type_ctype.lib.php
M libraries/string_type_native.lib.php
M libraries/sysinfo.lib.php
M libraries/tbl_common.inc.php
M libraries/tbl_info.inc.php
M libraries/tbl_properties.inc.php
M libraries/tbl_replace_fields.inc.php
M libraries/tbl_select.lib.php
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be at 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 at 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 at latin.po
M po/zh_CN.po
M po/zh_TW.po
M setup/frames/form.inc.php
M setup/index.php
M setup/lib/common.inc.php
M setup/validate.php
M tbl_select.php
M tbl_zoom_select.php
M test/theme.php
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: e8a35a14cd7e1d870a501246394a70e8cedee385
https://github.com/phpmyadmin/phpmyadmin/commit/e8a35a14cd7e1d870a501246394a70e8cedee385
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-09 (Wed, 09 May 2012)
Changed paths:
M libraries/display_tbl.lib.php
Log Message:
-----------
Some modifications including reduce echo renderings in PMA_displayVerticalTable function in display_tbl.lib.php file
Commit: 29cc2fab386d5cdb2796736679aa55033f2164bc
https://github.com/phpmyadmin/phpmyadmin/commit/29cc2fab386d5cdb2796736679aa55033f2164bc
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-10 (Thu, 10 May 2012)
Changed paths:
M libraries/display_tbl.lib.php
Log Message:
-----------
Some modifications to PMA_displayTableBody function in display_tbl.lib.php to reduce echo renderings
Commit: e59302d3c81a99ad01ec82ca3d87c7fb22f9e17a
https://github.com/phpmyadmin/phpmyadmin/commit/e59302d3c81a99ad01ec82ca3d87c7fb22f9e17a
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-10 (Thu, 10 May 2012)
Changed paths:
M libraries/Types.class.php
M libraries/common.lib.php
M libraries/rte/rte_routines.lib.php
M po/cs.po
M po/tr.po
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 57723b6b764d08f0d0cf0decd97540869acbff98
https://github.com/phpmyadmin/phpmyadmin/commit/57723b6b764d08f0d0cf0decd97540869acbff98
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-10 (Thu, 10 May 2012)
Changed paths:
M libraries/display_tbl.lib.php
Log Message:
-----------
Reduce HTML echo renderings in PMA_displayResultsOperations function
Commit: 61360750cacb245ef61b62f0134788af7bd8295b
https://github.com/phpmyadmin/phpmyadmin/commit/61360750cacb245ef61b62f0134788af7bd8295b
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-10 (Thu, 10 May 2012)
Changed paths:
M libraries/common.lib.php
Log Message:
-----------
Modified some functions in common.lib.php file
Commit: bf15800089d11e83dc7998e5064dafcf2280c118
https://github.com/phpmyadmin/phpmyadmin/commit/bf15800089d11e83dc7998e5064dafcf2280c118
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-11 (Fri, 11 May 2012)
Changed paths:
M db_create.php
M db_operations.php
M db_tracking.php
M js/db_operations.js
M js/server_privileges.js
M js/tbl_change.js
M libraries/Menu.class.php
M libraries/common.lib.php
M libraries/display_tbl.lib.php
M libraries/rte/rte_events.lib.php
M libraries/rte/rte_routines.lib.php
M libraries/rte/rte_triggers.lib.php
M main.php
M server_binlog.php
M server_databases.php
M server_privileges.php
M sql.php
M tbl_addfield.php
M tbl_alter.php
M tbl_change.php
M tbl_export.php
M tbl_indexes.php
M tbl_move_copy.php
M tbl_operations.php
M tbl_relation.php
M tbl_replace.php
M tbl_structure.php
M tbl_tracking.php
M test/libraries/common/PMA_generate_html_dropdown_test.php
M test/libraries/common/PMA_showMessage_test_disabled.php
M user_password.php
M view_create.php
M view_operations.php
Log Message:
-----------
Remove HTML rendering inside the functions in display_tbl.lib.php file itselves
Commit: 5a4432a232d7e5559184a00fa50c7a59b4a439d5
https://github.com/phpmyadmin/phpmyadmin/commit/5a4432a232d7e5559184a00fa50c7a59b4a439d5
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-11 (Fri, 11 May 2012)
Changed paths:
M libraries/Table.class.php
M libraries/Tracker.class.php
M libraries/common.lib.php
M libraries/config/FormDisplay.class.php
M libraries/config/FormDisplay.tpl.php
M libraries/display_tbl.lib.php
M libraries/user_preferences.lib.php
M libraries/zip.lib.php
M libraries/zip_extension.lib.php
M po/bg.po
M po/es.po
M po/ja.po
M po/pt_BR.po
M po/sl.po
M setup/frames/index.inc.php
M setup/lib/index.lib.php
M tbl_addfield.php
M tbl_alter.php
M tbl_create.php
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 40d0ada69bed5856d75d6b67bb3fc0a1e1df943c
https://github.com/phpmyadmin/phpmyadmin/commit/40d0ada69bed5856d75d6b67bb3fc0a1e1df943c
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-11 (Fri, 11 May 2012)
Changed paths:
M libraries/display_tbl.lib.php
Log Message:
-----------
Modified the function PMA_displayTableBody
Commit: dd237eb9243dee3d2fcca7a65e338ab9938137c7
https://github.com/phpmyadmin/phpmyadmin/commit/dd237eb9243dee3d2fcca7a65e338ab9938137c7
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-13 (Sun, 13 May 2012)
Changed paths:
M libraries/Config.class.php
M libraries/File.class.php
M libraries/List_Database.class.php
M libraries/Menu.class.php
M libraries/auth/cookie.auth.lib.php
M libraries/common.lib.php
M libraries/core.lib.php
M libraries/database_interface.lib.php
M libraries/db_info.inc.php
M libraries/display_tbl.lib.php
M libraries/export/sql.php
M libraries/pmd_common.php
M libraries/schema/User_Schema.class.php
M libraries/tbl_properties.inc.php
M libraries/user_preferences.inc.php
M pmd_general.php
M pmd_relation_new.php
M pmd_relation_upd.php
M po/fr.po
M po/pt.po
M querywindow.php
M server_privileges.php
M tbl_change.php
M tbl_relation.php
M tbl_select.php
M tbl_structure.php
M tbl_tracking.php
M test/classes/PMA_Config_test.php
M test/classes/PMA_Theme_test.php
A test/libraries/common/PMA_GetDropdown_test.php
M test/libraries/common/PMA_contains_nonprintable_ascii_test.php
M test/libraries/common/PMA_convert_bit_default_value_test.php
R test/libraries/common/PMA_display_html_radio_test.php
M test/libraries/common/PMA_escapeMySqlWildcards_test.php
M test/libraries/common/PMA_foreignKeySupported_test.php
R test/libraries/common/PMA_generate_html_dropdown_test.php
R test/libraries/common/PMA_generate_slider_effect_test.php
M test/libraries/common/PMA_getCheckbox_test.php
A test/libraries/common/PMA_getDivForSliderEffect_test.php
A test/libraries/common/PMA_getRadioFields_test.php
M test/libraries/common/PMA_printableBitValue_test.php
M test/libraries/common/PMA_stringOperations_test.php
M test/libraries/core/PMA_headerLocation_test_disabled.php
M test/theme.php
Log Message:
-----------
Resolve conflicts due to changes in method names of common.lib.php
Commit: f04a4f8989ff3204eda8a18f00735acfae1385cb
https://github.com/phpmyadmin/phpmyadmin/commit/f04a4f8989ff3204eda8a18f00735acfae1385cb
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-13 (Sun, 13 May 2012)
Changed paths:
M libraries/Error.class.php
M libraries/Error_Handler.class.php
M libraries/Index.class.php
M libraries/List.class.php
M libraries/List_Database.class.php
M libraries/Message.class.php
M libraries/Table.class.php
M libraries/common.lib.php
M libraries/core.lib.php
M libraries/database_interface.lib.php
M libraries/db_common.inc.php
M libraries/display_git_revision.lib.php
M libraries/display_import_ajax.lib.php
M po/ja.po
M po/si.po
M po/sv.po
M test/libraries/common/PMA_getDivForSliderEffect_test.php
Log Message:
-----------
Resolve conflicts due to changes in some method names
Commit: 30d57ff2d4df0a5e5ea6f3eeae9a091f08e09681
https://github.com/phpmyadmin/phpmyadmin/commit/30d57ff2d4df0a5e5ea6f3eeae9a091f08e09681
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-14 (Mon, 14 May 2012)
Changed paths:
R test/libraries/common/PMA_GetDropdown_test.php
M test/libraries/common/PMA_getDivForSliderEffect_test.php
A test/libraries/common/PMA_getDropdown_test.php
M test/libraries/common/PMA_getRadioFields_test.php
Log Message:
-----------
Improved some test cases for modified functions in common.lib.php
Commit: 7092aa4e9963c2a82a35d4a604d050e0a129d0fa
https://github.com/phpmyadmin/phpmyadmin/commit/7092aa4e9963c2a82a35d4a604d050e0a129d0fa
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-14 (Mon, 14 May 2012)
Changed paths:
M db_printview.php
M libraries/Theme.class.php
M libraries/header_meta_style.inc.php
M libraries/header_printview.inc.php
M po/bg.po
M po/et.po
M po/ja.po
M print.css
M sql.php
M tbl_printview.php
R themes/original/css/theme_print.css.php
M themes/original/css/theme_right.css.php
R themes/pmahomme/css/theme_print.css.php
M themes/pmahomme/css/theme_right.css.php
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 6f6294add54af87d82b184b259cd42259ca96ef4
https://github.com/phpmyadmin/phpmyadmin/commit/6f6294add54af87d82b184b259cd42259ca96ef4
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-14 (Mon, 14 May 2012)
Changed paths:
M libraries/display_tbl.lib.php
Log Message:
-----------
Readbility improvements for display_tbl.lib.php file
Commit: b3bcc875010838b874e82bc6ab7972027be913aa
https://github.com/phpmyadmin/phpmyadmin/commit/b3bcc875010838b874e82bc6ab7972027be913aa
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-14 (Mon, 14 May 2012)
Changed paths:
M .gitignore
M libraries/Config.class.php
M libraries/common.lib.php
M libraries/sql_query_form.lib.php
M tbl_change.php
M test/classes/Advisor_test.php
M test/classes/PMA_Config_test.php
R test/libraries/common/PMA_displayMaximumUploadSize_test.php
A test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
A test/test_data/config.inc.php
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 27cc0c173ea66a5a26d55b044d1d5a8867697056
https://github.com/phpmyadmin/phpmyadmin/commit/27cc0c173ea66a5a26d55b044d1d5a8867697056
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-15 (Tue, 15 May 2012)
Changed paths:
M ChangeLog
M libraries/config/validate.lib.php
M libraries/display_change_password.lib.php
M libraries/header_http.inc.php
M libraries/select_lang.lib.php
A po/ckb.po
M po/cs.po
M po/pl.po
M po/pt.po
M po/ro.po
M test/classes/PMA_Message_test.php
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 6ce9e614f75dac1ad69f8607027cd8ad6c351092
https://github.com/phpmyadmin/phpmyadmin/commit/6ce9e614f75dac1ad69f8607027cd8ad6c351092
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-15 (Tue, 15 May 2012)
Changed paths:
M libraries/display_tbl.lib.php
Log Message:
-----------
Some readability improvements for display_tbl.lib.php file
Commit: 16f185de1866f9a1ff45f9929570e26db25bf101
https://github.com/phpmyadmin/phpmyadmin/commit/16f185de1866f9a1ff45f9929570e26db25bf101
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-16 (Wed, 16 May 2012)
Changed paths:
M libraries/display_tbl.lib.php
Log Message:
-----------
Reduce code repetition in PMA_getVerticalTable function in display_tbl.lib.php, by introducing new functions
Commit: 9b49f3c9c41a1ebbccec86a538c4e2d25560b5a4
https://github.com/phpmyadmin/phpmyadmin/commit/9b49f3c9c41a1ebbccec86a538c4e2d25560b5a4
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-16 (Wed, 16 May 2012)
Changed paths:
M po/bg.po
M po/ckb.po
M po/pt.po
M tbl_zoom_select.php
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 66ff2e65550e56654b5cb03932f334e4d3963456
https://github.com/phpmyadmin/phpmyadmin/commit/66ff2e65550e56654b5cb03932f334e4d3963456
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-16 (Wed, 16 May 2012)
Changed paths:
M libraries/display_tbl.lib.php
Log Message:
-----------
PMA_getTableNavigation function break into sub functions
Commit: 84295c85fb21dad9d5809156d7bce9e6772048bb
https://github.com/phpmyadmin/phpmyadmin/commit/84295c85fb21dad9d5809156d7bce9e6772048bb
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-17 (Thu, 17 May 2012)
Changed paths:
M libraries/display_tbl.lib.php
Log Message:
-----------
PMA_getTable function breaked into sub functions
Commit: 871f19db672f7dc537e70dc3fc7d33db69a66e0d
https://github.com/phpmyadmin/phpmyadmin/commit/871f19db672f7dc537e70dc3fc7d33db69a66e0d
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-17 (Thu, 17 May 2012)
Changed paths:
M js/navigation.js
M libraries/common.lib.php
M libraries/config.default.php
M libraries/config/ConfigFile.class.php
M libraries/config/Form.class.php
M libraries/config/FormDisplay.class.php
M libraries/config/messages.inc.php
M libraries/config/user_preferences.forms.php
M navigation.php
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be at 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/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 at 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 at latin.po
M po/zh_CN.po
M po/zh_TW.po
M scripts/compress-js
R scripts/google-javascript-compiler/COPYING
R scripts/google-javascript-compiler/README
R scripts/google-javascript-compiler/compiler.jar
M setup/frames/index.inc.php
M setup/index.php
M setup/styles.css
M themes/original/css/theme_left.css.php
M themes/pmahomme/css/theme_left.css.php
Log Message:
-----------
Resolved conflicts in common.lib.php
Commit: be2dceb16471a2ffb69e0af48449277ea64fe89d
https://github.com/phpmyadmin/phpmyadmin/commit/be2dceb16471a2ffb69e0af48449277ea64fe89d
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-19 (Sat, 19 May 2012)
Changed paths:
M libraries/display_tbl.lib.php
Log Message:
-----------
PMA_getTableBody function break into sub functions
Commit: a4756a0098f55fe906909384997cdb6dfd0a221e
https://github.com/phpmyadmin/phpmyadmin/commit/a4756a0098f55fe906909384997cdb6dfd0a221e
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-19 (Sat, 19 May 2012)
Changed paths:
M Documentation.html
M browse_foreigners.php
M libraries/List_Database.class.php
M libraries/Theme.class.php
M libraries/Theme_Manager.class.php
M libraries/common.inc.php
M libraries/config.default.php
M libraries/database_interface.lib.php
M libraries/header_meta_style.inc.php
M libraries/mult_submits.inc.php
M navigation.php
M phpmyadmin.css.php
M po/bg.po
M po/ckb.po
M po/et.po
M po/ru.po
M po/sl.po
M po/sv.po
M test/theme.php
A themes/original/css/common.css.php
A themes/original/css/navigation.css.php
R themes/original/css/theme_left.css.php
R themes/original/css/theme_right.css.php
A themes/pmahomme/css/common.css.php
A themes/pmahomme/css/enum_editor.css.php
A themes/pmahomme/css/gis.css.php
A themes/pmahomme/css/navigation.css.php
A themes/pmahomme/css/pmd.css.php
A themes/pmahomme/css/rte.css.php
R themes/pmahomme/css/theme_left.css.php
R themes/pmahomme/css/theme_right.css.php
M themes/sprites.css.php
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: f26fdd82cab33c9257578ab2ece7b634ddc78601
https://github.com/phpmyadmin/phpmyadmin/commit/f26fdd82cab33c9257578ab2ece7b634ddc78601
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-20 (Sun, 20 May 2012)
Changed paths:
M libraries/display_tbl.lib.php
Log Message:
-----------
PMA_getTableHeaders function break into sub functions
Commit: 41d079ec5d875474863223aa560c83ba8d1bd767
https://github.com/phpmyadmin/phpmyadmin/commit/41d079ec5d875474863223aa560c83ba8d1bd767
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-21 (Mon, 21 May 2012)
Changed paths:
M libraries/display_tbl.lib.php
Log Message:
-----------
remove commented out code from display_tbl.lib.php
Commit: 2a5961c43a52d6b6650df7c79aceaa5c56651d5c
https://github.com/phpmyadmin/phpmyadmin/commit/2a5961c43a52d6b6650df7c79aceaa5c56651d5c
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-05-21 (Mon, 21 May 2012)
Changed paths:
M libraries/database_interface.lib.php
M po/ckb.po
M po/fi.po
M po/ja.po
M po/pt_BR.po
M po/ru.po
M po/sv.po
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 3d8c3b2d5fb1ce48892eab7a84e0186e9938c87a
https://github.com/phpmyadmin/phpmyadmin/commit/3d8c3b2d5fb1ce48892eab7a84e0186e9938c87a
Author: Michal Čihař <mcihar at suse.cz>
Date: 2012-05-23 (Wed, 23 May 2012)
Changed paths:
M db_create.php
M db_operations.php
M db_search.php
M db_tracking.php
M js/db_operations.js
M js/server_privileges.js
M js/tbl_change.js
M libraries/Menu.class.php
M libraries/common.lib.php
M libraries/display_tbl.lib.php
M libraries/rte/rte_events.lib.php
M libraries/rte/rte_routines.lib.php
M libraries/rte/rte_triggers.lib.php
M libraries/schema/User_Schema.class.php
M main.php
M pmd_pdf.php
M server_binlog.php
M server_databases.php
M server_privileges.php
M sql.php
M tbl_addfield.php
M tbl_alter.php
M tbl_change.php
M tbl_export.php
M tbl_indexes.php
M tbl_move_copy.php
M tbl_operations.php
M tbl_relation.php
M tbl_replace.php
M tbl_select.php
M tbl_structure.php
M tbl_tracking.php
R test/libraries/common/PMA_display_html_radio_test.php
R test/libraries/common/PMA_generate_html_dropdown_test.php
R test/libraries/common/PMA_generate_slider_effect_test.php
M test/libraries/common/PMA_getCheckbox_test.php
A test/libraries/common/PMA_getDivForSliderEffect_test.php
A test/libraries/common/PMA_getDropdown_test.php
A test/libraries/common/PMA_getRadioFields_test.php
M test/libraries/common/PMA_showMessage_test_disabled.php
M user_password.php
M view_create.php
M view_operations.php
Log Message:
-----------
Merge remote-tracking branch 'chanaka/master'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c4d0dad...3d8c3b2
More information about the Git
mailing list