- Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] 0a2fac: Properly use plural for message with number of que...
by Michal Čihař 17 Feb '16

17 Feb '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0a2facdfe9a74fa018cfc64477257e55ef69ee50 https://github.com/phpmyadmin/phpmyadmin/commit/0a2facdfe9a74fa018cfc644772… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M import.php Log Message: ----------- Properly use plural for message with number of queries Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ed44120194a5198fddb5bacebaab0f342017267c https://github.com/phpmyadmin/phpmyadmin/commit/ed44120194a5198fddb5bacebaa… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) 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/brx.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/gu.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: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6d33a475ebe7...ed44120194a5

1 0

[phpmyadmin/phpmyadmin] a411cd: The cell_align_left is defined in common.inc.php s...
by Michal Čihař 17 Feb '16

17 Feb '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: a411cd0ca4a358bb104551bb1a2accc023fa19f5 https://github.com/phpmyadmin/phpmyadmin/commit/a411cd0ca4a358bb104551bb1a2… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/Util.php Log Message: ----------- The cell_align_left is defined in common.inc.php so it should available in all cases Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 6d33a475ebe737860639a8276890b1b06be9bd3f https://github.com/phpmyadmin/phpmyadmin/commit/6d33a475ebe737860639a827689… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/Util.php Log Message: ----------- Fixed rendering of messages without SQL query It should get rounded boxes at bottom, but didn't get it. Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8bf212f6c321...6d33a475ebe7

1 0

[phpmyadmin/phpmyadmin] a411cd: The cell_align_left is defined in common.inc.php s...
by Michal Čihař 17 Feb '16

17 Feb '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a411cd0ca4a358bb104551bb1a2accc023fa19f5 https://github.com/phpmyadmin/phpmyadmin/commit/a411cd0ca4a358bb104551bb1a2… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/Util.php Log Message: ----------- The cell_align_left is defined in common.inc.php so it should available in all cases Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 6d33a475ebe737860639a8276890b1b06be9bd3f https://github.com/phpmyadmin/phpmyadmin/commit/6d33a475ebe737860639a827689… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/Util.php Log Message: ----------- Fixed rendering of messages without SQL query It should get rounded boxes at bottom, but didn't get it. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: cd0e1000a82564682a5f895d045be736fe5db1a0 https://github.com/phpmyadmin/phpmyadmin/commit/cd0e1000a82564682a5f895d045… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/Util.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f1379e2b26e8...cd0e1000a825

1 0

[phpmyadmin/phpmyadmin] 855145: Revert "Always use local static storage of execute...
by Michal Čihař 17 Feb '16

17 Feb '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 855145988ca9f92bea97c6568212c0b4da1b61c4 https://github.com/phpmyadmin/phpmyadmin/commit/855145988ca9f92bea97c656821… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/import.lib.php Log Message: ----------- Revert "Always use local static storage of executed queries" This reverts commit ee8f9b0dba8afd6fd736a0bf8601c3e5cd3b9e49. Commit: 5563f3e137d5dbdb22346294ddefd0d5005eaf92 https://github.com/phpmyadmin/phpmyadmin/commit/5563f3e137d5dbdb22346294dde… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/plugins/import/ImportSql.php Log Message: ----------- Revert "Remove sql data parameter" This reverts commit 84c12c2fddc52374a6358cbe4a8140675b553b7f. Commit: dd09116716cc6eb37e314f4b9f0eefac9e1c769e https://github.com/phpmyadmin/phpmyadmin/commit/dd09116716cc6eb37e314f4b9f0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/import.lib.php M libraries/plugins/import/ImportCsv.php M libraries/plugins/import/ImportLdi.php M libraries/plugins/import/ImportMediawiki.php M libraries/plugins/import/ImportOds.php M libraries/plugins/import/ImportShp.php M libraries/plugins/import/ImportXml.php M libraries/plugins/import/README Log Message: ----------- Correct fix for table import processing We need to consistently propagate the $sql_data array. Issue #11850 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 8bf212f6c321168e8deb050d8dec6e9a2a9a4810 https://github.com/phpmyadmin/phpmyadmin/commit/8bf212f6c321168e8deb050d8de… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M import.php Log Message: ----------- Avoid displaying import query twice Fixes #11907 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/18f9231d742c...8bf212f6c321

1 0

