Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 3c457a3e80bc5e6c4e72b09beb354376a7b5e927
https://github.com/phpmyadmin/phpmyadmin/commit/3c457a3e80bc5e6c4e72b09beb3…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M po/cs.po
Log Message:
-----------
Translated using Weblate (Czech)
Currently translated at 94.3% (2822 of 2991 strings)
[CI skip]
Commit: f6846bf7501f7fcdf8e857fdec8252b9e30eaa88
https://github.com/phpmyadmin/phpmyadmin/commit/f6846bf7501f7fcdf8e857fdec8…
Author: Weblate <noreply(a)weblate.org>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M db_sql.php
M js/db_search.js
M js/functions.js
M js/indexes.js
M js/makegrid.js
M js/navigation.js
M js/normalization.js
M js/sql.js
M js/tbl_find_replace.js
M js/tbl_select.js
M js/tbl_structure.js
M js/tbl_zoom_plot_jqplot.js
M libraries/DisplayResults.class.php
M libraries/TableSearch.class.php
M libraries/Util.class.php
M libraries/server_privileges.lib.php
M libraries/sql.lib.php
M libraries/sql_query_form.lib.php
M server_sql.php
M tbl_sql.php
M test/classes/PMA_DisplayResults_test.php
M test/libraries/PMA_server_privileges_test.php
M test/libraries/common/PMA_getCheckbox_test.php
M test/libraries/common/PMA_showMessage_test_disabled.php
M test/selenium/PmaSeleniumTableBrowseTest.php
M test/selenium/PmaSeleniumTableCreateTest.php
M test/selenium/PmaSeleniumTableInsertTest.php
M test/selenium/PmaSeleniumTableOperationsTest.php
M test/selenium/PmaSeleniumTableStructureTest.php
M test/selenium/PmaSeleniumTrackingTest.php
M test/selenium/TestBase.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d12158eb83fc...f6846bf7501f
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: aff4046fdd54e636cc2617c6eae3251cc4064863
https://github.com/phpmyadmin/phpmyadmin/commit/aff4046fdd54e636cc2617c6eae…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M libraries/DisplayResults.class.php
M libraries/TableSearch.class.php
M libraries/Util.class.php
M libraries/server_privileges.lib.php
M test/libraries/PMA_server_privileges_test.php
M test/libraries/common/PMA_getCheckbox_test.php
Log Message:
-----------
Update getCheckbox to add id field. Remove id field from profiling checkbox
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: ff393b207e459874dcfc070e728aec026b7f6f9d
https://github.com/phpmyadmin/phpmyadmin/commit/ff393b207e459874dcfc070e728…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M js/sql.js
M libraries/DisplayResults.class.php
Log Message:
-----------
Remove id field from displayOptionsForm
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 201b7446508ffb4c9092d11af592fce79fe28e19
https://github.com/phpmyadmin/phpmyadmin/commit/201b7446508ffb4c9092d11af59…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M libraries/DisplayResults.class.php
M libraries/Util.class.php
Log Message:
-----------
Remove id from display options slider
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 823a68f60124e3f9c20254aca52ac61dd011500d
https://github.com/phpmyadmin/phpmyadmin/commit/823a68f60124e3f9c20254aca52…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M js/makegrid.js
Log Message:
-----------
Choose withing the scope of current query results
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: b1ab5e3e5b0b196bdcc997836359d45f5dab916e
https://github.com/phpmyadmin/phpmyadmin/commit/b1ab5e3e5b0b196bdcc99783635…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M js/db_search.js
M js/makegrid.js
M js/navigation.js
M js/sql.js
M libraries/DisplayResults.class.php
Log Message:
-----------
Avoid using #table_results for jQuery selections
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 803d63d32fd15192715891e92b03b04a91b63e44
https://github.com/phpmyadmin/phpmyadmin/commit/803d63d32fd15192715891e92b0…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/db_search.js
Log Message:
-----------
There is no sqlqueryresults div in db search. Use searchresults div
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: c397c9f2bbc9768e313892a394a4b00109ff0a8a
https://github.com/phpmyadmin/phpmyadmin/commit/c397c9f2bbc9768e313892a394a…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/tbl_find_replace.js
M js/tbl_select.js
M js/tbl_zoom_plot_jqplot.js
M libraries/TableSearch.class.php
Log Message:
-----------
Use div id sqlqueryresultsouter in table search since sqlqueryresults clashes with the results returned
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 4327a98910f46a96a98e5f805ae83e6601feeff0
https://github.com/phpmyadmin/phpmyadmin/commit/4327a98910f46a96a98e5f805ae…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/sql.js
M libraries/sql_query_form.lib.php
Log Message:
-----------
Use div id sqlqueryresultsouter in SQL tab since sqlqueryresults clashes with the results returned
Commit: 42f9c8c460e11bee59d59d5ce9c3be2cfa7e7c4e
https://github.com/phpmyadmin/phpmyadmin/commit/42f9c8c460e11bee59d59d5ce9c…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/makegrid.js
M libraries/DisplayResults.class.php
Log Message:
-----------
Use class for passing column order to the front end
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 7647baee58bbe00f77e60e26214ef171f5ebabbe
https://github.com/phpmyadmin/phpmyadmin/commit/7647baee58bbe00f77e60e26214…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/makegrid.js
M libraries/DisplayResults.class.php
Log Message:
-----------
Pass column visibility with class attribute to the front end
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: b57250bcdfd342d7c5eb825f5b351709122e8407
https://github.com/phpmyadmin/phpmyadmin/commit/b57250bcdfd342d7c5eb825f5b3…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/makegrid.js
M libraries/DisplayResults.class.php
Log Message:
-----------
Pass table_create_time with class attribute
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 74bba2773d8c953a6b5096e68d8b93a7500815f8
https://github.com/phpmyadmin/phpmyadmin/commit/74bba2773d8c953a6b5096e68d8…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/makegrid.js
Log Message:
-----------
Update comment as well
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: fc611618832ebf3914d42a133fe325d0d97619df
https://github.com/phpmyadmin/phpmyadmin/commit/fc611618832ebf3914d42a133fe…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/makegrid.js
M libraries/DisplayResults.class.php
Log Message:
-----------
Pass save_cells_at_once using class attribute
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: d21f37b3f1acae457aa027c5763feb8b3cb8df0d
https://github.com/phpmyadmin/phpmyadmin/commit/d21f37b3f1acae457aa027c5763…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/sql.js
M libraries/sql.lib.php
Log Message:
-----------
Use class to identify bookmarkQueryForm
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 981fc9f1656e297f974b4ffb49660d7b6d8ed019
https://github.com/phpmyadmin/phpmyadmin/commit/981fc9f1656e297f974b4ffb496…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/functions.js
Log Message:
-----------
Match teardown selector with register selector
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: be9a32413819c3fd21f5f6d058ddbf2ad62daba3
https://github.com/phpmyadmin/phpmyadmin/commit/be9a32413819c3fd21f5f6d058d…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/sql.js
Log Message:
-----------
This is redundant
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: f5a943e8a14019b87e56bc2d673d766bc1841220
https://github.com/phpmyadmin/phpmyadmin/commit/f5a943e8a14019b87e56bc2d673…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/makegrid.js
M libraries/Util.class.php
Log Message:
-----------
Use class attribute to identify correct sql query
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 501a4c9c1ffe0bc71a1e3ed1d04f571b3946eecb
https://github.com/phpmyadmin/phpmyadmin/commit/501a4c9c1ffe0bc71a1e3ed1d04…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/sql.js
Log Message:
-----------
Use sqlqueryresultsouter to show USE or DROP query
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 698813db3da8b83c05771c32ae12c6f8c2662e7c
https://github.com/phpmyadmin/phpmyadmin/commit/698813db3da8b83c05771c32ae1…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/makegrid.js
Log Message:
-----------
Cleanup makegrid.js and do scoped selections
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 4476dbfee08aceaef03417e985fea9bb806704da
https://github.com/phpmyadmin/phpmyadmin/commit/4476dbfee08aceaef03417e985f…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M libraries/DisplayResults.class.php
Log Message:
-----------
Use a unique number to distinguish multiple result sets
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 4cf4e41decb400b41dc3aa57a67eb5d48bef3c41
https://github.com/phpmyadmin/phpmyadmin/commit/4cf4e41decb400b41dc3aa57a67…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M db_sql.php
M js/sql.js
M libraries/DisplayResults.class.php
M server_sql.php
M tbl_sql.php
Log Message:
-----------
Table filtering for multiquery
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: b8e13f5b7a2cd03a2ea8950f556ee11228908b60
https://github.com/phpmyadmin/phpmyadmin/commit/b8e13f5b7a2cd03a2ea8950f556…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M libraries/DisplayResults.class.php
M libraries/Util.class.php
Log Message:
-----------
Distinguish between options of each result set
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: d8afbb76025486f27b938e67167d5dffde284cc7
https://github.com/phpmyadmin/phpmyadmin/commit/d8afbb76025486f27b938e67167…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M ChangeLog
M doc/setup.rst
M export.php
M js/error_report.js
M libraries/DisplayResults.class.php
M libraries/Menu.class.php
M libraries/plugins/export/ExportSql.class.php
M libraries/sqlparser.lib.php
M libraries/structure.lib.php
M po/de.po
M po/el.po
M po/nl.po
M test/classes/PMA_DisplayResults_test.php
Log Message:
-----------
Merge branch 'master' into multiquery
Commit: 84618096a2574bcdee2fbbecd18769bf3e3a8a6a
https://github.com/phpmyadmin/phpmyadmin/commit/84618096a2574bcdee2fbbecd18…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M libraries/DisplayResults.class.php
Log Message:
-----------
Distinguish between show all checkbox of multiple result sets
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: b1fd49ee6b9b313ebdc8145892ebbadcc4d6bffe
https://github.com/phpmyadmin/phpmyadmin/commit/b1fd49ee6b9b313ebdc8145892e…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M libraries/Util.class.php
Log Message:
-----------
Fix typo
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 65794575a006a6e898be526591745b87d2f492cc
https://github.com/phpmyadmin/phpmyadmin/commit/65794575a006a6e898be5265917…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M libraries/DisplayResults.class.php
M test/classes/PMA_DisplayResults_test.php
Log Message:
-----------
Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: a362667e3c7e322b595f2106cb1538bd31f8b0d0
https://github.com/phpmyadmin/phpmyadmin/commit/a362667e3c7e322b595f2106cb1…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M js/functions.js
M js/makegrid.js
M js/normalization.js
M js/sql.js
M js/tbl_select.js
M js/tbl_structure.js
M libraries/sql.lib.php
Log Message:
-----------
Use class attribute instead of id for sqlqueryresults
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: f2782eb95783f0e5108b879f327081b69b570b2a
https://github.com/phpmyadmin/phpmyadmin/commit/f2782eb95783f0e5108b879f327…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M js/sql.js
M libraries/DisplayResults.class.php
M test/selenium/PmaSeleniumTableBrowseTest.php
M test/selenium/PmaSeleniumTableCreateTest.php
M test/selenium/PmaSeleniumTableInsertTest.php
M test/selenium/PmaSeleniumTableOperationsTest.php
M test/selenium/PmaSeleniumTableStructureTest.php
M test/selenium/PmaSeleniumTrackingTest.php
M test/selenium/TestBase.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Remove table_results ID field
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 8c215b4a841ec5d7578420d891a8d266759867e6
https://github.com/phpmyadmin/phpmyadmin/commit/8c215b4a841ec5d7578420d891a…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M libraries/sql.lib.php
Log Message:
-----------
Do no use ID attributes for bookmark fields
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 8d9054f7328458913466150f17ae1d8ebdb12929
https://github.com/phpmyadmin/phpmyadmin/commit/8d9054f7328458913466150f17a…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M js/db_search.js
M js/functions.js
M js/indexes.js
M js/normalization.js
M js/tbl_structure.js
M libraries/Util.class.php
M test/libraries/common/PMA_showMessage_test_disabled.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Use class attribute to select result_query div
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: f9e430e0d30d9dfb8fb5bf650f85057449900a8e
https://github.com/phpmyadmin/phpmyadmin/commit/f9e430e0d30d9dfb8fb5bf650f8…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M libraries/common.inc.php
M libraries/plugins/AuthenticationPlugin.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
M test/libraries/PMA_insert_edit_test.php
Log Message:
-----------
Merge branch 'master' into multiquery
Commit: d12158eb83fc159822c59a578887943a2259fe75
https://github.com/phpmyadmin/phpmyadmin/commit/d12158eb83fc159822c59a57888…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M db_sql.php
M js/db_search.js
M js/functions.js
M js/indexes.js
M js/makegrid.js
M js/navigation.js
M js/normalization.js
M js/sql.js
M js/tbl_find_replace.js
M js/tbl_select.js
M js/tbl_structure.js
M js/tbl_zoom_plot_jqplot.js
M libraries/DisplayResults.class.php
M libraries/TableSearch.class.php
M libraries/Util.class.php
M libraries/server_privileges.lib.php
M libraries/sql.lib.php
M libraries/sql_query_form.lib.php
M server_sql.php
M tbl_sql.php
M test/classes/PMA_DisplayResults_test.php
M test/libraries/PMA_server_privileges_test.php
M test/libraries/common/PMA_getCheckbox_test.php
M test/libraries/common/PMA_showMessage_test_disabled.php
M test/selenium/PmaSeleniumTableBrowseTest.php
M test/selenium/PmaSeleniumTableCreateTest.php
M test/selenium/PmaSeleniumTableInsertTest.php
M test/selenium/PmaSeleniumTableOperationsTest.php
M test/selenium/PmaSeleniumTableStructureTest.php
M test/selenium/PmaSeleniumTrackingTest.php
M test/selenium/TestBase.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Merge pull request #1409 from madhuracj/multiquery
Multiquery
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b7e17814c1ba...d12158eb83fc