[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 27f616: Contest-1 BugFix #4053

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 27f616e963ce31430dc3f4b38f62669ebdac587b https://github.com/phpmyadmin/phpmyadmin/commit/27f616e963ce31430dc3f4b38f6… Author: Umair Khan <omerjerk(a)gmail.com> Date: 2014-02-11 (Tue, 11 Feb 2014) Changed paths: M js/rte.js M libraries/rte/rte_routines.lib.php Log Message: ----------- Contest-1 BugFix #4053 Signed-off-by: Umair Khan <omerjerk(a)gmail.com> Commit: 1db09959329cc2f1af681dec730cab4d5e4c5823 https://github.com/phpmyadmin/phpmyadmin/commit/1db09959329cc2f1af681dec730… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M js/rte.js M libraries/rte/rte_routines.lib.php Log Message: ----------- Merge pull request #921 from omerjerk/QA_4_1 Contest-1 BugFix #4053 Commit: 93643db0a74096d8a5b055d5cfde66fcadf9ff91 https://github.com/phpmyadmin/phpmyadmin/commit/93643db0a74096d8a5b055d5cfd… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 100.0% (2749 of 2749) Commit: fdaa3d4a8db5bff4fc3c5b3f8acf937aa184cf1c https://github.com/phpmyadmin/phpmyadmin/commit/fdaa3d4a8db5bff4fc3c5b3f8ac… Author: Anders Jonsson <anders.jonsson(a)norsjovallen.se> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M po/sv.po Log Message: ----------- Translated using Weblate (Swedish) Currently translated at 99.9% (2748 of 2749) Commit: 21c5bcf676b1f87e30c4f54f5d011eda4181ca0e https://github.com/phpmyadmin/phpmyadmin/commit/21c5bcf676b1f87e30c4f54f5d0… Author: Weblate <noreply(a)weblate.org> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M js/rte.js M libraries/rte/rte_routines.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 Commit: cea635925e671ff4fcedb39054c677da01b123d2 https://github.com/phpmyadmin/phpmyadmin/commit/cea635925e671ff4fcedb39054c… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for fix of bug #4053 Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 4f2816207adc4e9ef1f01296e55645b2014549a9 https://github.com/phpmyadmin/phpmyadmin/commit/4f2816207adc4e9ef1f01296e55… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M js/rte.js M libraries/rte/rte_routines.lib.php Log Message: ----------- Merge commit '27f616e' Commit: f76ca094a76a2051a1c733f657766771809d7e09 https://github.com/phpmyadmin/phpmyadmin/commit/f76ca094a76a2051a1c733f6577… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-02-12 (Wed, 12 Feb 2014) Log Message: ----------- Merge commit '21c5bcf' Commit: 7728961aad73e1bc2a2cdaaee84f43d18b2686f2 https://github.com/phpmyadmin/phpmyadmin/commit/7728961aad73e1bc2a2cdaaee84… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-02-12 (Wed, 12 Feb 2014) Changed paths: M ChangeLog Log Message: ----------- Merge commit 'cea6359' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d44256ef7ed6...7728961aad73