Git June 2014

git@phpmyadmin.net

17 participants
513 discussions

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e43d09: Translated using Weblate (Dutch)
by Weblate 13 Jun '14

13 Jun '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e43d09bb3bb6e42f42a7d3bb646b104652262554 https://github.com/phpmyadmin/phpmyadmin/commit/e43d09bb3bb6e42f42a7d3bb646… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2014-06-13 (Fri, 13 Jun 2014) Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 99.7% (2796 of 2803) Commit: fe93f9e740dcc4612ced10ecdb3352b14935260c https://github.com/phpmyadmin/phpmyadmin/commit/fe93f9e740dcc4612ced10ecdb3… Author: Weblate <noreply(a)weblate.org> Date: 2014-06-13 (Fri, 13 Jun 2014) Changed paths: M ChangeLog M import.php M js/functions.js Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/052eb0ecace0...fe93f9e740dc

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0306e2: Fix bug#4450 Query is duplicated on Ctrl+Enter
by Marc Delisle 13 Jun '14

13 Jun '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0306e2bd887454fa4e200142416ea4dea2adbfd1 https://github.com/phpmyadmin/phpmyadmin/commit/0306e2bd887454fa4e200142416… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2014-06-13 (Fri, 13 Jun 2014) Changed paths: M js/functions.js Log Message: ----------- Fix bug#4450 Query is duplicated on Ctrl+Enter Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Commit: 531fff09fe4ba8ae50022edfb35d5b6f3fdb8281 https://github.com/phpmyadmin/phpmyadmin/commit/531fff09fe4ba8ae50022edfb35… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-06-13 (Fri, 13 Jun 2014) Changed paths: M ChangeLog M import.php Log Message: ----------- bug #4405 Cannot import (open_basedir): fix another case Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: f9d842fd725180237e594ab92f3b2586e5b7c1ba https://github.com/phpmyadmin/phpmyadmin/commit/f9d842fd725180237e594ab92f3… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-06-13 (Fri, 13 Jun 2014) Changed paths: M js/functions.js Log Message: ----------- Merge commit '0306e2b' Commit: 052eb0ecace01c5567840737d0b264cdd0965528 https://github.com/phpmyadmin/phpmyadmin/commit/052eb0ecace01c5567840737d0b… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-06-13 (Fri, 13 Jun 2014) Changed paths: M ChangeLog M import.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc(a)infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d909aa66b7f8...052eb0ecace0

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 531fff: bug #4405 Cannot import (open_basedir): fix anothe...
by Marc Delisle 13 Jun '14

13 Jun '14

Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 531fff09fe4ba8ae50022edfb35d5b6f3fdb8281 https://github.com/phpmyadmin/phpmyadmin/commit/531fff09fe4ba8ae50022edfb35… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-06-13 (Fri, 13 Jun 2014) Changed paths: M ChangeLog M import.php Log Message: ----------- bug #4405 Cannot import (open_basedir): fix another case Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0306e2: Fix bug#4450 Query is duplicated on Ctrl+Enter
by Atul Pratap Singh 13 Jun '14

13 Jun '14

Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0306e2bd887454fa4e200142416ea4dea2adbfd1 https://github.com/phpmyadmin/phpmyadmin/commit/0306e2bd887454fa4e200142416… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2014-06-13 (Fri, 13 Jun 2014) Changed paths: M js/functions.js Log Message: ----------- Fix bug#4450 Query is duplicated on Ctrl+Enter Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d909aa: Fix bug#4450 Query is duplicated on Ctrl+Enter
by Atul Pratap Singh 13 Jun '14

13 Jun '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d909aa66b7f8e654afb992204b112c06c0640e20 https://github.com/phpmyadmin/phpmyadmin/commit/d909aa66b7f8e654afb992204b1… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2014-06-13 (Fri, 13 Jun 2014) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- Fix bug#4450 Query is duplicated on Ctrl+Enter Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/scripts] bc84cb: Add hook to automatically create github releases
by Michal Čihař 12 Jun '14

12 Jun '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/scripts Commit: bc84cb078fa14031e368bf901848a31823f3b338 https://github.com/phpmyadmin/scripts/commit/bc84cb078fa14031e368bf901848a3… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-12 (Thu, 12 Jun 2014) Changed paths: A hooks/create.php M hooks/lib/github.php Log Message: ----------- Add hook to automatically create github releases Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cd4d54: Remove another reference to Blowfish
by Michal Čihař 12 Jun '14

