Branch: refs/heads/master
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: f8ea67f2bc59d46290b85b2e578c649655f000e7
https://github.com/phpmyadmin/phpmyadmin/commit/f8ea67f2bc59d46290b85b2e578…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-09-16 (Fri, 16 Sep 2016)
Changed paths:
M ChangeLog
M js/messages.php
M js/rte.js
M libraries/DatabaseInterface.php
M libraries/rte/rte_export.lib.php
M libraries/rte/rte_list.lib.php
M libraries/rte/rte_routines.lib.php
M libraries/rte/rte_words.lib.php
Log Message:
-----------
Fix #12530: Show enabled links for Edit and Execute after proper priv checks
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Commit: 815bf44584f104d1616ca1d05a2aaba34580a418
https://github.com/phpmyadmin/phpmyadmin/commit/815bf44584f104d1616ca1d05a2…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-09-16 (Fri, 16 Sep 2016)
Changed paths:
M libraries/rte/rte_export.lib.php
M libraries/rte/rte_routines.lib.php
M libraries/rte/rte_words.lib.php
Log Message:
-----------
Fix error messages to suit better localization
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Commit: b054aa70ef443929484f087f459d4d856fcabaa5
https://github.com/phpmyadmin/phpmyadmin/commit/b054aa70ef443929484f087f459…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-09-16 (Fri, 16 Sep 2016)
Changed paths:
M js/export.js
Log Message:
-----------
Uncheck the Add CREATE PROCEDURE / FUNCTION etc. checkbox for a selective export
User can always check it if he/she wants to export the procs,funcs etc. too
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Commit: 4f1432eb2fe6a25efbf740c9f712d4454e109969
https://github.com/phpmyadmin/phpmyadmin/commit/4f1432eb2fe6a25efbf740c9f71…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-09-16 (Fri, 16 Sep 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
ChangeLog entry for #12300
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Conflicts:
ChangeLog
Commit: e8d07e3783f0a1b7140ba3ee6a3b2e472e210b65
https://github.com/phpmyadmin/phpmyadmin/commit/e8d07e3783f0a1b7140ba3ee6a3…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-09-16 (Fri, 16 Sep 2016)
Changed paths:
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Allow vertical scrolling to read longer text values in grid editing
Fix #12554
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Commit: b6952bbe55a9fa727482a47533cc066c5e36f189
https://github.com/phpmyadmin/phpmyadmin/commit/b6952bbe55a9fa727482a47533c…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-09-16 (Fri, 16 Sep 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
ChangeLog entry for #12554
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Conflicts:
ChangeLog
Commit: 337e5755c039962a32883d96329e8157ba6e0d59
https://github.com/phpmyadmin/phpmyadmin/commit/337e5755c039962a32883d96329…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-09-19 (Mon, 19 Sep 2016)
Changed paths:
M ChangeLog
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Merge remote-tracking branch 'origin/pull/12555' into QA_4_6
Commit: bccd690673ffaf36b19a28fc8449531a23ef2ad2
https://github.com/phpmyadmin/phpmyadmin/commit/bccd690673ffaf36b19a28fc844…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-09-19 (Mon, 19 Sep 2016)
Changed paths:
M ChangeLog
M js/messages.php
M js/rte.js
M libraries/DatabaseInterface.php
M libraries/rte/rte_export.lib.php
M libraries/rte/rte_list.lib.php
M libraries/rte/rte_routines.lib.php
M libraries/rte/rte_words.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/pull/12544' into QA_4_6
Commit: 5c0af8facf0ba94ca5484dd8601104e36f3c8024
https://github.com/phpmyadmin/phpmyadmin/commit/5c0af8facf0ba94ca5484dd8601…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-09-19 (Mon, 19 Sep 2016)
Changed paths:
M ChangeLog
M js/export.js
Log Message:
-----------
Merge remote-tracking branch 'origin/pull/12556' into QA_4_6
Commit: 7fc28626fdbceccbb60827ce7ee04cfcc4094fce
https://github.com/phpmyadmin/phpmyadmin/commit/7fc28626fdbceccbb60827ce7ee…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-09-19 (Mon, 19 Sep 2016)
Changed paths:
M ChangeLog
M js/export.js
M js/messages.php
M js/rte.js
M libraries/DatabaseInterface.php
M libraries/rte/rte_export.lib.php
M libraries/rte/rte_list.lib.php
M libraries/rte/rte_routines.lib.php
M libraries/rte/rte_words.lib.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Merge branch 'QA_4_6'
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/61d8dc479125...7fc28626fdbc