Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 25c9a187be46820bff4cd10e5696312c8d442967 https://github.com/phpmyadmin/phpmyadmin/commit/25c9a187be46820bff4cd10e5696... Author: Michal Čihař mcihar@suse.cz Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths: M js/config.js
Log Message: ----------- Use jQuery.datepicker date formatting instead of own code
Conflicts: js/config.js
Commit: fb803c07ea186fefdf48782f3583298f7f28df4e https://github.com/phpmyadmin/phpmyadmin/commit/fb803c07ea186fefdf48782f3583... Author: Michal Čihař mcihar@suse.cz Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths: M js/tbl_zoom_plot_jqplot.js
Log Message: ----------- Use jQuery UI for parsing date strings
Commit: db5e0e65e9ba3c5830ed4514d712a15f56c06a0b https://github.com/phpmyadmin/phpmyadmin/commit/db5e0e65e9ba3c5830ed4514d712... Author: Michal Čihař mcihar@suse.cz Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths: M js/server_status_monitor.js
Log Message: ----------- Use jQuery UI for formatting date strings
Commit: 57fcc1d6b5233a0d3408a827113b0bc4b38b4588 https://github.com/phpmyadmin/phpmyadmin/commit/57fcc1d6b5233a0d3408a827113b... Author: Michal Čihař mcihar@suse.cz Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths: R js/date.js M server_status_monitor.php M tbl_zoom_select.php
Log Message: ----------- Drop no longer needed date.js
Conflicts: js/date.js
Commit: fad8d76f6884bf181b9b5bbf37d0c569093e0e2d https://github.com/phpmyadmin/phpmyadmin/commit/fad8d76f6884bf181b9b5bbf37d0... Author: Michal Čihař mcihar@suse.cz Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths: R js/jquery/jquery-1.8.3.js A js/jquery/jquery-1.8.3.min.js R js/jquery/jquery-ui-1.9.2.custom.js A js/jquery/jquery-ui-1.9.2.custom.min.js M libraries/Header.class.php M setup/index.php
Log Message: ----------- Include minified versions JS in git of jQuery and jQuery-UI
Commit: 9d0a1f61dbef25eaf59c591b8db75286722eef16 https://github.com/phpmyadmin/phpmyadmin/commit/9d0a1f61dbef25eaf59c591b8db7... Author: Michal Čihař mcihar@suse.cz Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths: R scripts/compress-js
Log Message: ----------- Drop javascript compression on release time
Commit: 6120e01a3fe97984d1e552bca2faac3792fcdd1c https://github.com/phpmyadmin/phpmyadmin/commit/6120e01a3fe97984d1e552bca2fa... Author: Michal Čihař mcihar@suse.cz Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths: M js/config.js M js/functions.js M js/server_status_monitor.js
Log Message: ----------- Add wrapper function for formatting datetime
This makes it easier to use and correctly converts params which formatTime expects.
Conflicts: js/functions.js
Commit: 9fe1b4286d9566c3bff5b601d731c03feaf4646a https://github.com/phpmyadmin/phpmyadmin/commit/9fe1b4286d9566c3bff5b601d731... Author: Marc Delisle marc@infomarc.info Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths: M js/config.js R js/date.js M js/functions.js R js/jquery/jquery-1.8.3.js A js/jquery/jquery-1.8.3.min.js R js/jquery/jquery-ui-1.9.2.custom.js A js/jquery/jquery-ui-1.9.2.custom.min.js M js/server_status_monitor.js M js/tbl_zoom_plot_jqplot.js M libraries/Header.class.php R scripts/compress-js M server_status_monitor.php M setup/index.php M tbl_zoom_select.php
Log Message: ----------- Merge pull request #485 from nijel/licensing
Fixed possible licensing issues
Commit: b2e5b66848aa202aaa594351e5f44a34a8a3d934 https://github.com/phpmyadmin/phpmyadmin/commit/b2e5b66848aa202aaa594351e5f4... Author: Michal Čihař michal@cihar.com Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths: M po/bn.po M po/hu.po
Log Message: ----------- Format string fixups
Commit: 8214fef3bc18d7fe0329d47d763fcc59415de051 https://github.com/phpmyadmin/phpmyadmin/commit/8214fef3bc18d7fe0329d47d763f... Author: Michal Čihař michal@cihar.com Date: 2013-07-08 (Mon, 08 Jul 2013)
Log Message: ----------- Merge branch 'QA_4_0'
Commit: a9a4e759c4a915e2c7ec0340704d9380e230a64a https://github.com/phpmyadmin/phpmyadmin/commit/a9a4e759c4a915e2c7ec0340704d... Author: Michal Čihař michal@cihar.com Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths: M po/bn.po M po/hu.po
Log Message: ----------- Format string fixups
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7fc33d7706a7...a9a4e759c4a9