Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3e5fb5295925129c70276693bf6ba31171548eff https://github.com/phpmyadmin/phpmyadmin/commit/3e5fb5295925129c70276693bf6b... Author: Umair Khan omerjerk@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@gmail.com
Commit: 908df2a24346f5463d9dff7c910bf513f92679fe https://github.com/phpmyadmin/phpmyadmin/commit/908df2a24346f5463d9dff7c910b... Author: Michal Čihař michal@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/cc7f1bf1f9d1924e70b72b715e4c... Author: Smita Kumari kumarismita62@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@gmail.com
Commit: 54220a34b3c6cac786e965f5dc9872b55018fe8d https://github.com/phpmyadmin/phpmyadmin/commit/54220a34b3c6cac786e965f5dc98... Author: Marc Delisle marc@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/be067864205168819b46d5318eda... Author: Marc Delisle marc@infomarc.info Date: 2014-03-03 (Mon, 03 Mar 2014)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entry
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: c8e5fc5f8c6d32224943cfc6a730c731d1bd57ed https://github.com/phpmyadmin/phpmyadmin/commit/c8e5fc5f8c6d32224943cfc6a730... Author: Marc Delisle marc@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/58c12fe876625fb9999a9536bf3a... Author: Marc Delisle marc@infomarc.info Date: 2014-03-03 (Mon, 03 Mar 2014)
Log Message: ----------- Merge commit '908df2a'
Commit: d555558709702cb543a319eb66b5e96f12898078 https://github.com/phpmyadmin/phpmyadmin/commit/d555558709702cb543a319eb66b5... Author: Marc Delisle marc@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/17c017a5cdff31b4dcffe147a7aa... Author: Marc Delisle marc@infomarc.info Date: 2014-03-03 (Mon, 03 Mar 2014)
Log Message: ----------- Merge commit '54220a3'
Commit: 1340c6109065211b07696a4fc64f83251098c401 https://github.com/phpmyadmin/phpmyadmin/commit/1340c6109065211b07696a4fc64f... Author: Marc Delisle marc@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
-
Marc Delisle