[phpmyadmin/phpmyadmin] 855145: Revert "Always use local static storage of execute...
by Michal Čihař 17 Feb '16

17 Feb '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 855145988ca9f92bea97c6568212c0b4da1b61c4 https://github.com/phpmyadmin/phpmyadmin/commit/855145988ca9f92bea97c656821… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/import.lib.php Log Message: ----------- Revert "Always use local static storage of executed queries" This reverts commit ee8f9b0dba8afd6fd736a0bf8601c3e5cd3b9e49. Commit: 5563f3e137d5dbdb22346294ddefd0d5005eaf92 https://github.com/phpmyadmin/phpmyadmin/commit/5563f3e137d5dbdb22346294dde… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/plugins/import/ImportSql.php Log Message: ----------- Revert "Remove sql data parameter" This reverts commit 84c12c2fddc52374a6358cbe4a8140675b553b7f. Commit: dd09116716cc6eb37e314f4b9f0eefac9e1c769e https://github.com/phpmyadmin/phpmyadmin/commit/dd09116716cc6eb37e314f4b9f0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/import.lib.php M libraries/plugins/import/ImportCsv.php M libraries/plugins/import/ImportLdi.php M libraries/plugins/import/ImportMediawiki.php M libraries/plugins/import/ImportOds.php M libraries/plugins/import/ImportShp.php M libraries/plugins/import/ImportXml.php M libraries/plugins/import/README Log Message: ----------- Correct fix for table import processing We need to consistently propagate the $sql_data array. Issue #11850 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 8bf212f6c321168e8deb050d8dec6e9a2a9a4810 https://github.com/phpmyadmin/phpmyadmin/commit/8bf212f6c321168e8deb050d8de… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M import.php Log Message: ----------- Avoid displaying import query twice Fixes #11907 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f1379e2b26e89c63c6b663b9dc2fc62d80882898 https://github.com/phpmyadmin/phpmyadmin/commit/f1379e2b26e89c63c6b663b9dc2… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M import.php M libraries/import.lib.php M libraries/plugins/import/ImportCsv.php M libraries/plugins/import/ImportLdi.php M libraries/plugins/import/ImportMediawiki.php M libraries/plugins/import/ImportOds.php M libraries/plugins/import/ImportShp.php M libraries/plugins/import/ImportSql.php M libraries/plugins/import/ImportXml.php M libraries/plugins/import/README Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2670a1499fca...f1379e2b26e8

1 0

[phpmyadmin/phpmyadmin] 84c12c: Remove sql data parameter
by Michal Čihař 17 Feb '16

17 Feb '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 84c12c2fddc52374a6358cbe4a8140675b553b7f https://github.com/phpmyadmin/phpmyadmin/commit/84c12c2fddc52374a6358cbe4a8… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/plugins/import/ImportSql.php Log Message: ----------- Remove sql data parameter This just makes the SQL import different from others leading to subtle breakages. Issue #11850 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ee8f9b0dba8afd6fd736a0bf8601c3e5cd3b9e49 https://github.com/phpmyadmin/phpmyadmin/commit/ee8f9b0dba8afd6fd736a0bf860… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/import.lib.php Log Message: ----------- Always use local static storage of executed queries Issue #11850 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 6895a1fc6e835c845635069bcc0d9c5e2f1c4668 https://github.com/phpmyadmin/phpmyadmin/commit/6895a1fc6e835c845635069bcc0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Revert "fix_11907" This reverts commit bfe30d1261e33ee2446f4205070e326ccba07cca. It removes the message in many cases where it should be shown. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 18f9231d742caf2fa99f7f8400323873de773673 https://github.com/phpmyadmin/phpmyadmin/commit/18f9231d742caf2fa99f7f84003… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M ChangeLog M libraries/import.lib.php Log Message: ----------- Fixed CSV import Fixes #11850 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/06b9a8b6e158...18f9231d742c

1 0

[phpmyadmin/phpmyadmin] 84c12c: Remove sql data parameter
by Michal Čihař 17 Feb '16

