Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2189c875356fc1af21c6da32235bf24f60f53b96 https://github.com/phpmyadmin/phpmyadmin/commit/2189c875356fc1af21c6da32235b... Author: Marc Delisle marc@infomarc.info Date: 2013-05-24 (Fri, 24 May 2013)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.0.2 release
Commit: 9b3551601ce714adb5e3f428476052f0ec6093bf https://github.com/phpmyadmin/phpmyadmin/commit/9b3551601ce714adb5e3f4284760... Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: 2013-05-29 (Wed, 29 May 2013)
Changed paths: M view_create.php
Log Message: ----------- escape query in error message
Commit: b3388dd0c6bcfdfcc2fd1c33b6e7407e30e2d28d https://github.com/phpmyadmin/phpmyadmin/commit/b3388dd0c6bcfdfcc2fd1c33b6e7... Author: J.M me@mynetx.net Date: 2013-05-31 (Fri, 31 May 2013)
Changed paths: M view_create.php
Log Message: ----------- Merge branch 'MAINT_4_0_2-security' into QA_4_0
Commit: 3311c6f1615922a1c0666d40ef9fe55c9db2fa71 https://github.com/phpmyadmin/phpmyadmin/commit/3311c6f1615922a1c0666d40ef9f... Author: J.M me@mynetx.net Date: 2013-05-31 (Fri, 31 May 2013)
Changed paths: M ChangeLog
Log Message: ----------- Changelog entry for Javascript execution vulnerability PMASA-2013-6
Commit: c2d9a2f0c4179cec69c55ca53699678d66c2314e https://github.com/phpmyadmin/phpmyadmin/commit/c2d9a2f0c4179cec69c55ca53699... Author: Michal Čihař michal@cihar.com Date: 2013-05-31 (Fri, 31 May 2013)
Changed paths: M po/bn.po
Log Message: ----------- Translated using Weblate (Bengali)
Currently translated at 20.3% (529 of 2602)
Commit: bd088b1f13e9cfdef2f71c39d4a088ae55b6f88f https://github.com/phpmyadmin/phpmyadmin/commit/bd088b1f13e9cfdef2f71c39d4a0... Author: Robert Readman robert_readman@hotmail.com Date: 2013-05-31 (Fri, 31 May 2013)
Changed paths: M po/en_GB.po
Log Message: ----------- Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (2602 of 2602)
Commit: fe1fe990ac2b7a8c766711f2cc6b9933e81154d3 https://github.com/phpmyadmin/phpmyadmin/commit/fe1fe990ac2b7a8c766711f2cc6b... Author: Michal Čihař michal@cihar.com Date: 2013-05-31 (Fri, 31 May 2013)
Changed paths: M po/de.po
Log Message: ----------- Translated using Weblate (German)
Currently translated at 99.8% (2597 of 2602)
Commit: db0201b679189fd8b5ae02673fb2cd63d5da4a55 https://github.com/phpmyadmin/phpmyadmin/commit/db0201b679189fd8b5ae02673fb2... Author: Yungu Kim crimsonpi@gmail.com Date: 2013-05-31 (Fri, 31 May 2013)
Changed paths: M po/ko.po
Log Message: ----------- Translated using Weblate (Korean)
Currently translated at 65.9% (1716 of 2602)
Commit: c4e3c9a1839e7ebd678de35247388c3407e170f5 https://github.com/phpmyadmin/phpmyadmin/commit/c4e3c9a1839e7ebd678de3524738... Author: Weblate noreply@weblate.org Date: 2013-05-31 (Fri, 31 May 2013)
Changed paths: M ChangeLog M view_create.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Commit: e30a399398981270a69de29ff9278736d196144f https://github.com/phpmyadmin/phpmyadmin/commit/e30a399398981270a69de29ff927... Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: 2013-05-31 (Fri, 31 May 2013)
Changed paths: M ChangeLog M view_create.php
Log Message: ----------- Merge commit '3311c6f'
Conflicts: view_create.php
Commit: 90cd927424a88bb96d3d211b875c1d75e7f7f143 https://github.com/phpmyadmin/phpmyadmin/commit/90cd927424a88bb96d3d211b875c... Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: 2013-05-31 (Fri, 31 May 2013)
Log Message: ----------- Merge remote branch 'origin/QA_4_0'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1a72ca2bc040...90cd927424a8
-
Dieter Adriaenssens