- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 3e5fb5: BugFix #4305
by Marc Delisle 03 Mar '14

03 Mar '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3e5fb5295925129c70276693bf6ba31171548eff https://github.com/phpmyadmin/phpmyadmin/commit/3e5fb5295925129c70276693bf6… Author: Umair Khan <omerjerk(a)gmail.com> Date: 2014-03-02 (Sun, 02 Mar 2014) Changed paths: M js/rte.js Log Message: ----------- BugFix #4305 Signed-off-by: Umair Khan <omerjerk(a)gmail.com> Commit: 908df2a24346f5463d9dff7c910bf513f92679fe https://github.com/phpmyadmin/phpmyadmin/commit/908df2a24346f5463d9dff7c910… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M js/rte.js Log Message: ----------- Merge pull request #986 from omerjerk/QA_4_1 BugFix #4305 Commit: cc7f1bf1f9d1924e70b72b715e4c47fb3912c62e https://github.com/phpmyadmin/phpmyadmin/commit/cc7f1bf1f9d1924e70b72b715e4… Author: Smita Kumari <kumarismita62(a)gmail.com> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M prefs_manage.php Log Message: ----------- bug fix #4040:Since we are not reseting theme on reset settings, so removed the block that were unsetting theme in seesion Signed-off-by: Smita Kumari <kumarismita62(a)gmail.com> Commit: 54220a34b3c6cac786e965f5dc9872b55018fe8d https://github.com/phpmyadmin/phpmyadmin/commit/54220a34b3c6cac786e965f5dc9… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M prefs_manage.php Log Message: ----------- Merge pull request #992 from smita786/QA_4_1 bug fix #4040 Commit: be067864205168819b46d5318edae2d5e96f941f https://github.com/phpmyadmin/phpmyadmin/commit/be067864205168819b46d5318ed… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: c8e5fc5f8c6d32224943cfc6a730c731d1bd57ed https://github.com/phpmyadmin/phpmyadmin/commit/c8e5fc5f8c6d32224943cfc6a73… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M js/rte.js Log Message: ----------- Merge commit '3e5fb52' Commit: 58c12fe876625fb9999a9536bf3a6884b8b57d8f https://github.com/phpmyadmin/phpmyadmin/commit/58c12fe876625fb9999a9536bf3… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-03-03 (Mon, 03 Mar 2014) Log Message: ----------- Merge commit '908df2a' Commit: d555558709702cb543a319eb66b5e96f12898078 https://github.com/phpmyadmin/phpmyadmin/commit/d555558709702cb543a319eb66b… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M prefs_manage.php Log Message: ----------- Merge commit 'cc7f1bf' Commit: 17c017a5cdff31b4dcffe147a7aa4c671245578f https://github.com/phpmyadmin/phpmyadmin/commit/17c017a5cdff31b4dcffe147a7a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-03-03 (Mon, 03 Mar 2014) Log Message: ----------- Merge commit '54220a3' Commit: 1340c6109065211b07696a4fc64f83251098c401 https://github.com/phpmyadmin/phpmyadmin/commit/1340c6109065211b07696a4fc64… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M ChangeLog Log Message: ----------- Merge commit 'be06786' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b809e36836ae...1340c6109065

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] be0678: ChangeLog entry
by Marc Delisle 03 Mar '14

03 Mar '14

Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: be067864205168819b46d5318edae2d5e96f941f https://github.com/phpmyadmin/phpmyadmin/commit/be067864205168819b46d5318ed… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cc7f1b: bug fix #4040:Since we are not reseting theme on r...
by Marc Delisle 03 Mar '14

03 Mar '14

Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: cc7f1bf1f9d1924e70b72b715e4c47fb3912c62e https://github.com/phpmyadmin/phpmyadmin/commit/cc7f1bf1f9d1924e70b72b715e4… Author: Smita Kumari <kumarismita62(a)gmail.com> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M prefs_manage.php Log Message: ----------- bug fix #4040:Since we are not reseting theme on reset settings, so removed the block that were unsetting theme in seesion Signed-off-by: Smita Kumari <kumarismita62(a)gmail.com> Commit: 54220a34b3c6cac786e965f5dc9872b55018fe8d https://github.com/phpmyadmin/phpmyadmin/commit/54220a34b3c6cac786e965f5dc9… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M prefs_manage.php Log Message: ----------- Merge pull request #992 from smita786/QA_4_1 bug fix #4040 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/908df2a24346...54220a34b3c6

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] b809e3: Fix coding style
by Marc Delisle 03 Mar '14

