Git December 2015

git@phpmyadmin.net

20 participants
376 discussions

[phpmyadmin/phpmyadmin] 5a6d9c: Undefined property
by Marc Delisle 11 Dec '15

11 Dec '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5a6d9c010b14349e778d36e88eb60dcdafa33cea https://github.com/phpmyadmin/phpmyadmin/commit/5a6d9c010b14349e778d36e88eb… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M libraries/plugins/schema/eps/EpsRelationSchema.php Log Message: ----------- Undefined property Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[phpmyadmin/localized_docs] 428199: Translated using Weblate (French)
by Marc Delisle 11 Dec '15

11 Dec '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/localized_docs Commit: 428199ed88095dec55f1c3ea3922fc6b9cc70f2e https://github.com/phpmyadmin/localized_docs/commit/428199ed88095dec55f1c3e… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M po/fr.mo M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 97.0% (1855 of 1911 strings) [CI skip]

1 0

[phpmyadmin/phpmyadmin] ceeec4: #11728 CSV import skip row count after
by Madhura Jayaratne 11 Dec '15

11 Dec '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ceeec424d7dd3ee499d09e4ade7519c2a1f3769c https://github.com/phpmyadmin/phpmyadmin/commit/ceeec424d7dd3ee499d09e4ade7… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M ChangeLog M libraries/display_import.lib.php Log Message: ----------- #11728 CSV import skip row count after Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 76a416283aac635cdd189ab8f8b8c35f4fb50da2 https://github.com/phpmyadmin/phpmyadmin/commit/76a416283aac635cdd189ab8f8b… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M test/classes/plugin/export/PMA_ExportXml_test.php Log Message: ----------- Fix failing tests Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 6016b64836afd88f9efa398ba31a7619b8ffe309 https://github.com/phpmyadmin/phpmyadmin/commit/6016b64836afd88f9efa398ba31… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M test/classes/plugin/export/PMA_ExportSql_test.php Log Message: ----------- Loosen some assertions. We are tying to prevent calls to dbi. Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 968bfd354c93603e06694713acc76a5b541ee459 https://github.com/phpmyadmin/phpmyadmin/commit/968bfd354c93603e06694713acc… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M test/classes/plugin/export/PMA_ExportSql_test.php M test/classes/plugin/export/PMA_ExportXml_test.php Log Message: ----------- Fix broken tests Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 1c7282b85977943e82c2287cf4da17d34a042fc1 https://github.com/phpmyadmin/phpmyadmin/commit/1c7282b85977943e82c2287cf4d… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M ChangeLog M libraries/display_import.lib.php M test/classes/plugin/export/ExportSqlTest.php M test/classes/plugin/export/ExportXmlTest.php Log Message: ----------- Merge branch 'QA_4_5' Conflicts: test/classes/plugin/export/ExportSqlTest.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/dcdd08a0439c...1c7282b85977

1 0

[phpmyadmin/phpmyadmin] 968bfd: Fix broken tests
by Madhura Jayaratne 11 Dec '15

11 Dec '15

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 968bfd354c93603e06694713acc76a5b541ee459 https://github.com/phpmyadmin/phpmyadmin/commit/968bfd354c93603e06694713acc… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M test/classes/plugin/export/PMA_ExportSql_test.php M test/classes/plugin/export/PMA_ExportXml_test.php Log Message: ----------- Fix broken tests Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] 6016b6: Loosen some assertions. We are tying to prevent ca...
by Madhura Jayaratne 11 Dec '15

11 Dec '15

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6016b64836afd88f9efa398ba31a7619b8ffe309 https://github.com/phpmyadmin/phpmyadmin/commit/6016b64836afd88f9efa398ba31… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M test/classes/plugin/export/PMA_ExportSql_test.php Log Message: ----------- Loosen some assertions. We are tying to prevent calls to dbi. Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] ceeec4: #11728 CSV import skip row count after
by Madhura Jayaratne 11 Dec '15

11 Dec '15

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: ceeec424d7dd3ee499d09e4ade7519c2a1f3769c https://github.com/phpmyadmin/phpmyadmin/commit/ceeec424d7dd3ee499d09e4ade7… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M ChangeLog M libraries/display_import.lib.php Log Message: ----------- #11728 CSV import skip row count after Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 76a416283aac635cdd189ab8f8b8c35f4fb50da2 https://github.com/phpmyadmin/phpmyadmin/commit/76a416283aac635cdd189ab8f8b… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M test/classes/plugin/export/PMA_ExportXml_test.php Log Message: ----------- Fix failing tests Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d9279025f90c...76a416283aac

1 0

[phpmyadmin/phpmyadmin] dcdd08: No need to break line here
by Madhura Jayaratne 11 Dec '15

11 Dec '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dcdd08a0439c55b0c3c31c868266d0cc16ae4308 https://github.com/phpmyadmin/phpmyadmin/commit/dcdd08a0439c55b0c3c31c86826… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M libraries/export.lib.php Log Message: ----------- No need to break line here Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] f0aba9: Fix #11732 Exporting feature does not work with un...
by Madhura Jayaratne 11 Dec '15

