Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a020eac11a26977295cf2439ddd2e5b4af2c88fe https://github.com/phpmyadmin/phpmyadmin/commit/a020eac11a26977295cf2439ddd2... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2014-10-01 (Wed, 01 Oct 2014)
Changed paths: M js/config.js M js/db_operations.js M js/db_search.js M js/db_structure.js M js/functions.js M js/gis_data_editor.js M js/indexes.js M js/makegrid.js M js/navigation.js M js/server_databases.js M js/server_privileges.js M js/server_status_monitor.js M js/server_variables.js M js/tbl_chart.js M js/tbl_relation.js M js/tbl_select.js M js/tbl_structure.js M js/tbl_zoom_plot_jqplot.js
Log Message: ----------- Add js checks in multiple files if data is undefined
Signed-off-by: Atul Pratap Singh atulpratapsingh05@gmail.com
Commit: ba37e2641abac6c637dffc410aebbd9c7dbcf7c1 https://github.com/phpmyadmin/phpmyadmin/commit/ba37e2641abac6c637dffc410aeb... Author: Robert Readman robert_readman@hotmail.com Date: 2014-10-01 (Wed, 01 Oct 2014)
Changed paths: M po/en_GB.po
Log Message: ----------- Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (2768 of 2768)
[ci skip]
Commit: 01c7f4e3f1433fb7365413f4e8dc5fea57e8fd76 https://github.com/phpmyadmin/phpmyadmin/commit/01c7f4e3f1433fb7365413f4e8dc... Author: Weblate noreply@weblate.org Date: 2014-10-01 (Wed, 01 Oct 2014)
Changed paths: M js/config.js M js/db_operations.js M js/db_search.js M js/db_structure.js M js/functions.js M js/gis_data_editor.js M js/indexes.js M js/makegrid.js M js/navigation.js M js/server_databases.js M js/server_privileges.js M js/server_status_monitor.js M js/server_variables.js M js/tbl_chart.js M js/tbl_relation.js M js/tbl_select.js M js/tbl_structure.js M js/tbl_zoom_plot_jqplot.js
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: 6c83a2f2e396524da9153225617c30affbe07540 https://github.com/phpmyadmin/phpmyadmin/commit/6c83a2f2e396524da9153225617c... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2014-10-01 (Wed, 01 Oct 2014)
Changed paths: M js/config.js M js/db_operations.js M js/db_search.js M js/db_structure.js M js/functions.js M js/gis_data_editor.js M js/indexes.js M js/makegrid.js M js/navigation.js M js/server_databases.js M js/server_privileges.js M js/server_status_monitor.js M js/server_variables.js M js/tbl_chart.js M js/tbl_relation.js M js/tbl_select.js M js/tbl_structure.js M js/tbl_zoom_plot_jqplot.js
Log Message: ----------- Merge commit 'a020eac11a26977295cf2439ddd2e5b4af2c88fe'
Conflicts: js/config.js js/db_search.js js/functions.js js/makegrid.js js/server_privileges.js js/tbl_structure.js
Commit: 7d23ba34394eb6ba53f78d32e344827fb435df27 https://github.com/phpmyadmin/phpmyadmin/commit/7d23ba34394eb6ba53f78d32e344... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2014-10-01 (Wed, 01 Oct 2014)
Log Message: ----------- Merge commit '01c7f4e3f1433fb7365413f4e8dc5fea57e8fd76'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ff4be7ee5a71...7d23ba34394e