Git November 2014

git@phpmyadmin.net

22 participants
362 discussions

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5e1b5e: Keep the content of the table structure page until...
by Madhura Jayaratne 20 Nov '14

20 Nov '14

Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5e1b5e086fe7abc3a318056fffd7553b2bf2da0c https://github.com/phpmyadmin/phpmyadmin/commit/5e1b5e086fe7abc3a318056fffd… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-20 (Thu, 20 Nov 2014) Changed paths: M js/tbl_structure.js Log Message: ----------- Keep the content of the table structure page until editing page is loaded Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] bfc610: bug #4603 Field disabled when internal relations u...
by Madhura Jayaratne 20 Nov '14

20 Nov '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bfc61051b78f562914d12b60e0ae94dd131c2ba0 https://github.com/phpmyadmin/phpmyadmin/commit/bfc61051b78f562914d12b60e0a… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-20 (Thu, 20 Nov 2014) Changed paths: M ChangeLog M libraries/relation.lib.php Log Message: ----------- bug #4603 Field disabled when internal relations used Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: a0b60e090180cf3dd6fd0d47b77aa0127b3c1434 https://github.com/phpmyadmin/phpmyadmin/commit/a0b60e090180cf3dd6fd0d47b77… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-20 (Thu, 20 Nov 2014) Changed paths: M ChangeLog M libraries/relation.lib.php M libraries/tbl_columns_definition_form.inc.php Log Message: ----------- Merge branch 'QA_4_2' into QA_4_3 Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 9b61294ed8f9ac3b5d74fe198f5cb7dbe1f49f05 https://github.com/phpmyadmin/phpmyadmin/commit/9b61294ed8f9ac3b5d74fe198f5… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-20 (Thu, 20 Nov 2014) Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/relation.lib.php M libraries/tbl_columns_definition_form.inc.php M tbl_export.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php Log Message: ----------- Merge branch 'QA_4_3' Commit: 095bdd842d739fb1a59d5de607b71704fb0b8417 https://github.com/phpmyadmin/phpmyadmin/commit/095bdd842d739fb1a59d5de607b… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-20 (Thu, 20 Nov 2014) Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ed5fc179f497...095bdd842d73

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] bfc610: bug #4603 Field disabled when internal relations u...
by Madhura Jayaratne 20 Nov '14

20 Nov '14

Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: bfc61051b78f562914d12b60e0ae94dd131c2ba0 https://github.com/phpmyadmin/phpmyadmin/commit/bfc61051b78f562914d12b60e0a… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-20 (Thu, 20 Nov 2014) Changed paths: M ChangeLog M libraries/relation.lib.php Log Message: ----------- bug #4603 Field disabled when internal relations used Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: a0b60e090180cf3dd6fd0d47b77aa0127b3c1434 https://github.com/phpmyadmin/phpmyadmin/commit/a0b60e090180cf3dd6fd0d47b77… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-20 (Thu, 20 Nov 2014) Changed paths: M ChangeLog M libraries/relation.lib.php M libraries/tbl_columns_definition_form.inc.php Log Message: ----------- Merge branch 'QA_4_2' into QA_4_3 Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d067ae7dd5f4...a0b60e090180

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] bfc610: bug #4603 Field disabled when internal relations u...
by Madhura Jayaratne 20 Nov '14

20 Nov '14

Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: bfc61051b78f562914d12b60e0ae94dd131c2ba0 https://github.com/phpmyadmin/phpmyadmin/commit/bfc61051b78f562914d12b60e0a… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-20 (Thu, 20 Nov 2014) Changed paths: M ChangeLog M libraries/relation.lib.php Log Message: ----------- bug #4603 Field disabled when internal relations used Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 491c42: Patch by Robert Scheck <robert@fedoraproject.org> ...
by Marc Delisle 19 Nov '14