11 Dec '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f0aba98e35531d1a5253e70000162b2e5986e6ed https://github.com/phpmyadmin/phpmyadmin/commit/f0aba98e35531d1a5253e700001… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M ChangeLog M libraries/export.lib.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportXml.class.php Log Message: ----------- Fix #11732 Exporting feature does not work with union table Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: d9279025f90c41ac7c55fed21cde159b740896b7 https://github.com/phpmyadmin/phpmyadmin/commit/d9279025f90c41ac7c55fed21cd… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M ChangeLog M js/console.js M po/ko.po M po/ru.po M po/sk.po Log Message: ----------- Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 Conflicts: ChangeLog Commit: fd0f3d4264c2946a302e7e0968323baa561a3a41 https://github.com/phpmyadmin/phpmyadmin/commit/fd0f3d4264c2946a302e7e09683… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M ChangeLog M libraries/export.lib.php M libraries/plugins/export/ExportSql.php M libraries/plugins/export/ExportXml.php Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8956fa805a11...fd0f3d4264c2

1 0

[phpmyadmin/phpmyadmin] f0aba9: Fix #11732 Exporting feature does not work with un...
by Madhura Jayaratne 11 Dec '15

11 Dec '15

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f0aba98e35531d1a5253e70000162b2e5986e6ed https://github.com/phpmyadmin/phpmyadmin/commit/f0aba98e35531d1a5253e700001… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M ChangeLog M libraries/export.lib.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportXml.class.php Log Message: ----------- Fix #11732 Exporting feature does not work with union table Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: d9279025f90c41ac7c55fed21cde159b740896b7 https://github.com/phpmyadmin/phpmyadmin/commit/d9279025f90c41ac7c55fed21cd… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M ChangeLog M js/console.js M po/ko.po M po/ru.po M po/sk.po Log Message: ----------- Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 Conflicts: ChangeLog Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d00835258273...d9279025f90c

1 0

[phpmyadmin/phpmyadmin] 286735: Translated using Weblate (Korean)
by Marc Delisle 10 Dec '15

10 Dec '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2867358b5768e2dae48f0b9eb367d4e00382ba62 https://github.com/phpmyadmin/phpmyadmin/commit/2867358b5768e2dae48f0b9eb36… Author: 신흥재 <9992551(a)xfp.kr> Date: 2015-12-09 (Wed, 09 Dec 2015) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 78.1% (2509 of 3211 strings) [CI skip] Commit: fa18c2964d0831cd8d34ada443730ad4b2d40e10 https://github.com/phpmyadmin/phpmyadmin/commit/fa18c2964d0831cd8d34ada4437… Author: Anton Alekseevich <AntonBoch12.44(a)gmail.com> Date: 2015-12-09 (Wed, 09 Dec 2015) Changed paths: M po/ru.po Log Message: ----------- Translated using Weblate (Russian) Currently translated at 97.9% (3144 of 3211 strings) [CI skip] Commit: ed47d0fbdb9f115b709cf71c0359fdd8706fbec4 https://github.com/phpmyadmin/phpmyadmin/commit/ed47d0fbdb9f115b709cf71c035… Author: Jozef Pistej <pistej2(a)gmail.com> Date: 2015-12-09 (Wed, 09 Dec 2015) Changed paths: M po/sk.po Log Message: ----------- Translated using Weblate (Slovak) Currently translated at 83.5% (2682 of 3211 strings) [CI skip] Commit: eab28e3be13d3eea92c5b337a8443a6ba74b1231 https://github.com/phpmyadmin/phpmyadmin/commit/eab28e3be13d3eea92c5b337a84… Author: Weblate <noreply(a)weblate.org> Date: 2015-12-09 (Wed, 09 Dec 2015) Changed paths: M ChangeLog M js/makegrid.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 Commit: d00835258273e5e763123a95c1e52e7e7acab305 https://github.com/phpmyadmin/phpmyadmin/commit/d00835258273e5e763123a95c1e… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-12-10 (Thu, 10 Dec 2015) Changed paths: M ChangeLog M js/console.js Log Message: ----------- IE 8 compatibility in console Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 5acfe97a10a1a76b703558293ae0c60b5ecc0820 https://github.com/phpmyadmin/phpmyadmin/commit/5acfe97a10a1a76b703558293ae… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-12-10 (Thu, 10 Dec 2015) Log Message: ----------- Merge commit 'eab28e3' Commit: 8956fa805a117698cb9c8832f153f44b5bff2d03 https://github.com/phpmyadmin/phpmyadmin/commit/8956fa805a117698cb9c8832f15… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-12-10 (Thu, 10 Dec 2015) Changed paths: M ChangeLog M js/console.js Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6f1dbd46ad59...8956fa805a11

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git December 2015