Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3af218eb762eaa3a2e0515b51f358a0893962bd5 https://github.com/phpmyadmin/phpmyadmin/commit/3af218eb762eaa3a2e0515b51f35... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-04-13 (Fri, 13 Apr 2012)
Changed paths: M js/messages.php M js/server_status_monitor.js
Log Message: ----------- Make some messages translatable
Commit: fa9aaea8c0f409cfd6f131de6b808de1a4851008 https://github.com/phpmyadmin/phpmyadmin/commit/fa9aaea8c0f409cfd6f131de6b80... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-04-13 (Fri, 13 Apr 2012)
Changed paths: M server_collations.php M server_databases.php M server_engines.php M server_export.php M server_privileges.php M server_status.php M server_synchronize.php M server_variables.php
Log Message: ----------- Coding style improvements
Commit: ea800101cb1f4242ccf629c73d91f2a876dbfb19 https://github.com/phpmyadmin/phpmyadmin/commit/ea800101cb1f4242ccf629c73d91... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-04-13 (Fri, 13 Apr 2012)
Changed paths: M libraries/Theme.class.php M libraries/config/ConfigFile.class.php M libraries/dbi/drizzle-wrappers.lib.php M libraries/dbi/drizzle.dbi.lib.php M libraries/export/csv.php M libraries/export/htmlword.php M libraries/export/mediawiki.php M libraries/export/ods.php M libraries/export/texytext.php M libraries/import/shp.php M libraries/sanitizing.lib.php M libraries/sysinfo.lib.php M libraries/transformations/text_plain__append.inc.php M tbl_tracking.php M test/classes/Advisor_test.php M test/classes/PMA_File_test.php M test/classes/PMA_Message_test.php M test/libraries/common/PMA_browseUploadFile_test.php M test/libraries/common/PMA_buildActionTitles_test.php M test/libraries/common/PMA_contains_nonprintable_ascii_test.php M test/libraries/common/PMA_convert_bit_default_value_test.php M test/libraries/common/PMA_displayMaximumUploadSize_test.php M test/libraries/common/PMA_escapeMySqlWildcards_test.php M test/libraries/common/PMA_extractValueFromFormattedSize_test.php M test/libraries/common/PMA_foreignKeySupported_test.php M test/libraries/common/PMA_formatNumberByteDown_test.php M test/libraries/common/PMA_formatSql_test.php M test/libraries/common/PMA_generateHiddenMaxFileSize_test.php M test/libraries/common/PMA_getIcon_test.php M test/libraries/common/PMA_getTitleForTarget_test.php M test/libraries/common/PMA_localisedDateTimespan_test.php M test/libraries/common/PMA_printableBitValue_test.php M test/libraries/common/PMA_quoting_slashing_test.php M test/libraries/common/PMA_stringOperations_test.php M test/libraries/core/PMA_checkPageValidity_test.php M test/libraries/core/PMA_getLinks_test.php M test/libraries/core/PMA_securePath_test.php M test/libraries/core/PMA_warnMissingExtension_test.php M test/libraries/js_escape_test.php M test/libraries/php-gettext/Parsing_test.php M test/selenium/Helper.php M user_password.php
Log Message: ----------- Fix Checkstyle Warnings - Type: BraceOnSameLine
Commit: 6b2a502de712bb0a656f1c42968d123180874732 https://github.com/phpmyadmin/phpmyadmin/commit/6b2a502de712bb0a656f1c42968d... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-04-13 (Fri, 13 Apr 2012)
Changed paths: M js/messages.php M js/server_status_monitor.js
Log Message: ----------- Merge branch 'QA_3_5'
Commit: ba215460083678f047c0ef7d19121d250b21e266 https://github.com/phpmyadmin/phpmyadmin/commit/ba215460083678f047c0ef7d1912... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-04-13 (Fri, 13 Apr 2012)
Changed paths: M ChangeLog M Documentation.html M db_events.php M db_routines.php M db_sql.php M db_triggers.php M js/functions.js M js/rte/common.js M js/server_privileges.js M js/server_status.js M js/server_status_monitor.js M libraries/Theme.class.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 querywindow.php M server_privileges.php M server_sql.php M server_status.php M sql.php M tbl_export.php M tbl_sql.php
Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7e00134...ba21546