Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 13a3fb0635cf2f849a1c1daaed70ae6f787c2ab5
https://github.com/phpmyadmin/phpmyadmin/commit/13a3fb0635cf2f849a1c1daaed7…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2015-06-22 (Mon, 22 Jun 2015)
Changed paths:
M test/classes/PMA_Config_test.php
M test/classes/PMA_Util_test.php
Log Message:
-----------
Revert "Temporarily deactivate these tests (almost always fail on ci.phpmyadmin.net)"
This reverts commit 9403921e4e689be0e62ccc23e9634039e94792ea.
We should really test those. In case the requests will fail, some other
solution should be found to actually execute this code.
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Conflicts:
test/classes/PMA_Config_test.php
test/classes/PMA_Util_test.php
test/libraries/PMA_SetupIndex_test.php
Commit: 67c858265d00602dec82c63375e43fdaf5690f75
https://github.com/phpmyadmin/phpmyadmin/commit/67c858265d00602dec82c63375e…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2015-06-22 (Mon, 22 Jun 2015)
Changed paths:
M libraries/Config.class.php
Log Message:
-----------
Add error checking
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 52ea1026adf67ccb04b6b3d09f7feb89e27aa346
https://github.com/phpmyadmin/phpmyadmin/commit/52ea1026adf67ccb04b6b3d09f7…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2015-06-22 (Mon, 22 Jun 2015)
Changed paths:
M libraries/Util.class.php
Log Message:
-----------
Remove type annotation
It seems to be broken on some PHP versions:
Argument 1 passed to PMA_Util::configureCurl() must be an instance of
resource, resource given, called in libraries/Config.class.php on line
774 and defined
Seen this on my workstation with PHP 5.6.1 and Google shows some hits of
this as well.
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/14e630f6aa9b...52ea1026adf6
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 536b0a6245634c08a2e648c663457aaf9507887c
https://github.com/phpmyadmin/phpmyadmin/commit/536b0a6245634c08a2e648c6634…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-06-22 (Mon, 22 Jun 2015)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/bs.po
M po/ca.po
M po/ckb.po
M po/cs.po
M po/cy.po
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/eo.po
M po/es.po
M po/et.po
M po/eu.po
M po/fa.po
M po/fi.po
M po/fr.po
M po/fy.po
M po/gl.po
M po/he.po
M po/hi.po
M po/hr.po
M po/hu.po
M po/hy.po
M po/ia.po
M po/id.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kk.po
M po/km.po
M po/kn.po
M po/ko.po
M po/ksh.po
M po/ky.po
M po/li.po
M po/lt.po
M po/lv.po
M po/mk.po
M po/ml.po
M po/mn.po
M po/ms.po
M po/nb.po
M po/ne.po
M po/nl.po
M po/pa.po
M po/phpmyadmin.pot
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/si.po
M po/sk.po
M po/sl.po
M po/sq.po
M po/sr.po
M po/sr(a)latin.po
M po/sv.po
M po/ta.po
M po/te.po
M po/th.po
M po/tk.po
M po/tr.po
M po/tt.po
M po/ug.po
M po/uk.po
M po/ur.po
M po/uz.po
M po/uz(a)latin.po
M po/vi.po
M po/vls.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update po files
[CI skip]
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: e0aa1a4c9226b4c54eba503f2de4a2f0abbc1a54
https://github.com/phpmyadmin/phpmyadmin/commit/e0aa1a4c9226b4c54eba503f2de…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-06-22 (Mon, 22 Jun 2015)
Changed paths:
M doc/config.rst
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/config/user_preferences.forms.php
M libraries/sql.lib.php
Log Message:
-----------
#4963 Improve/restore non-unique index row editing
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 7edd9524c0d3c3c6ff83001e86c987002080c15e
https://github.com/phpmyadmin/phpmyadmin/commit/7edd9524c0d3c3c6ff83001e86c…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-06-22 (Mon, 22 Jun 2015)
Changed paths:
M doc/config.rst
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/config/user_preferences.forms.php
M libraries/sql.lib.php
Log Message:
-----------
Merge pull request #1751 from madhuracj/bug4963
#4963 Improve/restore non-unique index row editing
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7d8faa6818d6...7edd9524c0d3