Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: e5519859fb11c1dfcc0de6d9fc1156f77fdec2ed
https://github.com/phpmyadmin/phpmyadmin/commit/e5519859fb11c1dfcc0de6d9fc1…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M browse_foreigners.php
M libraries/DisplayResults.class.php
A libraries/String.class.php
M libraries/StringCType.class.php
M libraries/StringMB.class.php
M libraries/StringNative.class.php
M libraries/StringNativeType.class.php
M libraries/Util.class.php
M libraries/common.inc.php
M libraries/operations.lib.php
M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
M libraries/relation.lib.php
M libraries/server_bin_log.lib.php
M libraries/sqlparser.lib.php
A libraries/string.inc.php
R libraries/string.lib.php
R test/libraries/PMA_STR_sub_test.php
M test/libraries/PMA_string_test.php
Log Message:
-----------
Make all string function accessible via $GLOBALS['PMA_String']
Commit: 6d2d17e575675028090062c0c99e4893ea75fa44
https://github.com/phpmyadmin/phpmyadmin/commit/6d2d17e575675028090062c0c99…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M ChangeLog
M db_export.php
M db_qbe.php
M export.php
M import_status.php
M js/chart.js
M js/rte.js
M js/server_status_monitor.js
M js/sql.js
M js/tbl_zoom_plot_jqplot.js
M libraries/Advisor.class.php
M libraries/DisplayResults.class.php
M libraries/Menu.class.php
M libraries/Util.class.php
M libraries/advisory_rules.txt
M libraries/config.default.php
M libraries/config.values.php
M libraries/core.lib.php
A libraries/display_export.inc.php
M libraries/display_export.lib.php
M libraries/import.lib.php
M libraries/mult_submits.inc.php
M libraries/operations.lib.php
M libraries/plugins/auth/AuthenticationConfig.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/auth/AuthenticationHttp.class.php
M libraries/plugins/auth/AuthenticationSignon.class.php
M libraries/plugins/export/ExportSql.class.php
M libraries/relation.lib.php
M libraries/schema/User_Schema.class.php
M libraries/select_lang.lib.php
M libraries/sql.lib.php
M libraries/sqlparser.lib.php
M libraries/sysinfo.lib.php
M phpunit.xml.dist
M pmd_display_field.php
M po/ckb.po
M po/gl.po
M po/hr.po
M po/pt.po
M po/pt_BR.po
M po/sv.po
A po/vls.po
M schema_export.php
M server_export.php
M server_plugins.php
M sql.php
M tbl_export.php
M tbl_row_action.php
M tbl_select.php
M tbl_structure.php
M test/bootstrap-dist.php
M test/classes/PMA_TableSearch_test.php
M test/classes/PMA_Table_test.php
A test/classes/plugin/PMA_PluginManager_test.php
A test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
A test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
A test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
A test/classes/plugin/auth/PMA_AuthenticationSignon_test.php
M test/classes/plugin/import/ImportOds_test.php
M test/classes/plugin/transformations/Image_JPEG_Inline_test.php
M test/classes/plugin/transformations/Image_Link_test.php
M test/classes/plugin/transformations/Image_PNG_Inline_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_Formatted_test.php
M test/classes/plugin/transformations/Text_Plain_Hex_test.php
M test/classes/plugin/transformations/Text_Plain_Imagelink_test.php
M test/classes/plugin/transformations/Text_Plain_Link_test.php
A test/classes/properties/PMA_PorpertyItem_test.php
A test/classes/properties/options/PMA_OptionsPropertyGroup_test.php
A test/classes/properties/options/PMA_OptionsPropertyItem_test.php
A test/classes/properties/options/PMA_OptionsPropertyOneItem_test.php
A test/classes/properties/options/groups/PMA_OptionsPropertyMainGroup_test.php
A test/classes/properties/options/groups/PMA_OptionsPropertyRootGroup_test.php
A test/classes/properties/options/groups/PMA_OptionsPropertySubgroup_test.php
A test/classes/properties/options/items/PMA_PropertyItems_test.php
A test/classes/properties/plugins/PMA_ExportPluginProperties_test.php
A test/classes/properties/plugins/PMA_ImportPluginProperties_test.php
A test/classes/properties/plugins/PMA_PluginPorpertyItem_test.php
M test/classes/schema/Dia_Relation_Schema_test.php
M test/classes/schema/Eps_Relation_Schema_test.php
M test/classes/schema/Pdf_Relation_Schema_test.php
M test/classes/schema/Svg_Relation_Schema_test.php
M test/libraries/PMA_FormDisplay_tpl_test.php
A test/libraries/PMA_SQL_parse_analyze_test.php
M test/libraries/PMA_SQL_parser_test.php
A test/libraries/PMA_display_export_test.php
M test/libraries/PMA_mysql_charsets_test.php
A test/libraries/PMA_relation_cleanup_test.php
M test/libraries/PMA_relation_test.php
A test/libraries/PMA_server_status_test.php
M test/libraries/PMA_user_preferences_test.php
M themes/.gitignore
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Merge branch 'master' into pma_string
Commit: 37233934a4442f1a912a9463d5143b30e3601e95
https://github.com/phpmyadmin/phpmyadmin/commit/37233934a4442f1a912a9463d51…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M libraries/StringNativeType.class.php
Log Message:
-----------
Use $this to refer to the instance
Commit: bce4e73452a425c9e3f1143893a1f790c39e6932
https://github.com/phpmyadmin/phpmyadmin/commit/bce4e73452a425c9e3f1143893a…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M libraries/StringNativeType.class.php
Log Message:
-----------
Simplify
Commit: 841ae562e33d66e9f982cfd5540c184a1a317aeb
https://github.com/phpmyadmin/phpmyadmin/commit/841ae562e33d66e9f982cfd5540…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M libraries/String.class.php
A libraries/StringAbstractType.class.php
M libraries/StringCType.class.php
M libraries/StringNativeType.class.php
Log Message:
-----------
Do not access $GLOBALS['PMA_String'] from StringNativeType class
Commit: a025dc7d2a72e4d410f5d25874db30dd32256bc5
https://github.com/phpmyadmin/phpmyadmin/commit/a025dc7d2a72e4d410f5d25874d…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M libraries/String.class.php
M libraries/StringAbstractType.class.php
A libraries/StringByte.int.php
M libraries/StringCType.class.php
M libraries/StringMB.class.php
M libraries/StringNative.class.php
M libraries/StringNativeType.class.php
A libraries/StringType.int.php
Log Message:
-----------
Move interfaces into files of their own
Commit: dcfeeafe3b176e4b36165de8c3b43046bfdc751e
https://github.com/phpmyadmin/phpmyadmin/commit/dcfeeafe3b176e4b36165de8c3b…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M test/libraries/PMA_StringCType_test.php
M test/libraries/PMA_StringMB_test.php
M test/libraries/PMA_StringNativeType_test.php
M test/libraries/PMA_StringNative_test.php
Log Message:
-----------
Update test cases
Commit: 09f1e0cb97bfa5fa196b66dc7f5919a086d6658e
https://github.com/phpmyadmin/phpmyadmin/commit/09f1e0cb97bfa5fa196b66dc7f5…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M test/libraries/PMA_StringMB_test.php
Log Message:
-----------
Fix typo
Commit: 6df3c0adb58c632e6cfd092f11199beb8e8311c4
https://github.com/phpmyadmin/phpmyadmin/commit/6df3c0adb58c632e6cfd092f111…
Author: Michal ÄŒihaÅ™ <michal(a)cihar.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M browse_foreigners.php
M libraries/DisplayResults.class.php
A libraries/String.class.php
A libraries/StringAbstractType.class.php
A libraries/StringByte.int.php
M libraries/StringCType.class.php
M libraries/StringMB.class.php
M libraries/StringNative.class.php
M libraries/StringNativeType.class.php
A libraries/StringType.int.php
M libraries/Util.class.php
M libraries/common.inc.php
M libraries/operations.lib.php
M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
M libraries/relation.lib.php
M libraries/server_bin_log.lib.php
M libraries/sqlparser.lib.php
A libraries/string.inc.php
R libraries/string.lib.php
R test/libraries/PMA_STR_sub_test.php
M test/libraries/PMA_StringCType_test.php
M test/libraries/PMA_StringMB_test.php
M test/libraries/PMA_StringNativeType_test.php
M test/libraries/PMA_StringNative_test.php
M test/libraries/PMA_string_test.php
Log Message:
-----------
Merge pull request #543 from madhuracj/pma_string
Pma string
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/627ed59770db...6df3c0adb58c
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 342e0a6b33ec1ce5d76feaa44c87689de55762d4
https://github.com/phpmyadmin/phpmyadmin/commit/342e0a6b33ec1ce5d76feaa44c8…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-20 (Sat, 20 Jul 2013)
Changed paths:
M config.sample.inc.php
M doc/config.rst
M examples/config.manyhosts.inc.php
M examples/create_tables.sql
M examples/create_tables_drizzle.sql
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/relation.lib.php
Log Message:
-----------
Configuration values for hide/unhide navigation items feature
Commit: 66d01fcffb40eecde04bcb35119b2011f42626e9
https://github.com/phpmyadmin/phpmyadmin/commit/66d01fcffb40eecde04bcb35119…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-20 (Sat, 20 Jul 2013)
Changed paths:
M examples/create_tables.sql
M examples/create_tables_drizzle.sql
M js/navigation.js
M libraries/navigation/NavigationTree.class.php
M libraries/navigation/Nodes/Node.class.php
M libraries/navigation/Nodes/Node_Database.class.php
M libraries/navigation/Nodes/Node_Table.class.php
M navigation.php
M themes/original/css/navigation.css.php
M themes/pmahomme/css/navigation.css.php
Log Message:
-----------
Hide tables in navigation tree
Commit: 1282a3877f5459278399f621f65fe7ecef08da26
https://github.com/phpmyadmin/phpmyadmin/commit/1282a3877f5459278399f621f65…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M js/messages.php
M js/navigation.js
M libraries/navigation/Navigation.class.php
M libraries/navigation/NavigationTree.class.php
M libraries/navigation/Nodes/Node.class.php
M libraries/navigation/Nodes/Node_Database.class.php
M libraries/navigation/Nodes/Node_Table.class.php
M navigation.php
M themes/original/css/navigation.css.php
A themes/original/img/b_undo.png
M themes/pmahomme/css/navigation.css.php
A themes/pmahomme/img/b_undo.png
Log Message:
-----------
Add a dialog to unhide hidden navigation tree items
Commit: f540551bbab35af07647ba4c87859ad33fb5bb7b
https://github.com/phpmyadmin/phpmyadmin/commit/f540551bbab35af07647ba4c878…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M js/navigation.js
Log Message:
-----------
Fix alignment
Commit: 18b2472580d661d4198028d3066234ab569b9b0f
https://github.com/phpmyadmin/phpmyadmin/commit/18b2472580d661d4198028d3066…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M libraries/navigation/Nodes/Node.class.php
Log Message:
-----------
Remove not used method
Commit: 56b5c8e294bc7b8a91eed65b641b7f71e2e45e3f
https://github.com/phpmyadmin/phpmyadmin/commit/56b5c8e294bc7b8a91eed65b641…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M js/navigation.js
M libraries/navigation/Navigation.class.php
M libraries/navigation/Nodes/Node_Database.class.php
M libraries/navigation/Nodes/Node_Event.class.php
M libraries/navigation/Nodes/Node_Function.class.php
M libraries/navigation/Nodes/Node_Procedure.class.php
M libraries/navigation/Nodes/Node_Table.class.php
M libraries/navigation/Nodes/Node_View.class.php
Log Message:
-----------
Extend navigation tree item hiding to functions. procedures, events and views
Commit: ab50075e1c5eb8fb5cee145cf8b2804c40d9d451
https://github.com/phpmyadmin/phpmyadmin/commit/ab50075e1c5eb8fb5cee145cf8b…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M libraries/navigation/Navigation.class.php
Log Message:
-----------
Style improvements to the unhide nav items dialog
Commit: 3a52378fa8f1ef7890e302c3bab6e8d49790e266
https://github.com/phpmyadmin/phpmyadmin/commit/3a52378fa8f1ef7890e302c3bab…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M js/navigation.js
Log Message:
-----------
Add back the exporting feature
Commit: 72c775556a345e922097852af7b05bbb9d4054ec
https://github.com/phpmyadmin/phpmyadmin/commit/72c775556a345e922097852af7b…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M libraries/relation.lib.php
Log Message:
-----------
Fix typo
Commit: 6d14bb1147e5711ce6aacdd413ab8d64f6c6d461
https://github.com/phpmyadmin/phpmyadmin/commit/6d14bb1147e5711ce6aacdd413a…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M libraries/navigation/Nodes/Node_Database.class.php
Log Message:
-----------
Simplify query execution
Commit: a715441a07a44cd96fbe7ee884c2d424b1437acc
https://github.com/phpmyadmin/phpmyadmin/commit/a715441a07a44cd96fbe7ee884c…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M libraries/navigation/Navigation.class.php
Log Message:
-----------
Escape navigation tree item names
Commit: 0b702a9943b4cf05e40f6743b9535f102a2cc72d
https://github.com/phpmyadmin/phpmyadmin/commit/0b702a9943b4cf05e40f6743b95…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M ChangeLog
M db_export.php
M js/sql.js
M js/tbl_zoom_plot_jqplot.js
M libraries/DisplayResults.class.php
A libraries/display_export.inc.php
M libraries/display_export.lib.php
M libraries/import.lib.php
M libraries/mult_submits.inc.php
M libraries/select_lang.lib.php
M libraries/sql.lib.php
M po/pt.po
M po/sv.po
A po/vls.po
M server_export.php
M server_plugins.php
M sql.php
M tbl_export.php
M tbl_row_action.php
M tbl_select.php
M test/classes/PMA_TableSearch_test.php
M test/classes/PMA_Table_test.php
M test/classes/schema/Dia_Relation_Schema_test.php
M test/classes/schema/Eps_Relation_Schema_test.php
M test/classes/schema/Pdf_Relation_Schema_test.php
M test/classes/schema/Svg_Relation_Schema_test.php
M test/libraries/PMA_relation_test.php
Log Message:
-----------
Merge branch 'master' into hideTables
Commit: 4f0f77390b67fac3ca8f2da7cd63605ee81ad9d8
https://github.com/phpmyadmin/phpmyadmin/commit/4f0f77390b67fac3ca8f2da7cd6…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Add ChangeLog entry for rfe #1385 - Hide tables, functions, procedures, events and views in navigation tree
Commit: dd39bdd717071eb573087b169a6fc01ed51a8f68
https://github.com/phpmyadmin/phpmyadmin/commit/dd39bdd717071eb573087b169a6…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-24 (Wed, 24 Jul 2013)
Changed paths:
M doc/config.rst
M js/messages.php
M js/navigation.js
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/navigation/Navigation.class.php
M libraries/navigation/Nodes/Node_Database.class.php
M libraries/relation.lib.php
Log Message:
-----------
Use 'show' instead of 'unhide' in messages and method comments
Commit: cb7c597e01296db774073b1154c85053e8dec5b4
https://github.com/phpmyadmin/phpmyadmin/commit/cb7c597e01296db774073b1154c…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-24 (Wed, 24 Jul 2013)
Changed paths:
M libraries/config/messages.inc.php
Log Message:
-----------
Improve message
Commit: 1ae59ad0630e149cd397f94aabcd0ad6ee881814
https://github.com/phpmyadmin/phpmyadmin/commit/1ae59ad0630e149cd397f94aabc…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-24 (Wed, 24 Jul 2013)
Changed paths:
M ChangeLog
M config.sample.inc.php
M db_export.php
M doc/config.rst
M examples/config.manyhosts.inc.php
M examples/create_tables.sql
M js/sql.js
M js/tbl_zoom_plot_jqplot.js
M libraries/DisplayResults.class.php
A libraries/display_export.inc.php
M libraries/display_export.lib.php
M libraries/import.lib.php
M libraries/mult_submits.inc.php
M libraries/navigation/Navigation.class.php
M libraries/navigation/Nodes/Node_Database.class.php
M libraries/relation.lib.php
M libraries/select_lang.lib.php
M libraries/sql.lib.php
M po/pt.po
M po/sv.po
A po/vls.po
M server_export.php
M server_plugins.php
M sql.php
M tbl_export.php
M tbl_row_action.php
M tbl_select.php
M test/classes/PMA_TableSearch_test.php
M test/classes/PMA_Table_test.php
M test/classes/schema/Dia_Relation_Schema_test.php
M test/classes/schema/Eps_Relation_Schema_test.php
M test/classes/schema/Pdf_Relation_Schema_test.php
M test/classes/schema/Svg_Relation_Schema_test.php
M test/libraries/PMA_relation_test.php
Log Message:
-----------
Merge branch 'hideTables' of github.com:kasunchathuranga/phpmyadmin into hideTables
Conflicts:
libraries/navigation/Nodes/Node_Database.class.php
libraries/relation.lib.php
Commit: d0522a779c2c8573e470fd867196570d62d96c8d
https://github.com/phpmyadmin/phpmyadmin/commit/d0522a779c2c8573e470fd86719…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-24 (Wed, 24 Jul 2013)
Changed paths:
M config.sample.inc.php
M doc/config.rst
M examples/config.manyhosts.inc.php
M examples/create_tables.sql
Log Message:
-----------
Revert half done commit
Commit: 04c2e88d6720991daa232174416d03e06fcb7b37
https://github.com/phpmyadmin/phpmyadmin/commit/04c2e88d6720991daa232174416…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M config.sample.inc.php
M doc/config.rst
M examples/config.manyhosts.inc.php
M examples/create_tables.sql
M examples/create_tables_drizzle.sql
M libraries/config.default.php
M libraries/config/setup.forms.php
M libraries/navigation/Navigation.class.php
M libraries/navigation/Nodes/Node_Database.class.php
M libraries/relation.lib.php
Log Message:
-----------
Change tables name from 'navigation' to 'navigationhiding'
Commit: 0cc2cc69a5ba25f8609b48f9bf54e9fa36db33fe
https://github.com/phpmyadmin/phpmyadmin/commit/0cc2cc69a5ba25f8609b48f9bf5…
Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M libraries/config.default.php
M libraries/config/messages.inc.php
Log Message:
-----------
Change feature name from 'navigation' to 'navigationhiding'
Commit: 1a41ce1f592b7bd46996e28713d15d0f877a2c6e
https://github.com/phpmyadmin/phpmyadmin/commit/1a41ce1f592b7bd46996e28713d…
Author: Isaac Bennetch <bennetch(a)gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M ChangeLog
M config.sample.inc.php
M doc/config.rst
M examples/config.manyhosts.inc.php
M examples/create_tables.sql
M examples/create_tables_drizzle.sql
M js/messages.php
M js/navigation.js
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/navigation/Navigation.class.php
M libraries/navigation/NavigationTree.class.php
M libraries/navigation/Nodes/Node.class.php
M libraries/navigation/Nodes/Node_Database.class.php
M libraries/navigation/Nodes/Node_Event.class.php
M libraries/navigation/Nodes/Node_Function.class.php
M libraries/navigation/Nodes/Node_Procedure.class.php
M libraries/navigation/Nodes/Node_Table.class.php
M libraries/navigation/Nodes/Node_View.class.php
M libraries/relation.lib.php
M navigation.php
M themes/original/css/navigation.css.php
A themes/original/img/b_undo.png
M themes/pmahomme/css/navigation.css.php
A themes/pmahomme/img/b_undo.png
Log Message:
-----------
Merge branch 'hideTables' of git://github.com/kasunchathuranga/phpmyadmin into kasunchathuranga-hideTables
Conflicts:
ChangeLog
Commit: b0da1d1a99aa5c3e74568ef7deba81fbf0098bfb
https://github.com/phpmyadmin/phpmyadmin/commit/b0da1d1a99aa5c3e74568ef7deb…
Author: Isaac Bennetch <bennetch(a)gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M themes/original/img/sprites.png
M themes/original/sprites.lib.php
M themes/pmahomme/img/sprites.png
M themes/pmahomme/sprites.lib.php
Log Message:
-----------
Generate image sprites (for hide navigation feature)
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f25e0e82290b...b0da1d1a99aa