17 Feb '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 84c12c2fddc52374a6358cbe4a8140675b553b7f https://github.com/phpmyadmin/phpmyadmin/commit/84c12c2fddc52374a6358cbe4a8… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/plugins/import/ImportSql.php Log Message: ----------- Remove sql data parameter This just makes the SQL import different from others leading to subtle breakages. Issue #11850 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ee8f9b0dba8afd6fd736a0bf8601c3e5cd3b9e49 https://github.com/phpmyadmin/phpmyadmin/commit/ee8f9b0dba8afd6fd736a0bf860… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/import.lib.php Log Message: ----------- Always use local static storage of executed queries Issue #11850 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 6895a1fc6e835c845635069bcc0d9c5e2f1c4668 https://github.com/phpmyadmin/phpmyadmin/commit/6895a1fc6e835c845635069bcc0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Revert "fix_11907" This reverts commit bfe30d1261e33ee2446f4205070e326ccba07cca. It removes the message in many cases where it should be shown. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 18f9231d742caf2fa99f7f8400323873de773673 https://github.com/phpmyadmin/phpmyadmin/commit/18f9231d742caf2fa99f7f84003… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M ChangeLog M libraries/import.lib.php Log Message: ----------- Fixed CSV import Fixes #11850 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 2670a1499fca88ce9c2095b26221299dd935a766 https://github.com/phpmyadmin/phpmyadmin/commit/2670a1499fca88ce9c2095b2622… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M ChangeLog M libraries/import.lib.php M libraries/plugins/import/ImportSql.php M libraries/sql.lib.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c81bed28254d...2670a1499fca

1 0

[phpmyadmin/phpmyadmin] 6fe468: Improve syslog integration
by Michal Čihař 17 Feb '16

17 Feb '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6fe468f7db3b872527ee3d13d96f5189ecce0dc6 https://github.com/phpmyadmin/phpmyadmin/commit/6fe468f7db3b872527ee3d13d96… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/logging.lib.php Log Message: ----------- Improve syslog integration - correctly open log - log only failures Issue #6146 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c81bed28254dbb3b1f00e8eb87ef47d8aa598f29 https://github.com/phpmyadmin/phpmyadmin/commit/c81bed28254dbb3b1f00e8eb87e… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M doc/setup.rst Log Message: ----------- Document syslog logging Issue #6146 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/95819f1557b3...c81bed28254d

1 0

[phpmyadmin/phpmyadmin] bfe30d: fix_11907
by Michal Čihař 17 Feb '16

17 Feb '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: bfe30d1261e33ee2446f4205070e326ccba07cca https://github.com/phpmyadmin/phpmyadmin/commit/bfe30d1261e33ee2446f4205070… Author: Piyush <poush12(a)gmail.com> Date: 2016-02-12 (Fri, 12 Feb 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- fix_11907 Signed-off-by: Piyush <poush12(a)gmail.com> Commit: 9810eab993361a11a88f3345071b056c5db46c95 https://github.com/phpmyadmin/phpmyadmin/commit/9810eab993361a11a88f3345071… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/11958' into QA_4_6 Commit: 06b9a8b6e1588b50972418004df77690583af1e9 https://github.com/phpmyadmin/phpmyadmin/commit/06b9a8b6e1588b50972418004df… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for issue #11907 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4962eecfe01f...06b9a8b6e158

1 0

[phpmyadmin/phpmyadmin] bfe30d: fix_11907
by Michal Čihař 17 Feb '16

17 Feb '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bfe30d1261e33ee2446f4205070e326ccba07cca https://github.com/phpmyadmin/phpmyadmin/commit/bfe30d1261e33ee2446f4205070… Author: Piyush <poush12(a)gmail.com> Date: 2016-02-12 (Fri, 12 Feb 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- fix_11907 Signed-off-by: Piyush <poush12(a)gmail.com> Commit: 9810eab993361a11a88f3345071b056c5db46c95 https://github.com/phpmyadmin/phpmyadmin/commit/9810eab993361a11a88f3345071… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M libraries/sql.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/11958' into QA_4_6 Commit: 06b9a8b6e1588b50972418004df77690583af1e9 https://github.com/phpmyadmin/phpmyadmin/commit/06b9a8b6e1588b50972418004df… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for issue #11907 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 95819f1557b36f545c6521ae982a491bd104d0f4 https://github.com/phpmyadmin/phpmyadmin/commit/95819f1557b36f545c6521ae982… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-17 (Wed, 17 Feb 2016) Changed paths: M ChangeLog M libraries/sql.lib.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3076d552e11a...95819f1557b3

1 0