Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 39d04a9057746acf4bcd5b2d9de08b4ab4c16ff3 https://github.com/phpmyadmin/phpmyadmin/commit/39d04a9057746acf4bcd5b2d9de0... Author: Michal Čihař michal@cihar.com Date: 2014-04-11 (Fri, 11 Apr 2014)
Changed paths: M po/de.po
Log Message: ----------- Translated using Weblate (German)
Currently translated at 99.9% (2749 of 2750)
Commit: 16f9cd7761ae84a5d9760adfcbfe059de87faf6a https://github.com/phpmyadmin/phpmyadmin/commit/16f9cd7761ae84a5d9760adfcbfe... Author: Kai-Ove Finvold translate@okai.no Date: 2014-04-11 (Fri, 11 Apr 2014)
Changed paths: M po/nb.po
Log Message: ----------- Translated using Weblate (Norwegian Bokmål)
Currently translated at 66.9% (1842 of 2750)
Commit: 2df8cdb2072e8cf5675dee22dbf1861311e66390 https://github.com/phpmyadmin/phpmyadmin/commit/2df8cdb2072e8cf5675dee22dbf1... Author: Weblate noreply@weblate.org Date: 2014-04-11 (Fri, 11 Apr 2014)
Changed paths: M ChangeLog M libraries/sql.lib.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1
Commit: 6e241b841184c0e23c8eeb4a3766e06f858934bc https://github.com/phpmyadmin/phpmyadmin/commit/6e241b841184c0e23c8eeb4a3766... Author: Ashutosh Dhundhara ashutoshdhundhara@yahoo.com Date: 2014-04-12 (Sat, 12 Apr 2014)
Changed paths: M js/functions.js M js/rte.js
Log Message: ----------- Bug Fix: #4357 JS Form is sumitted on "enter" even if focus is inside a select field.
Signed-off-by: Ashutosh Dhundhara ashutoshdhundhara@yahoo.com
Removed TODO tag from comment in rte.js
Signed-off-by: Ashutosh Dhundhara ashutoshdhundhara@yahoo.com
Commit: 5d9bcd360c787d9e7d3a762b6129353f5be72ac5 https://github.com/phpmyadmin/phpmyadmin/commit/5d9bcd360c787d9e7d3a762b6129... Author: Marc Delisle marc@infomarc.info Date: 2014-04-12 (Sat, 12 Apr 2014)
Changed paths: M js/functions.js M js/rte.js
Log Message: ----------- Merge pull request #1136 from ashutoshdhundhara/bugfix_4357
Bug Fix: #4357 JS Form is sumitted on "enter" even if focus is inside a select field.
Commit: b82fe0977e216740eba07309b800131813860769 https://github.com/phpmyadmin/phpmyadmin/commit/b82fe0977e216740eba07309b800... Author: Marc Delisle marc@infomarc.info Date: 2014-04-12 (Sat, 12 Apr 2014)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entry
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 64e9287df5472ef3a5ff3558244fdc48b6139e32 https://github.com/phpmyadmin/phpmyadmin/commit/64e9287df5472ef3a5ff3558244f... Author: Marc Delisle marc@infomarc.info Date: 2014-04-12 (Sat, 12 Apr 2014)
Changed paths: M js/functions.js
Log Message: ----------- Remove extra comma
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 8ef8fbfbc8663a8dab6c5ea58530df63d919c555 https://github.com/phpmyadmin/phpmyadmin/commit/8ef8fbfbc8663a8dab6c5ea58530... Author: Marc Delisle marc@infomarc.info Date: 2014-04-12 (Sat, 12 Apr 2014)
Log Message: ----------- Merge commit '2df8cdb'
Commit: d6592b5eb268f2fa64819aea88d6616edce7fa89 https://github.com/phpmyadmin/phpmyadmin/commit/d6592b5eb268f2fa64819aea88d6... Author: Marc Delisle marc@infomarc.info Date: 2014-04-12 (Sat, 12 Apr 2014)
Changed paths: M js/functions.js M js/rte.js
Log Message: ----------- Fix merge conflicts
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: be7f34d54623890f1989daf7029fe6544095322d https://github.com/phpmyadmin/phpmyadmin/commit/be7f34d54623890f1989daf7029f... Author: Marc Delisle marc@infomarc.info Date: 2014-04-12 (Sat, 12 Apr 2014)
Log Message: ----------- Merge commit '5d9bcd3'
Commit: 609c0acaf3858e8a7ef632cd63efad405824da45 https://github.com/phpmyadmin/phpmyadmin/commit/609c0acaf3858e8a7ef632cd63ef... Author: Marc Delisle marc@infomarc.info Date: 2014-04-12 (Sat, 12 Apr 2014)
Changed paths: M ChangeLog
Log Message: ----------- Merge commit 'b82fe09'
Commit: cf924e57f506945c78b4942e784f6c92b06485d1 https://github.com/phpmyadmin/phpmyadmin/commit/cf924e57f506945c78b4942e784f... Author: Marc Delisle marc@infomarc.info Date: 2014-04-12 (Sat, 12 Apr 2014)
Changed paths: M js/functions.js
Log Message: ----------- Merge commit '64e9287'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e82c1b2e093b...cf924e57f506