12 Jun '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cd4d54395b13e612d351363b72550a36306ed4fa https://github.com/phpmyadmin/phpmyadmin/commit/cd4d54395b13e612d351363b725… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-12 (Thu, 12 Jun 2014) Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php Log Message: ----------- Remove another reference to Blowfish Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 5f3b69908af021c20e8f5c8520a7b90f58ea67dd https://github.com/phpmyadmin/phpmyadmin/commit/5f3b69908af021c20e8f5c8520a… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-12 (Thu, 12 Jun 2014) Changed paths: M doc/config.rst Log Message: ----------- Document that we are using AES for encryption Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 5e51f178dd57e64e2cdad25b0e7f2f240c5227be https://github.com/phpmyadmin/phpmyadmin/commit/5e51f178dd57e64e2cdad25b0e7… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-12 (Thu, 12 Jun 2014) Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php Log Message: ----------- Remove some blowfish mentions Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: da047efbd14a95ba20973efd829c73df5f9d2650 https://github.com/phpmyadmin/phpmyadmin/commit/da047efbd14a95ba20973efd829… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-12 (Thu, 12 Jun 2014) Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php Log Message: ----------- Use random per session key for encrypting password This makes it impossible to decrypt cookies later if the key would be compromised. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: e433d8189bb9cf00a17602cf183334bbf8684fc9 https://github.com/phpmyadmin/phpmyadmin/commit/e433d8189bb9cf00a17602cf183… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-12 (Thu, 12 Jun 2014) Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php Log Message: ----------- Use phpseclib for generating session encryption key Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 51d4d514f988f5d1461e03e6da6fd249b8354742 https://github.com/phpmyadmin/phpmyadmin/commit/51d4d514f988f5d1461e03e6da6… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-12 (Thu, 12 Jun 2014) Changed paths: M index.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php Log Message: ----------- Adjust tests to new encryption Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 234cfbf73f23027617c1c9764c61da9f118532d4 https://github.com/phpmyadmin/phpmyadmin/commit/234cfbf73f23027617c1c9764c6… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-12 (Thu, 12 Jun 2014) Changed paths: M doc/setup.rst M libraries/config.default.php Log Message: ----------- Document AES usage Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 92a10d09683ffc9e3874ad5c1ed8298f73ec620e https://github.com/phpmyadmin/phpmyadmin/commit/92a10d09683ffc9e3874ad5c1ed… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-12 (Thu, 12 Jun 2014) Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php Log Message: ----------- Factor out cookie storing to separate methods Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 209390c3f213558847bc88b93245f55a5d334016 https://github.com/phpmyadmin/phpmyadmin/commit/209390c3f213558847bc88b9324… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-12 (Thu, 12 Jun 2014) Changed paths: M user_password.php Log Message: ----------- Properly store password in cookie when changing it Use auth plugin method to do that, otherwise it could not work properly with autogenerated blowfish_secret. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: bd4cccc03913111f1d0502ae1366ad00da4be275 https://github.com/phpmyadmin/phpmyadmin/commit/bd4cccc03913111f1d0502ae136… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-12 (Thu, 12 Jun 2014) Changed paths: M libraries/plugins/AuthenticationPlugin.class.php M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/plugins/auth/AuthenticationHttp.class.php M user_password.php Log Message: ----------- Move password change handling to authenticaton plugins We should not care about plugin type while changing password, we should just notify it and the plugin should be responsible for anything needed. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a7bc3a73a3375e58df0f263bd44c4f4ad6db767b https://github.com/phpmyadmin/phpmyadmin/commit/a7bc3a73a3375e58df0f263bd44… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-12 (Thu, 12 Jun 2014) Changed paths: M user_password.php Log Message: ----------- Do not pas arround empty $_url_params variable Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ceb77ce6d4fc...a7bc3a73a337

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ceb77c: Function was used before it was defined
by Marc Delisle 12 Jun '14

12 Jun '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ceb77ce6d4fc473b7eac79a5292f5a3b2065b64d https://github.com/phpmyadmin/phpmyadmin/commit/ceb77ce6d4fc473b7eac79a5292… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-06-12 (Thu, 12 Jun 2014) Changed paths: M js/functions.js Log Message: ----------- Function was used before it was defined Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 98034b: Remove $GLOBALS['cfg']['Bookmark'] variable
by Michal Čihař 12 Jun '14

12 Jun '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 98034ba148b0d9fe2abcb7519c5fbc695a19c594 https://github.com/phpmyadmin/phpmyadmin/commit/98034ba148b0d9fe2abcb7519c5… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-12 (Thu, 12 Jun 2014) Changed paths: M import.php M libraries/bookmark.lib.php M libraries/sql.lib.php M libraries/sql_query_form.lib.php Log Message: ----------- Remove $GLOBALS['cfg']['Bookmark'] variable It makes it impossible to include bookmark library at any time as when it is included before configuration is loaded it caches false result for bookmarks support. And anyway, using superglobals is always bad idea. Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 2bd954: bug-4454: PMA_DatabaseInterface::getColumnsFull() ...
by Michal Čihař 12 Jun '14

12 Jun '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2bd95448787239e66ab87e4f9cd3cb47d603f5dc https://github.com/phpmyadmin/phpmyadmin/commit/2bd95448787239e66ab87e4f9cd… Author: Chirayu Chiripal <chirayu.chiripal(a)gmail.com> Date: 2014-06-12 (Thu, 12 Jun 2014) Changed paths: M libraries/DatabaseInterface.class.php Log Message: ----------- bug-4454: PMA_DatabaseInterface::getColumnsFull() when called with no database or table parameter gives incorrectly nested keys Signed-off-by: Chirayu Chiripal <chirayu.chiripal(a)gmail.com> Commit: 2b8bb91bc3a66e2014ea078a68a0962708609eee https://github.com/phpmyadmin/phpmyadmin/commit/2b8bb91bc3a66e2014ea078a68a… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-12 (Thu, 12 Jun 2014) Changed paths: M libraries/DatabaseInterface.class.php Log Message: ----------- Merge pull request #1223 from D-storm/bug-4454 bug-4454: PMA_DatabaseInterface::getColumnsFull() when called with no da... Commit: ddac366fd6e29d3b347adf81997e190a7fe78343 https://github.com/phpmyadmin/phpmyadmin/commit/ddac366fd6e29d3b347adf81997… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-06-12 (Thu, 12 Jun 2014) Changed paths: M libraries/DatabaseInterface.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' Conflicts: libraries/DatabaseInterface.class.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a7bcbbc35f5e...ddac366fd6e2

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git June 2014