03 Mar '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b809e36836ae1a0542e33d6ff1de666fb81b3705 https://github.com/phpmyadmin/phpmyadmin/commit/b809e36836ae1a0542e33d6ff1d… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M setup/frames/form.inc.php M setup/frames/servers.inc.php M setup/lib/form_processing.lib.php M test/libraries/PMA_Form_Processing_test.php Log Message: ----------- Fix coding style Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] bff6f4: Expand More menu here as well
by Michal Čihař 03 Mar '14

03 Mar '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bff6f471a9a6efb031eb9aab0d8e532714f3d9d6 https://github.com/phpmyadmin/phpmyadmin/commit/bff6f471a9a6efb031eb9aab0d8… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M test/selenium/PmaSeleniumDbOperationsTest.php Log Message: ----------- Expand More menu here as well It can happend that Operations tab is hidden in the menu. Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5a7bf6: Show default value for number of fields
by Michal Čihař 03 Mar '14

03 Mar '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5a7bf6e001af282e2479c4e68770d761d8df7ba8 https://github.com/phpmyadmin/phpmyadmin/commit/5a7bf6e001af282e2479c4e6877… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M libraries/display_create_table.lib.php Log Message: ----------- Show default value for number of fields We fall back to this value when it's not filled in, so it's better to show it in the form as well. Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 3e5fb5: BugFix #4305
by Michal Čihař 03 Mar '14

03 Mar '14

Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3e5fb5295925129c70276693bf6ba31171548eff https://github.com/phpmyadmin/phpmyadmin/commit/3e5fb5295925129c70276693bf6… Author: Umair Khan <omerjerk(a)gmail.com> Date: 2014-03-02 (Sun, 02 Mar 2014) Changed paths: M js/rte.js Log Message: ----------- BugFix #4305 Signed-off-by: Umair Khan <omerjerk(a)gmail.com> Commit: 908df2a24346f5463d9dff7c910bf513f92679fe https://github.com/phpmyadmin/phpmyadmin/commit/908df2a24346f5463d9dff7c910… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M js/rte.js Log Message: ----------- Merge pull request #986 from omerjerk/QA_4_1 BugFix #4305 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f319824b54bd...908df2a24346

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 6cbde7: Test encoded binary output
by Michal Čihař 03 Mar '14

03 Mar '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6cbde74c254104540782eb97b1fc318a6fc19a9a https://github.com/phpmyadmin/phpmyadmin/commit/6cbde74c254104540782eb97b1f… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M test/classes/plugin/export/PMA_ExportOds_test.php M test/classes/plugin/export/PMA_ExportOdt_test.php Log Message: ----------- Test encoded binary output Otherwise PHP sometimes refuses to match binary content using PCRE. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f319824b54bd8c538837496f1ab637554efc5ef3 https://github.com/phpmyadmin/phpmyadmin/commit/f319824b54bd8c538837496f1ab… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M test/classes/plugin/export/PMA_ExportOds_test.php M test/classes/plugin/export/PMA_ExportOdt_test.php Log Message: ----------- Fix regexp to match Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: cb8daa44d7ad4eede4475bb35541fb5923eb4afa https://github.com/phpmyadmin/phpmyadmin/commit/cb8daa44d7ad4eede4475bb3554… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-03 (Mon, 03 Mar 2014) Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3f9c963abeb7...cb8daa44d7ad

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 6cbde7: Test encoded binary output
by Michal Čihař 03 Mar '14

