Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5e6bdf1b24e28e050e222086f43ac2bb96d42ccb https://github.com/phpmyadmin/phpmyadmin/commit/5e6bdf1b24e28e050e222086f43a... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-02 (Tue, 02 Jul 2013)
Changed paths: M libraries/Menu.class.php
Log Message: ----------- Display menu items according to the user group configuration
Commit: 52619dde8d343868a79a98f8c65325bd414f7f9d https://github.com/phpmyadmin/phpmyadmin/commit/52619dde8d343868a79a98f8c653... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-03 (Wed, 03 Jul 2013)
Changed paths: M examples/create_tables.sql
Log Message: ----------- SQL to create table for configurable menus
Commit: 57e563f00a0437c6804ab4c640ff005a6231bb13 https://github.com/phpmyadmin/phpmyadmin/commit/57e563f00a0437c6804ab4c640ff... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-03 (Wed, 03 Jul 2013)
Changed paths: M config.sample.inc.php
Log Message: ----------- Add new tables to sample config file
Commit: 0cc34a19cb1e846cd30cc5a52a47139afca8b4a5 https://github.com/phpmyadmin/phpmyadmin/commit/0cc34a19cb1e846cd30cc5a52a47... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-04 (Thu, 04 Jul 2013)
Changed paths: M examples/create_tables_drizzle.sql
Log Message: ----------- SQL to generate tables for configurable menus feature for Drizzle
Commit: e4f52e7d4c41ea638d6b469246aee7a00ed77ae1 https://github.com/phpmyadmin/phpmyadmin/commit/e4f52e7d4c41ea638d6b469246ae... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-04 (Thu, 04 Jul 2013)
Changed paths: M libraries/Menu.class.php
Log Message: ----------- Use empty to avoid notices
Commit: d25583a23e052c1b52a1bf1a1ff2857f3121772e https://github.com/phpmyadmin/phpmyadmin/commit/d25583a23e052c1b52a1bf1a1ff2... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-04 (Thu, 04 Jul 2013)
Changed paths: M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php
Log Message: ----------- Add new tables as configurations
Commit: 3ed92c5ca0ce024a1a909146e8b212f43f046c49 https://github.com/phpmyadmin/phpmyadmin/commit/3ed92c5ca0ce024a1a909146e8b2... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-04 (Thu, 04 Jul 2013)
Changed paths: M config.sample.inc.php M examples/config.manyhosts.inc.php
Log Message: ----------- Update examples with new configurations
Commit: 1a86073cb27922cc889807ae2f01ac084c22f800 https://github.com/phpmyadmin/phpmyadmin/commit/1a86073cb27922cc889807ae2f01... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-04 (Thu, 04 Jul 2013)
Changed paths: M libraries/relation.lib.php
Log Message: ----------- Warn about missing tables for configurable menus feature
Commit: a74c9a065b0716e1da1b4aa0af449e304867f55f https://github.com/phpmyadmin/phpmyadmin/commit/a74c9a065b0716e1da1b4aa0af44... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-04 (Thu, 04 Jul 2013)
Changed paths: M libraries/relation.lib.php
Log Message: ----------- Fix alignment
Commit: 027117c94a9fd3609ce0c1f4c5fd39726e107199 https://github.com/phpmyadmin/phpmyadmin/commit/027117c94a9fd3609ce0c1f4c5fd... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-04 (Thu, 04 Jul 2013)
Changed paths: M doc/config.rst
Log Message: ----------- Document new configurations
Commit: 160e2cb8d8beca6b77918b4ace9ba96571d1bdf5 https://github.com/phpmyadmin/phpmyadmin/commit/160e2cb8d8beca6b77918b4ace9b... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-04 (Thu, 04 Jul 2013)
Changed paths: M libraries/Menu.class.php
Log Message: ----------- Fix checkstyle errors
Commit: 7cfdbc03ec443fa22007bc9e2833157a186f7efb https://github.com/phpmyadmin/phpmyadmin/commit/7cfdbc03ec443fa22007bc9e2833... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-05 (Fri, 05 Jul 2013)
Changed paths: M libraries/Menu.class.php
Log Message: ----------- Fix checkstyle errors
Commit: b30a6be291cd4cf6e7c12ed73b664f65389812a7 https://github.com/phpmyadmin/phpmyadmin/commit/b30a6be291cd4cf6e7c12ed73b66... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-05 (Fri, 05 Jul 2013)
Changed paths: M examples/create_tables.sql M examples/create_tables_drizzle.sql
Log Message: ----------- Use consistent table names
Commit: 08cd261856538ec6e5c5504a59034adda1f8c149 https://github.com/phpmyadmin/phpmyadmin/commit/08cd261856538ec6e5c5504a5903... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-07 (Sun, 07 Jul 2013)
Changed paths: M libraries/Menu.class.php M libraries/server_privileges.lib.php M server_privileges.php
Log Message: ----------- Allow setting user groups when creating and editing users
Commit: 9b94dd57d1e1875f7e7be524aff5671f78b1f438 https://github.com/phpmyadmin/phpmyadmin/commit/9b94dd57d1e1875f7e7be524aff5... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-07 (Sun, 07 Jul 2013)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Do not show user group drop down in database privilege edit window
Commit: b756916c4675561abb740cc527939eb646b27e8b https://github.com/phpmyadmin/phpmyadmin/commit/b756916c4675561abb740cc52793... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths: M libraries/Menu.class.php M libraries/Util.class.php M libraries/server_privileges.lib.php M server_privileges.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php
Log Message: ----------- Manage user groups
Commit: f56891acec1724776b4604047b5ec8a1582fc957 https://github.com/phpmyadmin/phpmyadmin/commit/f56891acec1724776b4604047b5e... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-12 (Fri, 12 Jul 2013)
Changed paths: M ChangeLog M db_sql.php M examples/create_tables.sql M examples/create_tables_drizzle.sql M export.php M index.php M js/config.js R js/date.js M js/functions.js M js/server_status_monitor.js M js/sql.js M js/tbl_zoom_plot_jqplot.js M libraries/DBQbe.class.php M libraries/DisplayResults.class.php M libraries/File.class.php M libraries/Menu.class.php M libraries/Message.class.php M libraries/PDF.class.php M libraries/ServerStatusData.class.php M libraries/Table.class.php M libraries/TableSearch.class.php M libraries/Tracker.class.php M libraries/Util.class.php M libraries/config.values.php M libraries/config/FormDisplay.class.php M libraries/config/FormDisplay.tpl.php A libraries/config/Validator.class.php R libraries/config/validate.lib.php M libraries/create_addfield.lib.php M libraries/dbi/DBIDummy.class.php M libraries/ip_allow_deny.lib.php M libraries/operations.lib.php M libraries/plugin_interface.lib.php M libraries/plugins/PluginObserver.class.php M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/plugins/auth/AuthenticationSignon.class.php M libraries/plugins/export/ExportCsv.class.php M libraries/plugins/export/ExportJson.class.php M libraries/plugins/import/ImportCsv.class.php M libraries/plugins/import/ImportLdi.class.php M libraries/plugins/import/ImportOds.class.php M libraries/plugins/import/ImportShp.class.php M libraries/plugins/import/ImportSql.class.php M libraries/plugins/import/ImportXml.class.php M libraries/plugins/import/README M libraries/pmd_common.php M libraries/replication_gui.lib.php M libraries/schema/Dia_Relation_Schema.class.php M libraries/schema/Eps_Relation_Schema.class.php M libraries/schema/Export_Relation_Schema.class.php M libraries/schema/Pdf_Relation_Schema.class.php M libraries/schema/Svg_Relation_Schema.class.php M libraries/schema/User_Schema.class.php M libraries/select_lang.lib.php M libraries/server_databases.lib.php M libraries/server_privileges.lib.php M libraries/sql.lib.php M libraries/sqlparser.lib.php M libraries/sqlvalidator.class.php M libraries/structure.lib.php M libraries/sysinfo.lib.php M libraries/user_preferences.lib.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@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/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/kn.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/pa.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@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@latin.po M po/zh_CN.po M po/zh_TW.po M schema_export.php M server_status_monitor.php M setup/lib/form_processing.lib.php M setup/lib/index.lib.php M setup/validate.php M sql.php M tbl_get_field.php M tbl_gis_visualization.php M tbl_zoom_select.php M test/classes/PMA_StorageEngine_test.php M test/classes/PMA_Util_test.php A test/classes/config/PMA_FormDisplay_test.php M test/classes/config/PMA_Form_test.php A test/classes/schema/Dia_Relation_Schema_test.php A test/classes/schema/Eps_Relation_Schema_test.php M test/classes/schema/Export_Relation_Schema_test.php A test/classes/schema/Pdf_Relation_Schema_test.php A test/classes/schema/Svg_Relation_Schema_test.php M test/libraries/PMA_ConfigFile_test.php A test/libraries/PMA_ConfigGenerator_test.php A test/libraries/PMA_FormDisplay_tpl_test.php A test/libraries/PMA_Form_Processing_test.php A test/libraries/PMA_Index_test.php M test/libraries/PMA_SQL_parser_test.php A test/libraries/PMA_SQL_validator_test.php M test/libraries/PMA_ip_allow_deny_test.php A test/libraries/PMA_relation_test.php M test/libraries/PMA_server_binlog_test.php A test/libraries/PMA_server_collations_test.php M test/libraries/PMA_server_common_test.php A test/libraries/PMA_server_databases_test.php A test/libraries/PMA_server_engines_test.php A test/libraries/PMA_server_plugins_test.php A test/libraries/PMA_server_status_monitor_test.php A test/libraries/PMA_server_status_variables_test.php A test/libraries/PMA_user_preferences_test.php M test/theme.php M version_check.php
Log Message: ----------- Merge branch 'master' into configurableMenus
Conflicts: libraries/Menu.class.php libraries/Util.class.php
Commit: 62b12b4d219b2f324b5eab1f3917dcb8b057f67b https://github.com/phpmyadmin/phpmyadmin/commit/62b12b4d219b2f324b5eab1f3917... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-12 (Fri, 12 Jul 2013)
Changed paths: M libraries/Menu.class.php
Log Message: ----------- Fix error introduced while resolving merge conflicts
Commit: dde0c60129f5e1d509ba8967d2fc8ff7e90e92c0 https://github.com/phpmyadmin/phpmyadmin/commit/dde0c60129f5e1d509ba8967d2fc... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-12 (Fri, 12 Jul 2013)
Changed paths: M examples/create_tables.sql M examples/create_tables_drizzle.sql
Log Message: ----------- Forcing a storage engine for configuration storage
Commit: 3e8325afb075c6d47bc748b693de571852576ded https://github.com/phpmyadmin/phpmyadmin/commit/3e8325afb075c6d47bc748b693de... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-12 (Fri, 12 Jul 2013)
Changed paths: M libraries/Menu.class.php M libraries/server_privileges.lib.php M server_privileges.php A server_user_groups.php
Log Message: ----------- Move User groups related functionality to a separate sub menu tab
Commit: c0fc4b7d1b93bef4ceba0f33ede4c2fdb251c8f3 https://github.com/phpmyadmin/phpmyadmin/commit/c0fc4b7d1b93bef4ceba0f33ede4... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-12 (Fri, 12 Jul 2013)
Changed paths: M server_user_groups.php
Log Message: ----------- Remove unnecessary success messages
Commit: 0c29eb758af52fedb48add3821decba18b4bdaa1 https://github.com/phpmyadmin/phpmyadmin/commit/0c29eb758af52fedb48add3821de... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-13 (Sat, 13 Jul 2013)
Changed paths: M libraries/server_privileges.lib.php M server_user_groups.php
Log Message: ----------- Allow viewing users belonging to a particular user group
Commit: fb50fd2efe85f85a2b7cee9ad2f83cb57fde15cf https://github.com/phpmyadmin/phpmyadmin/commit/fb50fd2efe85f85a2b7cee9ad2f8... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-13 (Sat, 13 Jul 2013)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Use htmlspecialchars
Commit: 55746d61dbbd11041fd69198cfcfc01102d74585 https://github.com/phpmyadmin/phpmyadmin/commit/55746d61dbbd11041fd69198cfcf... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-13 (Sat, 13 Jul 2013)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Correctly indicate group with no users
Commit: e2ae0abadbf7f88e3b4066fd8284bd64b10a3c1f https://github.com/phpmyadmin/phpmyadmin/commit/e2ae0abadbf7f88e3b4066fd8284... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Indicate user group assignments in user overview table
Commit: d33ad157886f26a99370b621e986246cf4a68ebd https://github.com/phpmyadmin/phpmyadmin/commit/d33ad157886f26a99370b621e986... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths: M js/server_privileges.js M libraries/server_privileges.lib.php M server_privileges.php
Log Message: ----------- Displaying and editing user group moved to user overview table
Commit: c6b9b3af7379765ad2288f68ec52d1f1e37003ef https://github.com/phpmyadmin/phpmyadmin/commit/c6b9b3af7379765ad2288f68ec52... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Use passed username
Commit: 7149585f2d6f882e645899110f02c0fe6385ab26 https://github.com/phpmyadmin/phpmyadmin/commit/7149585f2d6f882e645899110f02... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths: M libraries/server_privileges.lib.php M server_privileges.php
Log Message: ----------- Remove not used parameter $hostname
Commit: 4b3619fb47e0035a7db2c534a5e3d534c1dae4c6 https://github.com/phpmyadmin/phpmyadmin/commit/4b3619fb47e0035a7db2c534a5e3... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Edit user group link should be shown only when menus feature is configured
Commit: 4ff0272a9fed095cadee34727df6b3b89aa07bc3 https://github.com/phpmyadmin/phpmyadmin/commit/4ff0272a9fed095cadee34727df6... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths: M libraries/server_privileges.lib.php M server_user_groups.php
Log Message: ----------- Improve documentation comments
Commit: 45645a192b8dde4bfda01326a250fbc5badf3235 https://github.com/phpmyadmin/phpmyadmin/commit/45645a192b8dde4bfda01326a250... Author: Kasun Chathuranga chathuranga.jayaneththi@gmail.com Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths: M libraries/Menu.class.php M libraries/server_privileges.lib.php
Log Message: ----------- Escape values in SQL queries
Commit: e65826c408d2bba421a475f426a3a74d8b3abeb1 https://github.com/phpmyadmin/phpmyadmin/commit/e65826c408d2bba421a475f426a3... Author: Isaac Bennetch bennetch@gmail.com Date: 2013-07-13 (Sat, 13 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 js/server_privileges.js M libraries/Menu.class.php M libraries/Util.class.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/relation.lib.php M libraries/server_privileges.lib.php M server_privileges.php A server_user_groups.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php
Log Message: ----------- Merge branch 'configurableMenus' of git://github.com/kasunchathuranga/phpmyadmin into kasunchathuranga-configurableMenus
Commit: 77467421f3ba1aa3fbaa8bd87e6c4419064693c5 https://github.com/phpmyadmin/phpmyadmin/commit/77467421f3ba1aa3fbaa8bd87e6c... Author: Isaac Bennetch bennetch@gmail.com Date: 2013-07-13 (Sat, 13 Jul 2013)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog for configurable menus
Commit: 76f5c2dad66f26240bd9d55611b67a2a762af371 https://github.com/phpmyadmin/phpmyadmin/commit/76f5c2dad66f26240bd9d55611b6... Author: Isaac Bennetch bennetch@gmail.com Date: 2013-07-14 (Sun, 14 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/server_privileges.js M libraries/Menu.class.php M libraries/Util.class.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/relation.lib.php M libraries/server_privileges.lib.php M server_privileges.php A server_user_groups.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php
Log Message: ----------- Merge branch 'kasunchathuranga-configurableMenus'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/55746b58ec72...76f5c2dad66f