Git December 2015

git@phpmyadmin.net

20 participants
376 discussions

[phpmyadmin/phpmyadmin] b96aa8: Avoid duplicite fetching of table information

by Michal Čihař

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: b96aa8ff9473139167bfa2de0305bacff3e358d1 https://github.com/phpmyadmin/phpmyadmin/commit/b96aa8ff9473139167bfa2de030… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M ChangeLog M libraries/controllers/DatabaseStructureController.class.php Log Message: ----------- Avoid duplicite fetching of table information We already have that, so there is no need to issue the query again. Fixes #11714 Signed-off-by: Michal Čihař <michal(a)cihar.com>

8 years, 9 months

[phpmyadmin/phpmyadmin] b96aa8: Avoid duplicite fetching of table information

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b96aa8ff9473139167bfa2de0305bacff3e358d1 https://github.com/phpmyadmin/phpmyadmin/commit/b96aa8ff9473139167bfa2de030… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M ChangeLog M libraries/controllers/DatabaseStructureController.class.php Log Message: ----------- Avoid duplicite fetching of table information We already have that, so there is no need to issue the query again. Fixes #11714 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 3da88534670819e779e8a9488f7ff0f5d02b0e8e https://github.com/phpmyadmin/phpmyadmin/commit/3da88534670819e779e8a9488f7… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M ChangeLog M libraries/controllers/database/DatabaseStructureController.php Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/db5c3b970a47...3da885346708

8 years, 9 months

[phpmyadmin/phpmyadmin] 22b065: Add missing require

by Michal Čihař

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 22b065f6706290a5d13aeb3b1a16c3e3ec8405b3 https://github.com/phpmyadmin/phpmyadmin/commit/22b065f6706290a5d13aeb3b1a1… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M test/libraries/PMA_insert_edit_test.php Log Message: ----------- Add missing require Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: fe135a52068a8fd95bcd335be62be35bf07c2ef8 https://github.com/phpmyadmin/phpmyadmin/commit/fe135a52068a8fd95bcd335be62… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M test/libraries/PMA_insert_edit_test.php Log Message: ----------- Fix test expectations Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 8681ef6b7448e58eacb6a1382316b37c041e1a81 https://github.com/phpmyadmin/phpmyadmin/commit/8681ef6b7448e58eacb6a138231… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M test/libraries/PMA_Tracker_test.php Log Message: ----------- Fix tracker tests for new escaping Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 1c5304f95b9c7c59964e6fd69c4ab6c9571baeed https://github.com/phpmyadmin/phpmyadmin/commit/1c5304f95b9c7c59964e6fd69c4… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php Log Message: ----------- Fix RTN tests for new escaping Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8742209c6331...1c5304f95b9c

8 years, 9 months

[phpmyadmin/phpmyadmin] 22b065: Add missing require

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 22b065f6706290a5d13aeb3b1a16c3e3ec8405b3 https://github.com/phpmyadmin/phpmyadmin/commit/22b065f6706290a5d13aeb3b1a1… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M test/libraries/PMA_insert_edit_test.php Log Message: ----------- Add missing require Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: fe135a52068a8fd95bcd335be62be35bf07c2ef8 https://github.com/phpmyadmin/phpmyadmin/commit/fe135a52068a8fd95bcd335be62… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M test/libraries/PMA_insert_edit_test.php Log Message: ----------- Fix test expectations Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 2ac36ddb8fdd151c99b8fd8fffca6bd269e3e177 https://github.com/phpmyadmin/phpmyadmin/commit/2ac36ddb8fdd151c99b8fd8fffc… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M test/libraries/PMA_insert_edit_test.php Log Message: ----------- Merge branch 'QA_4_5' Commit: 8681ef6b7448e58eacb6a1382316b37c041e1a81 https://github.com/phpmyadmin/phpmyadmin/commit/8681ef6b7448e58eacb6a138231… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M test/libraries/PMA_Tracker_test.php Log Message: ----------- Fix tracker tests for new escaping Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 1c5304f95b9c7c59964e6fd69c4ab6c9571baeed https://github.com/phpmyadmin/phpmyadmin/commit/1c5304f95b9c7c59964e6fd69c4… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php Log Message: ----------- Fix RTN tests for new escaping Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: db5c3b970a47fea226f3eb3cda90d94bda819caa https://github.com/phpmyadmin/phpmyadmin/commit/db5c3b970a47fea226f3eb3cda9… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M test/classes/TrackerTest.php M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3b01cbf03f7b...db5c3b970a47

8 years, 9 months

[phpmyadmin/phpmyadmin] 06d22e: Remove some unnecessary string concatenations