03 Mar '14

Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6cbde74c254104540782eb97b1fc318a6fc19a9a https://github.com/phpmyadmin/phpmyadmin/commit/6cbde74c254104540782eb97b1f… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M test/classes/plugin/export/PMA_ExportOds_test.php M test/classes/plugin/export/PMA_ExportOdt_test.php Log Message: ----------- Test encoded binary output Otherwise PHP sometimes refuses to match binary content using PCRE. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f319824b54bd8c538837496f1ab637554efc5ef3 https://github.com/phpmyadmin/phpmyadmin/commit/f319824b54bd8c538837496f1ab… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M test/classes/plugin/export/PMA_ExportOds_test.php M test/classes/plugin/export/PMA_ExportOdt_test.php Log Message: ----------- Fix regexp to match Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f95010d9c214...f319824b54bd

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f15293: coding style fix
by Michal Čihař 03 Mar '14

03 Mar '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f1529325ff800abcdb7e8210ae64b70b8e405ed5 https://github.com/phpmyadmin/phpmyadmin/commit/f1529325ff800abcdb7e8210ae6… Author: minhaz <minhazav(a)gmail.com> Date: 2014-02-28 (Fri, 28 Feb 2014) Changed paths: M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php Log Message: ----------- coding style fix Signed-off-by: A V Minhaz <minhazav(a)gmail.com> Commit: b32b8ade301ca4fb9df2e19ce81aa382b275342e https://github.com/phpmyadmin/phpmyadmin/commit/b32b8ade301ca4fb9df2e19ce81… Author: minhaz <minhazav(a)gmail.com> Date: 2014-02-28 (Fri, 28 Feb 2014) Changed paths: M test/classes/PMA_Config_test.php Log Message: ----------- Test object unset on test completion The tearDown() function was kept empty without releasing resources of current object Signed-off-by: A V Minhaz <minhazav(a)gmail.com> Commit: f7b35e52efe5b174d6184dde2ab1a92c0e94129c https://github.com/phpmyadmin/phpmyadmin/commit/f7b35e52efe5b174d6184dde2ab… Author: minhaz <minhazav(a)gmail.com> Date: 2014-03-02 (Sun, 02 Mar 2014) Changed paths: M test/classes/PMA_Config_test.php Log Message: ----------- Added testcase for testCheckPermissions() Signed-off-by: A V Minhaz <minhazav(a)gmail.com> Commit: 47dfc2e3f0f035ec3e0d4291b2ff7fe21aa03cdf https://github.com/phpmyadmin/phpmyadmin/commit/47dfc2e3f0f035ec3e0d4291b2f… Author: minhaz <minhazav(a)gmail.com> Date: 2014-03-02 (Sun, 02 Mar 2014) Changed paths: M test/classes/PMA_Config_test.php Log Message: ----------- tearDown() function to unset GLOBALS used for this test Signed-off-by: A V Minhaz <minhazav(a)gmail.com> Commit: 5b8bf48dadabdbd209819ba68b3cc266d56b715e https://github.com/phpmyadmin/phpmyadmin/commit/5b8bf48dadabdbd209819ba68b3… Author: minhaz <minhazav(a)gmail.com> Date: 2014-03-02 (Sun, 02 Mar 2014) Changed paths: M test/classes/PMA_Config_test.php Log Message: ----------- testCase bild fail fixed Signed-off-by: A V Minhaz <minhazav(a)gmail.com> Commit: 34a11a06fb876d4201afd4f06f5bf89f0ec5e432 https://github.com/phpmyadmin/phpmyadmin/commit/34a11a06fb876d4201afd4f06f5… Author: minhaz <minhazav(a)gmail.com> Date: 2014-03-02 (Sun, 02 Mar 2014) Changed paths: M test/classes/PMA_Config_test.php Log Message: ----------- Testcase build failure fixed Signed-off-by: A V Minhaz <minhazav(a)gmail.com> Commit: f95010d9c2146bac48aa40770a46785c3339cbdf https://github.com/phpmyadmin/phpmyadmin/commit/f95010d9c2146bac48aa40770a4… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M test/classes/PMA_Config_test.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php Log Message: ----------- Merge pull request #981 from mebjas/QA_4_1 Testcases for PMA_ConfigTest modified Commit: 3f9c963abeb7fc81502246c4c2088f91f0dfc87c https://github.com/phpmyadmin/phpmyadmin/commit/3f9c963abeb7fc81502246c4c20… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-03 (Mon, 03 Mar 2014) Changed paths: M test/classes/PMA_Config_test.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a4b179f2d7f8...3f9c963abeb7

1 0