19 Nov '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 491c426623ff8a4f3f99078801412ed155cb168a https://github.com/phpmyadmin/phpmyadmin/commit/491c426623ff8a4f3f990788014… Author: Robert Scheck <robert(a)fedoraproject.org> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php Log Message: ----------- Patch by Robert Scheck <robert(a)fedoraproject.org> for phpMyAdmin 4.2.6 which enhances cookie encryption/decryption by the optional usage of PHP OpenSSL. Unfortunately PHP Mcrypt is not shipped by all Linux distributions however PHP OpenSSL is often enabled by default. PHP < 5.3.4 does not support passing an IV, thus this has been added as a requirement. I could have used 'BF-CBC' rather 'AES-128-CBC' but Blowfish (even it is fast) is seen by experts as weaker algorithm than AES. If this should be a show-stopper for upstream merging just replace 'AES-128-CBC' by 'BF-CBC', please. Patch adapted for 4.3.x and tests modified by Marc Delisle Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: d3fb6617f513fb97d4cc860863692072b5f8a1fd https://github.com/phpmyadmin/phpmyadmin/commit/d3fb6617f513fb97d4cc8608636… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog M libraries/display_export.lib.php M libraries/operations.lib.php M po/az.po M tbl_export.php Log Message: ----------- Merge branch 'QA_4_3' of https://github.com/phpmyadmin/phpmyadmin into QA_4_3 Commit: d067ae7dd5f4cf58597f4a5182c0f7fa6a1cb0f5 https://github.com/phpmyadmin/phpmyadmin/commit/d067ae7dd5f4cf58597f4a5182c… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: ed5fc179f497b31d2970ec8ede8649595f671c91 https://github.com/phpmyadmin/phpmyadmin/commit/ed5fc179f497b31d2970ec8ede8… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.class.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php Log Message: ----------- Merge branch 'QA_4_3' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b7e5b79ad4fa...ed5fc179f497

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 491c42: Patch by Robert Scheck <robert@fedoraproject.org> ...
by Marc Delisle 19 Nov '14

19 Nov '14

Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 491c426623ff8a4f3f99078801412ed155cb168a https://github.com/phpmyadmin/phpmyadmin/commit/491c426623ff8a4f3f990788014… Author: Robert Scheck <robert(a)fedoraproject.org> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php Log Message: ----------- Patch by Robert Scheck <robert(a)fedoraproject.org> for phpMyAdmin 4.2.6 which enhances cookie encryption/decryption by the optional usage of PHP OpenSSL. Unfortunately PHP Mcrypt is not shipped by all Linux distributions however PHP OpenSSL is often enabled by default. PHP < 5.3.4 does not support passing an IV, thus this has been added as a requirement. I could have used 'BF-CBC' rather 'AES-128-CBC' but Blowfish (even it is fast) is seen by experts as weaker algorithm than AES. If this should be a show-stopper for upstream merging just replace 'AES-128-CBC' by 'BF-CBC', please. Patch adapted for 4.3.x and tests modified by Marc Delisle Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: d3fb6617f513fb97d4cc860863692072b5f8a1fd https://github.com/phpmyadmin/phpmyadmin/commit/d3fb6617f513fb97d4cc8608636… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog M libraries/display_export.lib.php M libraries/operations.lib.php M po/az.po M tbl_export.php Log Message: ----------- Merge branch 'QA_4_3' of https://github.com/phpmyadmin/phpmyadmin into QA_4_3 Commit: d067ae7dd5f4cf58597f4a5182c0f7fa6a1cb0f5 https://github.com/phpmyadmin/phpmyadmin/commit/d067ae7dd5f4cf58597f4a5182c… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc(a)infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/837f5f46d5f7...d067ae7dd5f4

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 825209: bug #4444 No insert statement produced in SQL expo...
by Madhura Jayaratne 19 Nov '14

