Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 906ab3211229927371596cb4145b55b2e52eb110
https://github.com/phpmyadmin/phpmyadmin/commit/906ab3211229927371596cb4145…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-08-13 (Thu, 13 Aug 2015)
Changed paths:
M libraries/export.lib.php
Log Message:
-----------
Exporting metadata should be done last since it uses a USE statement
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: c1e45a02a1eb5c1e4a00e7c2ce99b747a304f8a8
https://github.com/phpmyadmin/phpmyadmin/commit/c1e45a02a1eb5c1e4a00e7c2ce9…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-08-13 (Thu, 13 Aug 2015)
Changed paths:
M ChangeLog
M libraries/phpseclib/Crypt/AES.php
M libraries/phpseclib/Crypt/Base.php
M libraries/phpseclib/Crypt/Random.php
M libraries/phpseclib/Crypt/Rijndael.php
A libraries/phpseclib/LICENSE
M libraries/plugins/auth/AuthenticationCookie.class.php
A libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php
A libraries/plugins/auth/recaptcha/ReCaptcha/Response.php
A libraries/plugins/auth/recaptcha/autoload.php
R libraries/plugins/auth/recaptcha/recaptchalib.php
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:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e2ebde3792df...c1e45a02a1eb
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: ea422a327ef73ba8bd60bf6f23205ef069563781
https://github.com/phpmyadmin/phpmyadmin/commit/ea422a327ef73ba8bd60bf6f232…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M libraries/phpseclib/Crypt/AES.php
M libraries/phpseclib/Crypt/Base.php
M libraries/phpseclib/Crypt/Random.php
M libraries/phpseclib/Crypt/Rijndael.php
A libraries/phpseclib/LICENSE
M libraries/plugins/auth/AuthenticationCookie.class.php
Log Message:
-----------
Fix #11387 phpseclib < 2.0 produces deprecated messages on PHP
Update phpseclib to version 2.0.0
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 790671864b539df093b059aba6fbb9c49a9dcb21
https://github.com/phpmyadmin/phpmyadmin/commit/790671864b539df093b059aba6f…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M libraries/phpseclib/Crypt/AES.php
M libraries/phpseclib/Crypt/Base.php
M libraries/phpseclib/Crypt/Random.php
M libraries/phpseclib/Crypt/Rijndael.php
A libraries/phpseclib/LICENSE
M libraries/plugins/auth/AuthenticationCookie.class.php
Log Message:
-----------
Merge pull request #11391 from madhuracj/issue11387
Fix #11387 phpseclib < 2.0 produces deprecated messages on PHP
Commit: 7c63935d721af8985f9b3eb7921707f26e0d2cb2
https://github.com/phpmyadmin/phpmyadmin/commit/7c63935d721af8985f9b3eb7921…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
ChangeLog entry
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: 2bfe60538489a8167ae1f687c705920c4d19aec2
https://github.com/phpmyadmin/phpmyadmin/commit/2bfe60538489a8167ae1f687c70…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M ChangeLog
M libraries/phpseclib/Crypt/AES.php
M libraries/phpseclib/Crypt/Base.php
M libraries/phpseclib/Crypt/Random.php
M libraries/phpseclib/Crypt/Rijndael.php
A libraries/phpseclib/LICENSE
M libraries/plugins/auth/AuthenticationCookie.class.php
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6e23dcfc26ea...2bfe60538489
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 200d5215add0426a2caa8ac741c39ad1f975efab
https://github.com/phpmyadmin/phpmyadmin/commit/200d5215add0426a2caa8ac741c…
Author: Lari Oesch <lari(a)oesch.me>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M po/fi.po
Log Message:
-----------
Translated using Weblate (Finnish)
Currently translated at 58.9% (1887 of 3200 strings)
[CI skip]
Commit: a1401a3e729442967bf0d27d19cb2a69734e21f2
https://github.com/phpmyadmin/phpmyadmin/commit/a1401a3e729442967bf0d27d19c…
Author: Weblate <noreply(a)weblate.org>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M libraries/plugins/auth/AuthenticationCookie.class.php
A libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php
A libraries/plugins/auth/recaptcha/ReCaptcha/Response.php
A libraries/plugins/auth/recaptcha/autoload.php
R libraries/plugins/auth/recaptcha/recaptchalib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5bf03ef3e728...a1401a3e7294