Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: fe477911e4aa714d26a694d0387bf46e31f79867
https://github.com/phpmyadmin/phpmyadmin/commit/fe477911e4aa714d26a694d0387…
Author: Jocelyn Flament <jocelyn.flament(a)gmail.com>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M po/fr.po
Log Message:
-----------
Translated using Weblate (French)
Currently translated at 99.6% (3198 of 3208 strings)
[CI skip]
Commit: c5beea64fd7fa54cdb31103b4ae01596b2888cd7
https://github.com/phpmyadmin/phpmyadmin/commit/c5beea64fd7fa54cdb31103b4ae…
Author: Weblate <noreply(a)weblate.org>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M export.php
M libraries/Message.php
M test/classes/MessageTest.php
M test/classes/plugin/export/ExportCodegenTest.php
M test/classes/plugin/export/ExportCsvTest.php
M test/classes/plugin/export/ExportExcelTest.php
M test/classes/plugin/export/ExportHtmlwordTest.php
M test/classes/plugin/export/ExportJsonTest.php
M test/classes/plugin/export/ExportLatexTest.php
M test/classes/plugin/export/ExportMediawikiTest.php
M test/classes/plugin/export/ExportOdsTest.php
M test/classes/plugin/export/ExportOdtTest.php
M test/classes/plugin/export/ExportPdfTest.php
M test/classes/plugin/export/ExportPhparrayTest.php
M test/classes/plugin/export/ExportSqlTest.php
M test/classes/plugin/export/ExportTexytextTest.php
M test/classes/plugin/export/ExportXmlTest.php
M test/classes/plugin/export/ExportYamlTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/45ef3aed7551...c5beea64fd7f
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: fe18b9477f019e48be49c901b9102361c21a05ba
https://github.com/phpmyadmin/phpmyadmin/commit/fe18b9477f019e48be49c901b91…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M libraries/Message.php
M test/classes/MessageTest.php
Log Message:
-----------
Remove possibility to use global name as message string
This is really confusing and can cause surprising effects when parameter
(eg. table name) matches some global.
Also I think this is really not used anywhere.
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 45ef3aed7551d77e7cae012924c62c684651812c
https://github.com/phpmyadmin/phpmyadmin/commit/45ef3aed7551d77e7cae012924c…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M export.php
M test/classes/plugin/export/ExportCodegenTest.php
M test/classes/plugin/export/ExportCsvTest.php
M test/classes/plugin/export/ExportExcelTest.php
M test/classes/plugin/export/ExportHtmlwordTest.php
M test/classes/plugin/export/ExportJsonTest.php
M test/classes/plugin/export/ExportLatexTest.php
M test/classes/plugin/export/ExportMediawikiTest.php
M test/classes/plugin/export/ExportOdsTest.php
M test/classes/plugin/export/ExportOdtTest.php
M test/classes/plugin/export/ExportPdfTest.php
M test/classes/plugin/export/ExportPhparrayTest.php
M test/classes/plugin/export/ExportSqlTest.php
M test/classes/plugin/export/ExportTexytextTest.php
M test/classes/plugin/export/ExportXmlTest.php
M test/classes/plugin/export/ExportYamlTest.php
Log Message:
-----------
Remove needless inclusion of export.php from tests
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8af7b7e48afd...45ef3aed7551