Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a0429a872c31231de7959d3db72491e4cb42a0b6 https://github.com/phpmyadmin/phpmyadmin/commit/a0429a872c31231de7959d3db724... Author: Umair Khan omerjerk@gmail.com Date: 2014-03-03 (Mon, 03 Mar 2014)

Changed paths: M js/rte.js

Log Message: ----------- #4308 Stop edit routine form being submitted with enter

Signed-off-by: Umair Khan omerjerk@gmail.com

Commit: 239c1b32962791710ea7b83ac84539a0f1195b33 https://github.com/phpmyadmin/phpmyadmin/commit/239c1b32962791710ea7b83ac845... Author: Marc Delisle marc@infomarc.info Date: 2014-03-03 (Mon, 03 Mar 2014)

Changed paths: M js/rte.js

Log Message: ----------- Merge pull request #993 from omerjerk/QA_4_1

#4308 Stop edit routine form being submitted with enter

Commit: ef959d182fccca51e3b3dc20b19c3a4b4e57a9fa https://github.com/phpmyadmin/phpmyadmin/commit/ef959d182fccca51e3b3dc20b19c... 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: 5e2023ce772fe5de845a899e997b620a4c09ccfe https://github.com/phpmyadmin/phpmyadmin/commit/5e2023ce772fe5de845a899e997b... Author: Smita Kumari kumarismita62@gmail.com Date: 2014-03-03 (Mon, 03 Mar 2014)

Changed paths: M libraries/navigation/NavigationTree.class.php

Log Message: ----------- Fix bug#4307 Nav: "Columns" wont expand with specific schema

Signed-off-by: Smita Kumari kumarismita62@gmail.com

Commit: fb070815b2afaba575f9aa6e725eac845905ff9b https://github.com/phpmyadmin/phpmyadmin/commit/fb070815b2afaba575f9aa6e725e... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2014-03-03 (Mon, 03 Mar 2014)

Changed paths: M libraries/navigation/NavigationTree.class.php

Log Message: ----------- Merge pull request #997 from smita786/bugfix-4307

bug fix #4307

Commit: 1101b2156840f9056cf4cea9827d750fc3768926 https://github.com/phpmyadmin/phpmyadmin/commit/1101b2156840f9056cf4cea9827d... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2014-03-04 (Tue, 04 Mar 2014)

Changed paths: M ChangeLog

Log Message: ----------- changelog entry for 4307

Signed-off-by: Atul Pratap Singh atulpratapsingh05@gmail.com

Commit: c5dc4419ef2dfcb87237659cedddcebe2dd37c15 https://github.com/phpmyadmin/phpmyadmin/commit/c5dc4419ef2dfcb87237659ceddd... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2014-03-04 (Tue, 04 Mar 2014)

Changed paths: M ChangeLog M js/rte.js M libraries/navigation/NavigationTree.class.php

Log Message: ----------- Merge branch 'QA_4_1'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8d36d4c2c1a7...c5dc4419ef2d