by Marc Delisle

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 06d22e636e8b1820bd332b84dc400c6850e39030 https://github.com/phpmyadmin/phpmyadmin/commit/06d22e636e8b1820bd332b84dc4… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M db_datadict.php M index.php M js/get_image.js.php M js/messages.php M js/whitelist.php M prefs_manage.php M setup/frames/index.inc.php M setup/lib/form_processing.lib.php M templates/columns_definitions/table_fields_definitions.phtml M templates/database/designer/database_tables.phtml M templates/database/structure/body_for_table_summary.phtml M templates/database/structure/favorite_anchor.phtml M templates/server/databases/create.phtml M templates/server/databases/table_row.phtml M templates/table/index_form.phtml M templates/table/relation/common_form.phtml M templates/table/structure/display_partitions.phtml M templates/table/structure/row_stats_table.phtml Log Message: ----------- Remove some unnecessary string concatenations https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-… Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 3b01cbf03f7b236d2652d7ba5eb09e98399dead8 https://github.com/phpmyadmin/phpmyadmin/commit/3b01cbf03f7b236d2652d7ba5eb… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M ChangeLog M libraries/Util.php M test/libraries/common/PMA_quoting_slashing_test.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b94318c4cdae...3b01cbf03f7b

8 years, 9 months

[phpmyadmin/phpmyadmin] 874220: Fix single quote export for servers in ANSI_QUOTES...

by Michal Čihař

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8742209c6331befcf0c6df630328bcc7795a5e60 https://github.com/phpmyadmin/phpmyadmin/commit/8742209c6331befcf0c6df63032… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M ChangeLog M libraries/Util.class.php M test/libraries/common/PMA_quoting_slashing_test.php Log Message: ----------- Fix single quote export for servers in ANSI_QUOTES mode It is possible to escape ' inside '' as both '' and \'. However using '' is MySQL extension and does not work in ANSI mode. We need to generate compatible exports in this case, so sticking with \' is safer. Fixes #11721 Signed-off-by: Michal Čihař <michal(a)cihar.com>

8 years, 9 months

[phpmyadmin/phpmyadmin] 5f0c55: Translated using Weblate (Korean)

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5f0c55da4a69566061b9384f3487c3a741d96e29 https://github.com/phpmyadmin/phpmyadmin/commit/5f0c55da4a69566061b9384f348… Author: Yong Kim <kim(a)nhn.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 77.9% (2503 of 3211 strings) [CI skip] Commit: 39c97184e85b2c3a1076ff11e26df72d0a0fd1b8 https://github.com/phpmyadmin/phpmyadmin/commit/39c97184e85b2c3a1076ff11e26… Author: Weblate <noreply(a)weblate.org> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M ChangeLog M js/export.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 Commit: 8742209c6331befcf0c6df630328bcc7795a5e60 https://github.com/phpmyadmin/phpmyadmin/commit/8742209c6331befcf0c6df63032… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M ChangeLog M libraries/Util.class.php M test/libraries/common/PMA_quoting_slashing_test.php Log Message: ----------- Fix single quote export for servers in ANSI_QUOTES mode It is possible to escape ' inside '' as both '' and \'. However using '' is MySQL extension and does not work in ANSI mode. We need to generate compatible exports in this case, so sticking with \' is safer. Fixes #11721 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 62503612bdbc2613f41e3313bee0070513a58b8f https://github.com/phpmyadmin/phpmyadmin/commit/62503612bdbc2613f41e3313bee… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Log Message: ----------- Merge commit '39c97184e85b2c3a1076ff11e26df72d0a0fd1b8' Commit: b94318c4cdaed8e4cb25f80fc5bbfc9e821c9955 https://github.com/phpmyadmin/phpmyadmin/commit/b94318c4cdaed8e4cb25f80fc5b… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M ChangeLog M libraries/Util.php M test/libraries/common/PMA_quoting_slashing_test.php Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d9bec7f08581...b94318c4cdae

8 years, 9 months

[phpmyadmin/phpmyadmin] d9bec7: HTML line break shown after a MySQL connection err...

by Marc Delisle

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d9bec7f085816a2ae3ddc6bb262c6a4b8b773f3b https://github.com/phpmyadmin/phpmyadmin/commit/d9bec7f085816a2ae3ddc6bb262… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M ChangeLog M libraries/DatabaseInterface.php M test/libraries/database_interface_test.php Log Message: ----------- HTML line break shown after a MySQL connection error message Signed-off-by: Marc Delisle <marc(a)infomarc.info>

8 years, 9 months

[phpmyadmin/docker] 18c6c0: Avoid conflicting ports

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 18c6c01ca68168a737a17f396178d3d14f5e9dc9 https://github.com/phpmyadmin/docker/commit/18c6c01ca68168a737a17f396178d3d… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M .travis.yml Log Message: ----------- Avoid conflicting ports Signed-off-by: Michal Čihař <michal(a)cihar.com>

8 years, 9 months

[phpmyadmin/docker] 2f9ca1: Fix docker container name

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 2f9ca126d4b39c0099c72a8758fd9f4673217495 https://github.com/phpmyadmin/docker/commit/2f9ca126d4b39c0099c72a8758fd9f4… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M .travis.yml Log Message: ----------- Fix docker container name Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 465756ae386372a26339c2b5307d851c04467f9e https://github.com/phpmyadmin/docker/commit/465756ae386372a26339c2b5307d851… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M README.md Log Message: ----------- Improve readme Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/docker/compare/cf8f6d45c85a...465756ae3863

8 years, 9 months

← Newer
1
...
25
26
27
28
29
30
31
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git December 2015