Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 34f310cb5947559cf7c632e189101e932d6bb736 https://github.com/phpmyadmin/phpmyadmin/commit/34f310cb5947559cf7c632e18910... Author: nils kristian tomren slx@nilsk.net Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths: M po/nb.po
Log Message: ----------- Translated using Weblate (Norwegian Bokmål)
Currently translated at 58.5% (1879 of 3211 strings)
[CI skip]
Commit: 99be092325dbf12b9665290f7cd751907914b3bb https://github.com/phpmyadmin/phpmyadmin/commit/99be092325dbf12b9665290f7cd7... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths: M libraries/controllers/TableStructureController.class.php
Log Message: ----------- Fixes issue 11661
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: ab5de224adf6ece637cf3144bced80248edf60df https://github.com/phpmyadmin/phpmyadmin/commit/ab5de224adf6ece637cf3144bced... Author: Deven Bansod devenbansod@users.noreply.github.com Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths: M libraries/controllers/TableStructureController.class.php
Log Message: ----------- Merge pull request #11662 from devenbansod/fix_11661
Fix #11661 : Error changing table column's encoding (collation)
Commit: 3518d5cffff7f3decf4ef51c4e1be5d4565f04fd https://github.com/phpmyadmin/phpmyadmin/commit/3518d5cffff7f3decf4ef51c4e1b... Author: Michal Čihař michal@cihar.com Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths: M po/cs.po
Log Message: ----------- Translated using Weblate (Czech)
Currently translated at 95.8% (3077 of 3211 strings)
[CI skip]
Commit: 3beaef2d75b0f1fdeb930460c4d4b0add0bef259 https://github.com/phpmyadmin/phpmyadmin/commit/3beaef2d75b0f1fdeb930460c4d4... Author: Michal Čihař michal@cihar.com Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths: M po/nl.po
Log Message: ----------- Translated using Weblate (Dutch)
Currently translated at 100.0% (3211 of 3211 strings)
[CI skip]
Commit: 2ff1f96f40f768cb331093e6eec79b2ccb043db1 https://github.com/phpmyadmin/phpmyadmin/commit/2ff1f96f40f768cb331093e6eec7... Author: Michal Čihař michal@cihar.com Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths: M po/fi.po
Log Message: ----------- Translated using Weblate (Finnish)
Currently translated at 67.4% (2167 of 3211 strings)
[CI skip]
Commit: 5d3c7d868036fbe5c0b6d61b325160f8afcd4b68 https://github.com/phpmyadmin/phpmyadmin/commit/5d3c7d868036fbe5c0b6d61b3251... Author: Michal Čihař michal@cihar.com Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths: M po/it.po
Log Message: ----------- Translated using Weblate (Italian)
Currently translated at 100.0% (3211 of 3211 strings)
[CI skip]
Commit: 77e213d5b3fafc89917fb9cbb8502ca026470847 https://github.com/phpmyadmin/phpmyadmin/commit/77e213d5b3fafc89917fb9cbb850... Author: Michal Čihař michal@cihar.com Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths: M po/sv.po
Log Message: ----------- Translated using Weblate (Swedish)
Currently translated at 99.7% (3203 of 3211 strings)
[CI skip]
Commit: be02151e80a102f9823c2ee7c053edf3b0028c88 https://github.com/phpmyadmin/phpmyadmin/commit/be02151e80a102f9823c2ee7c053... Author: Weblate noreply@weblate.org Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths: M libraries/controllers/TableStructureController.class.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5
Commit: b49169c895296710b669b9a0039ee18b307701d5 https://github.com/phpmyadmin/phpmyadmin/commit/b49169c895296710b669b9a0039e... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entry for issue #11661
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: c62672edd0262c2be060f3654e476001cf990633 https://github.com/phpmyadmin/phpmyadmin/commit/c62672edd0262c2be060f3654e47... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths: M ChangeLog M libraries/controllers/table/TableStructureController.php
Log Message: ----------- Merge branch 'QA_4_5'
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Conflicts: po/cs.po po/fi.po po/it.po po/nb.po po/nl.po po/sv.po
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/af057c41f1fa...c62672edd026
-
Deven Bansod