Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 79a3d04ed5a2bafd02bb2d94e75f72ab4666b155
https://github.com/phpmyadmin/phpmyadmin/commit/79a3d04ed5a2bafd02bb2d94e75…
Author: Nisarg Jhaveri <nisarg.jhaveri(a)research.iiit.ac.in>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M libraries/DisplayResults.class.php
M libraries/Util.class.php
Log Message:
-----------
Show placeholder in number of rows dropdown when showing all
- Implemented placeholder in dropdown in getDropdown in PMA_Util
- Show 'All' as placeholder when Show all is checked, in "Number of
rows:" dropdown
Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri(a)research.iiit.ac.in>
Commit: eb667424757f7d4ef7239f018e8ddd1b910b3640
https://github.com/phpmyadmin/phpmyadmin/commit/eb667424757f7d4ef7239f018e8…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M libraries/DisplayResults.class.php
M libraries/Util.class.php
Log Message:
-----------
Merge pull request #1412 from nisargjhaveri/show_all_dropdown
Show placeholder in number of rows dropdown when showing all
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/83b48f391204...eb667424757f
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 1daa32fb97b90fd1bf233cae9ed249e37fa175c4
https://github.com/phpmyadmin/phpmyadmin/commit/1daa32fb97b90fd1bf233cae9ed…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M ChangeLog
M url.php
Log Message:
-----------
bug #4612 [security] XSS vulnerability in redirection mechanism
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: a4e8d008f407d92c7177bca799c54525ba9032ad
https://github.com/phpmyadmin/phpmyadmin/commit/a4e8d008f407d92c7177bca799c…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M ChangeLog
M libraries/common.inc.php
M libraries/plugins/AuthenticationPlugin.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
Log Message:
-----------
bug #4611 [security] DOS attack with long passwords
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: 20d0f08c587288698d813e22bd7b8de85cfbb5a1
https://github.com/phpmyadmin/phpmyadmin/commit/20d0f08c587288698d813e22bd7…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
Log Message:
-----------
Deactivate this test for now
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: 41c02abc41049c4a23a08c4b05b3785ca9c0c3f1
https://github.com/phpmyadmin/phpmyadmin/commit/41c02abc41049c4a23a08c4b05b…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M ChangeLog
M libraries/common.inc.php
M libraries/plugins/AuthenticationPlugin.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
M url.php
Log Message:
-----------
Merge branch 'MAINT_4_3_0' into QA_4_3
Commit: a23a49bf5a56dd134f2a0882672d304d5c196c81
https://github.com/phpmyadmin/phpmyadmin/commit/a23a49bf5a56dd134f2a0882672…
Author: josep constanti <jconstanti(a)ovi.com>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M po/ca.po
Log Message:
-----------
Translated using Weblate (Catalan)
Currently translated at 83.7% (2495 of 2978 strings)
[CI skip]
Commit: 28d163f02c52128ee7449c44dbb9ed2a6cd6d581
https://github.com/phpmyadmin/phpmyadmin/commit/28d163f02c52128ee7449c44dbb…
Author: Weblate <noreply(a)weblate.org>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M ChangeLog
M libraries/common.inc.php
M libraries/plugins/AuthenticationPlugin.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
M url.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: 9591205e2cc7bb0d9100a74e6b5f7cb636b1051b
https://github.com/phpmyadmin/phpmyadmin/commit/9591205e2cc7bb0d9100a74e6b5…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M ChangeLog
M libraries/common.inc.php
M url.php
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: be99b2d84522349c9750c72d064466bc16ac47c4
https://github.com/phpmyadmin/phpmyadmin/commit/be99b2d84522349c9750c72d064…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Log Message:
-----------
Merge commit '28d163f'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9d13de4ead2e...be99b2d84522
Branch: refs/heads/QA_4_3
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 1daa32fb97b90fd1bf233cae9ed249e37fa175c4
https://github.com/phpmyadmin/phpmyadmin/commit/1daa32fb97b90fd1bf233cae9ed…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M ChangeLog
M url.php
Log Message:
-----------
bug #4612 [security] XSS vulnerability in redirection mechanism
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: a4e8d008f407d92c7177bca799c54525ba9032ad
https://github.com/phpmyadmin/phpmyadmin/commit/a4e8d008f407d92c7177bca799c…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M ChangeLog
M libraries/common.inc.php
M libraries/plugins/AuthenticationPlugin.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
Log Message:
-----------
bug #4611 [security] DOS attack with long passwords
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: 20d0f08c587288698d813e22bd7b8de85cfbb5a1
https://github.com/phpmyadmin/phpmyadmin/commit/20d0f08c587288698d813e22bd7…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
Log Message:
-----------
Deactivate this test for now
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: 41c02abc41049c4a23a08c4b05b3785ca9c0c3f1
https://github.com/phpmyadmin/phpmyadmin/commit/41c02abc41049c4a23a08c4b05b…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M ChangeLog
M libraries/common.inc.php
M libraries/plugins/AuthenticationPlugin.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
M url.php
Log Message:
-----------
Merge branch 'MAINT_4_3_0' into QA_4_3
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/85c866fb8f11...41c02abc4104