19 Nov '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8252099d9d5d026ffc08e2205fa73bf85537fe39 https://github.com/phpmyadmin/phpmyadmin/commit/8252099d9d5d026ffc08e2205fa… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog M tbl_export.php Log Message: ----------- bug #4444 No insert statement produced in SQL export for queries with alias Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 837f5f46d5f7b30d5c425e5d9eab707a851139af https://github.com/phpmyadmin/phpmyadmin/commit/837f5f46d5f7b30d5c425e5d9ea… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog M tbl_export.php Log Message: ----------- Merge branch 'QA_4_2' into QA_4_3 Commit: b7e5b79ad4fac0778215756ff2cbd3fcc937c1d9 https://github.com/phpmyadmin/phpmyadmin/commit/b7e5b79ad4fac0778215756ff2c… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog M tbl_export.php Log Message: ----------- Merge branch 'QA_4_3' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1ba2c4105256...b7e5b79ad4fa

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 825209: bug #4444 No insert statement produced in SQL expo...
by Madhura Jayaratne 19 Nov '14

19 Nov '14

Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8252099d9d5d026ffc08e2205fa73bf85537fe39 https://github.com/phpmyadmin/phpmyadmin/commit/8252099d9d5d026ffc08e2205fa… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog M tbl_export.php Log Message: ----------- bug #4444 No insert statement produced in SQL export for queries with alias Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 837f5f46d5f7b30d5c425e5d9eab707a851139af https://github.com/phpmyadmin/phpmyadmin/commit/837f5f46d5f7b30d5c425e5d9ea… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog M tbl_export.php Log Message: ----------- Merge branch 'QA_4_2' into QA_4_3 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3cda6ac366aa...837f5f46d5f7

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 825209: bug #4444 No insert statement produced in SQL expo...
by Madhura Jayaratne 19 Nov '14

19 Nov '14

Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8252099d9d5d026ffc08e2205fa73bf85537fe39 https://github.com/phpmyadmin/phpmyadmin/commit/8252099d9d5d026ffc08e2205fa… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog M tbl_export.php Log Message: ----------- bug #4444 No insert statement produced in SQL export for queries with alias Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 4630dd: Translated using Weblate (Azerbaijani)
by Madhura Jayaratne 19 Nov '14

19 Nov '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4630dd22d5022a17610750f2201c8c74c927adb3 https://github.com/phpmyadmin/phpmyadmin/commit/4630dd22d5022a17610750f2201… Author: Sevdimali İsa <sevdimaliisayev(a)mail.ru> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M po/az.po Log Message: ----------- Translated using Weblate (Azerbaijani) Currently translated at 50.6% (1507 of 2978 strings) [CI skip] Commit: b29a021ffcf051c3b1a4c6bc3588678cf40c83a4 https://github.com/phpmyadmin/phpmyadmin/commit/b29a021ffcf051c3b1a4c6bc358… Author: Weblate <noreply(a)weblate.org> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog M libraries/operations.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 Commit: 2e42e8a11b9cf43e08064c5a7ccd11325fe08106 https://github.com/phpmyadmin/phpmyadmin/commit/2e42e8a11b9cf43e08064c5a7cc… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog M libraries/display_export.lib.php Log Message: ----------- bug #4602 Exporting selected rows exports all rows of the query Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 0b662922dbf258ca25f6341a89f739f33439c006 https://github.com/phpmyadmin/phpmyadmin/commit/0b662922dbf258ca25f6341a89f… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog M libraries/display_export.lib.php Log Message: ----------- Merge branch 'QA_4_2' into QA_4_3 Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 3cda6ac366aaea7d7710ea074c631f59bb983acd https://github.com/phpmyadmin/phpmyadmin/commit/3cda6ac366aaea7d7710ea074c6… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M po/az.po Log Message: ----------- Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 Commit: 923f6682fb62376d5b76540184d4f4c84e68d0ca https://github.com/phpmyadmin/phpmyadmin/commit/923f6682fb62376d5b76540184d… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog M libraries/display_export.lib.php Log Message: ----------- Merge branch 'QA_4_3' Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 1ba2c4105256c949b57d9cdc85e2d14606085e38 https://github.com/phpmyadmin/phpmyadmin/commit/1ba2c4105256c949b57d9cdc85e… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M po/az.po Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/69822405cde0...1ba2c4105256

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git November 2014