- Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] b12411: Fix header in User Properties editor
by Deven Bansod 11 Nov '16

11 Nov '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: b12411cc2466639e7684c8414e65e19b8d170cc7 https://github.com/phpmyadmin/phpmyadmin/commit/b12411cc2466639e7684c8414e6… Author: Pavel Rochnyack <pavel2000(a)ngs.ru> Date: 2016-08-03 (Wed, 03 Aug 2016) Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Fix header in User Properties editor Signed-off-by: Pavel Rochnyack <pavel2000(a)ngs.ru> Commit: ebb2ab12ce76ae91819ecdea9b111fea17494655 https://github.com/phpmyadmin/phpmyadmin/commit/ebb2ab12ce76ae91819ecdea9b1… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-12 (Mon, 12 Sep 2016) Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Merge branch 'fix-HtmlHeaderForUserProperties' of https://github.com/rpv-tomsk/phpmyadmin into rpv-tomsk-fix-HtmlHeaderForUserProperties Commit: f80140c46e7e3df31dd5450b60136518b8ac1f0a https://github.com/phpmyadmin/phpmyadmin/commit/f80140c46e7e3df31dd5450b601… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-11 (Fri, 11 Nov 2016) Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Fix function parameters in b12411cc2466639e7684c8414e65e19b8d170cc7 Fix #12542 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: d4377e40d8a9a541b1508b4065c80c69ed62b346 https://github.com/phpmyadmin/phpmyadmin/commit/d4377e40d8a9a541b1508b4065c… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-11 (Fri, 11 Nov 2016) Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Merge branch 'rpv-tomsk-fix-HtmlHeaderForUserProperties' into QA_4_6 Commit: d580bb3b51543b626eacc29f862364683ba5c779 https://github.com/phpmyadmin/phpmyadmin/commit/d580bb3b51543b626eacc29f862… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-11 (Fri, 11 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12542 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f7c8cd72a261...d580bb3b5154

1 0

[phpmyadmin/phpmyadmin] f7c8cd: Translated using Weblate (Dutch)
by dingo thirteen 10 Nov '16

10 Nov '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f7c8cd72a2611745f0bb3f44cced234c3c8414e8 https://github.com/phpmyadmin/phpmyadmin/commit/f7c8cd72a2611745f0bb3f44cce… Author: dingo thirteen <dingo13(a)gmail.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 100.0% (3222 of 3222 strings) [CI skip]

1 0

[phpmyadmin/phpmyadmin] 35c7c8: Translated using Weblate (Greek)
by Παναγιώτης Παπάζογλου 10 Nov '16

10 Nov '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 35c7c8039fbfc5680584f01f596d5ea47294369c https://github.com/phpmyadmin/phpmyadmin/commit/35c7c8039fbfc5680584f01f596… Author: Παναγιώτης Παπάζογλου <papaz_p(a)yahoo.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M po/el.po Log Message: ----------- Translated using Weblate (Greek) Currently translated at 100.0% (3222 of 3222 strings) [CI skip]

1 0

[phpmyadmin/phpmyadmin] b83b71: Translated using Weblate (Turkish)
by Burak Yavuz 10 Nov '16

10 Nov '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: b83b71d5a555857299b50a097155307028915941 https://github.com/phpmyadmin/phpmyadmin/commit/b83b71d5a555857299b50a09715… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3222 of 3222 strings) [CI skip]

1 0

[phpmyadmin/phpmyadmin] 12d087: Translated using Weblate (Turkish)
by Burak Yavuz 10 Nov '16

10 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 12d0879fae93643741958c38bd28f37af8be61ad https://github.com/phpmyadmin/phpmyadmin/commit/12d0879fae93643741958c38bd2… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3232 of 3232 strings) [CI skip]

1 0

[phpmyadmin/phpmyadmin] f14cff: Properly escape strings in MySQL statement values
by Michal Čihař 10 Nov '16

10 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f14cffdbe700a80b2b1e49f51da8867ac6246a6e https://github.com/phpmyadmin/phpmyadmin/commit/f14cffdbe700a80b2b1e49f51da… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-29 (Sat, 29 Oct 2016) Changed paths: M db_operations.php M db_tracking.php M import.php M libraries/DatabaseInterface.php M libraries/DbSearch.php M libraries/DisplayResults.php M libraries/Menu.php M libraries/Partition.php M libraries/RecentFavoriteTable.php M libraries/SavedSearches.php M libraries/SystemDatabase.php M libraries/Table.php M libraries/Tracker.php M libraries/Util.php M libraries/bookmark.lib.php M libraries/central_columns.lib.php M libraries/common.inc.php M libraries/controllers/server/ServerVariablesController.php M libraries/controllers/table/TableSearchController.php M libraries/controllers/table/TableStructureController.php M libraries/create_addfield.lib.php M libraries/db_designer.lib.php M libraries/db_table_exists.lib.php M libraries/dbi/DBIDummy.php M libraries/dbi/DBIExtension.php M libraries/dbi/DBIMysql.php M libraries/dbi/DBIMysqli.php M libraries/display_export.lib.php M libraries/export.lib.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/mysql_charsets.lib.php M libraries/navigation/Navigation.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php M libraries/navigation/nodes/NodeDatabase.php M libraries/navigation/nodes/NodeTable.php M libraries/operations.lib.php M libraries/plugins/export/ExportSql.php M libraries/plugins/export/ExportXml.php M libraries/plugins/import/ImportCsv.php M libraries/plugins/import/ImportLdi.php M libraries/plugins/schema/pdf/Pdf.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/relation_cleanup.lib.php M libraries/replication.inc.php M libraries/replication_gui.lib.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_triggers.lib.php M libraries/server_privileges.lib.php M libraries/server_status_monitor.lib.php M libraries/server_user_groups.lib.php M libraries/sql.lib.php M libraries/tracking.lib.php M libraries/transformations.lib.php M libraries/user_preferences.lib.php M test/classes/plugin/import/ImportLdiTest.php M test/libraries/PMA_server_privileges_test.php M user_password.php Log Message: ----------- Properly escape strings in MySQL statement values Use *_real_escape string functions provided by connectors to escape strings while exporting Fix #12453 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Conflicts: libraries/server_privileges.lib.php Commit: d5c9a193f48026b21cd5ff77c130300b3fbc568e https://github.com/phpmyadmin/phpmyadmin/commit/d5c9a193f48026b21cd5ff77c13… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-29 (Sat, 29 Oct 2016) Changed paths: M phpunit.xml.dist M test/classes/TableTest.php M test/classes/ThemeManagerTest.php M test/classes/TrackerTest.php Log Message: ----------- Fix tests for Table, ThemeManager, Tracker classes Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: bd449f740512ce10de9ac00a9970d6ee80d85ab4 https://github.com/phpmyadmin/phpmyadmin/commit/bd449f740512ce10de9ac00a997… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-29 (Sat, 29 Oct 2016) Changed paths: M test/classes/controllers/TableSearchControllerTest.php M test/classes/navigation/NavigationTest.php Log Message: ----------- Fix tests in Navigation, TableSearchController Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 956f3179cbb6a75b1bc5e5768684e377275e5ece https://github.com/phpmyadmin/phpmyadmin/commit/956f3179cbb6a75b1bc5e576868… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/DbSearch.php M libraries/db_table_exists.lib.php M phpunit.xml.dist M test/classes/DbSearchTest.php M test/classes/navigation/NavigationTest.php M test/classes/plugin/export/ExportHtmlwordTest.php M test/classes/plugin/export/ExportOdtTest.php M test/classes/plugin/export/ExportSqlTest.php M test/classes/plugin/export/ExportTexytextTest.php Log Message: ----------- Fix Navigation tests and Export tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 00bfc9d45de0f73e0db16056edad0e9e3b1c95ef https://github.com/phpmyadmin/phpmyadmin/commit/00bfc9d45de0f73e0db16056eda… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M phpunit.xml.dist Log Message: ----------- Fixed regressive change in phpunit config file Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 6a79e7c0c05dea6a0f0f90daba5dcc5be116c22d https://github.com/phpmyadmin/phpmyadmin/commit/6a79e7c0c05dea6a0f0f90daba5… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M test/classes/navigation/NodeTest.php M test/classes/plugin/export/ExportXmlTest.php M test/classes/plugin/import/ImportOdsTest.php Log Message: ----------- Fixed some tests in Export, Import and Node Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 46d3f940d7960d40d018179d659453d0630002e7 https://github.com/phpmyadmin/phpmyadmin/commit/46d3f940d7960d40d018179d659… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M test/libraries/PMA_PMD_common_test.php Log Message: ----------- Fixed test errors in PMD_Common tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: fe71fbda566eb5e22c82032214061f129c8b66bf https://github.com/phpmyadmin/phpmyadmin/commit/fe71fbda566eb5e22c820322140… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M test/libraries/PMA_central_columns_test.php Log Message: ----------- Fixed tests in Central Columns Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 675186ee003e5ed480db9b962149e94a52a28274 https://github.com/phpmyadmin/phpmyadmin/commit/675186ee003e5ed480db9b96214… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M test/classes/plugin/export/ExportXmlTest.php M test/libraries/PMA_designer_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_server_user_groups_test.php M test/libraries/PMA_user_preferences_test.php Log Message: ----------- Fixed tests in Designer, Insert edit for, UserGroups, User preferences Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 02dcfc81982f97e0e41d5326ea7028ab35154d97 https://github.com/phpmyadmin/phpmyadmin/commit/02dcfc81982f97e0e41d5326ea7… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M test/classes/TrackerTest.php M test/classes/plugin/export/ExportLatexTest.php M test/classes/plugin/export/ExportXmlTest.php M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php Log Message: ----------- Fix errors with TrackerTest Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 8b6e102cf77a53bb4fffd2a59a04afbc616aac16 https://github.com/phpmyadmin/phpmyadmin/commit/8b6e102cf77a53bb4fffd2a59a0… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M phpunit.xml.dist M test/classes/plugin/export/ExportXmlTest.php Log Message: ----------- Fixed small error in XML test Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 3f48d9cb5f2059d25b750332d9388d6be764dd9d https://github.com/phpmyadmin/phpmyadmin/commit/3f48d9cb5f2059d25b750332d93… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-05 (Sat, 05 Nov 2016) Changed paths: M test/classes/TrackerTest.php M test/classes/plugin/export/ExportOdsTest.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Fixed some more test errors Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 0d03c97ce6fb2a6187a6d5c4fdcce6590376eb3e https://github.com/phpmyadmin/phpmyadmin/commit/0d03c97ce6fb2a6187a6d5c4fdc… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-06 (Sun, 06 Nov 2016) Changed paths: M test/classes/plugin/export/ExportOdsTest.php M test/classes/plugin/export/ExportSqlTest.php Log Message: ----------- Fix more test errors Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 28a658fda035d87faf5600f94bc8346e51a5208e https://github.com/phpmyadmin/phpmyadmin/commit/28a658fda035d87faf5600f94bc… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M test/classes/plugin/export/ExportSqlTest.php Log Message: ----------- Fix more tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 67501106e0fa6699c95eba039d2688d72ae219ce https://github.com/phpmyadmin/phpmyadmin/commit/67501106e0fa6699c95eba039d2… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M test/classes/plugin/export/ExportSqlTest.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- clear some more tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 06e9b62a2572da393db464896c7c7fd054350fae https://github.com/phpmyadmin/phpmyadmin/commit/06e9b62a2572da393db464896c7… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M test/classes/plugin/export/ExportSqlTest.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Remove tests against unsupported versions Remove duplicate test, fix other tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: cb7abad0b55fcbc991c223c7925a6d3f729d0939 https://github.com/phpmyadmin/phpmyadmin/commit/cb7abad0b55fcbc991c223c7925… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-09 (Wed, 09 Nov 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/Util.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M test/libraries/common/PMA_quoting_slashing_test.php M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php Log Message: ----------- Remove call to old methods, fix tests Remove definition of old method. Remove related tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: c9348b682e5c002b293d36818d5035d0a5eb2f9f https://github.com/phpmyadmin/phpmyadmin/commit/c9348b682e5c002b293d36818d5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M db_operations.php M db_tracking.php M import.php M libraries/DatabaseInterface.php M libraries/DbSearch.php M libraries/DisplayResults.php M libraries/Menu.php M libraries/Partition.php M libraries/RecentFavoriteTable.php M libraries/SavedSearches.php M libraries/SystemDatabase.php M libraries/Table.php M libraries/Tracker.php M libraries/Util.php M libraries/bookmark.lib.php M libraries/central_columns.lib.php M libraries/common.inc.php M libraries/controllers/server/ServerVariablesController.php M libraries/controllers/table/TableSearchController.php M libraries/controllers/table/TableStructureController.php M libraries/create_addfield.lib.php M libraries/db_designer.lib.php M libraries/db_table_exists.lib.php M libraries/dbi/DBIDummy.php M libraries/dbi/DBIExtension.php M libraries/dbi/DBIMysql.php M libraries/dbi/DBIMysqli.php M libraries/display_export.lib.php M libraries/export.lib.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/mysql_charsets.lib.php M libraries/navigation/Navigation.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php M libraries/navigation/nodes/NodeDatabase.php M libraries/navigation/nodes/NodeTable.php M libraries/operations.lib.php M libraries/plugins/export/ExportSql.php M libraries/plugins/export/ExportXml.php M libraries/plugins/import/ImportCsv.php M libraries/plugins/import/ImportLdi.php M libraries/plugins/schema/pdf/Pdf.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/relation_cleanup.lib.php M libraries/replication.inc.php M libraries/replication_gui.lib.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_triggers.lib.php M libraries/server_privileges.lib.php M libraries/server_status_monitor.lib.php M libraries/server_user_groups.lib.php M libraries/sql.lib.php M libraries/tracking.lib.php M libraries/transformations.lib.php M libraries/user_preferences.lib.php M phpunit.xml.dist M test/classes/DbSearchTest.php M test/classes/TableTest.php M test/classes/ThemeManagerTest.php M test/classes/TrackerTest.php M test/classes/controllers/TableSearchControllerTest.php M test/classes/navigation/NavigationTest.php M test/classes/navigation/NodeTest.php M test/classes/plugin/export/ExportHtmlwordTest.php M test/classes/plugin/export/ExportLatexTest.php M test/classes/plugin/export/ExportOdsTest.php M test/classes/plugin/export/ExportOdtTest.php M test/classes/plugin/export/ExportSqlTest.php M test/classes/plugin/export/ExportTexytextTest.php M test/classes/plugin/export/ExportXmlTest.php M test/classes/plugin/import/ImportLdiTest.php M test/classes/plugin/import/ImportOdsTest.php M test/libraries/PMA_PMD_common_test.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_designer_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_server_user_groups_test.php M test/libraries/PMA_user_preferences_test.php M test/libraries/common/PMA_quoting_slashing_test.php M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php M user_password.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12564' into QA_4_6 Commit: ef0f08e7d311c106bea54c221b6b15e5d306914b https://github.com/phpmyadmin/phpmyadmin/commit/ef0f08e7d311c106bea54c221b6… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12564 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: dd828ebce0e3a3f1af1a493c320178ff6f30d0c5 https://github.com/phpmyadmin/phpmyadmin/commit/dd828ebce0e3a3f1af1a493c320… Author: Stefano Martinelli <stefano.ste.martinelli(a)gmail.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M po/it.po Log Message: ----------- Translated using Weblate (Italian) Currently translated at 100.0% (3222 of 3222 strings) [CI skip] Commit: dad93483c11a0c8645b54a90a8ee280088d07fd2 https://github.com/phpmyadmin/phpmyadmin/commit/dad93483c11a0c8645b54a90a8e… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M ChangeLog M db_operations.php M db_tracking.php M import.php M libraries/Bookmark.php M libraries/DatabaseInterface.php M libraries/DbSearch.php M libraries/DisplayResults.php M libraries/Menu.php M libraries/Partition.php M libraries/RecentFavoriteTable.php M libraries/SavedSearches.php M libraries/SystemDatabase.php M libraries/Table.php M libraries/Tracker.php M libraries/Util.php M libraries/central_columns.lib.php M libraries/common.inc.php M libraries/controllers/server/ServerVariablesController.php M libraries/controllers/table/TableSearchController.php M libraries/controllers/table/TableStructureController.php M libraries/create_addfield.lib.php M libraries/db_designer.lib.php M libraries/db_table_exists.inc.php M libraries/dbi/DBIDummy.php M libraries/dbi/DBIExtension.php M libraries/dbi/DBIMysql.php M libraries/dbi/DBIMysqli.php M libraries/display_export.lib.php M libraries/export.lib.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/navigation/Navigation.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php M libraries/navigation/nodes/NodeDatabase.php M libraries/navigation/nodes/NodeTable.php M libraries/operations.lib.php M libraries/plugins/export/ExportSql.php M libraries/plugins/export/ExportXml.php M libraries/plugins/import/ImportCsv.php M libraries/plugins/import/ImportLdi.php M libraries/plugins/schema/pdf/Pdf.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/relation_cleanup.lib.php M libraries/replication.inc.php M libraries/replication_gui.lib.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_triggers.lib.php M libraries/server_privileges.lib.php M libraries/server_status_monitor.lib.php M libraries/server_user_groups.lib.php M libraries/tracking.lib.php M libraries/transformations.lib.php M libraries/user_preferences.lib.php M phpunit.xml.dist M test/classes/DbSearchTest.php M test/classes/TableTest.php M test/classes/ThemeManagerTest.php M test/classes/TrackerTest.php M test/classes/controllers/TableSearchControllerTest.php M test/classes/navigation/NavigationTest.php M test/classes/navigation/NodeTest.php M test/classes/plugin/export/ExportHtmlwordTest.php M test/classes/plugin/export/ExportLatexTest.php M test/classes/plugin/export/ExportOdsTest.php M test/classes/plugin/export/ExportOdtTest.php M test/classes/plugin/export/ExportSqlTest.php M test/classes/plugin/export/ExportTexytextTest.php M test/classes/plugin/export/ExportXmlTest.php M test/classes/plugin/import/ImportLdiTest.php M test/classes/plugin/import/ImportOdsTest.php M test/libraries/PMA_PMD_common_test.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_designer_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_server_user_groups_test.php M test/libraries/PMA_user_preferences_test.php M test/libraries/common/PMA_quoting_slashing_test.php M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php M user_password.php Log Message: ----------- Merge branch 'QA_4_6' Commit: f4c0331202450d69ba63975e7216887666d29172 https://github.com/phpmyadmin/phpmyadmin/commit/f4c0331202450d69ba63975e721… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M po/it.po Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 Commit: b889437e78d70113cd33379aada2ee1bdd512b86 https://github.com/phpmyadmin/phpmyadmin/commit/b889437e78d70113cd33379aada… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M po/it.po Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Commit: 327bc101bded116a917b0c04f9b3195728925705 https://github.com/phpmyadmin/phpmyadmin/commit/327bc101bded116a917b0c04f9b… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6a737d0011e2...327bc101bded

1 0

[phpmyadmin/phpmyadmin] f14cff: Properly escape strings in MySQL statement values
by Michal Čihař 10 Nov '16

10 Nov '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f14cffdbe700a80b2b1e49f51da8867ac6246a6e https://github.com/phpmyadmin/phpmyadmin/commit/f14cffdbe700a80b2b1e49f51da… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-29 (Sat, 29 Oct 2016) Changed paths: M db_operations.php M db_tracking.php M import.php M libraries/DatabaseInterface.php M libraries/DbSearch.php M libraries/DisplayResults.php M libraries/Menu.php M libraries/Partition.php M libraries/RecentFavoriteTable.php M libraries/SavedSearches.php M libraries/SystemDatabase.php M libraries/Table.php M libraries/Tracker.php M libraries/Util.php M libraries/bookmark.lib.php M libraries/central_columns.lib.php M libraries/common.inc.php M libraries/controllers/server/ServerVariablesController.php M libraries/controllers/table/TableSearchController.php M libraries/controllers/table/TableStructureController.php M libraries/create_addfield.lib.php M libraries/db_designer.lib.php M libraries/db_table_exists.lib.php M libraries/dbi/DBIDummy.php M libraries/dbi/DBIExtension.php M libraries/dbi/DBIMysql.php M libraries/dbi/DBIMysqli.php M libraries/display_export.lib.php M libraries/export.lib.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/mysql_charsets.lib.php M libraries/navigation/Navigation.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php M libraries/navigation/nodes/NodeDatabase.php M libraries/navigation/nodes/NodeTable.php M libraries/operations.lib.php M libraries/plugins/export/ExportSql.php M libraries/plugins/export/ExportXml.php M libraries/plugins/import/ImportCsv.php M libraries/plugins/import/ImportLdi.php M libraries/plugins/schema/pdf/Pdf.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/relation_cleanup.lib.php M libraries/replication.inc.php M libraries/replication_gui.lib.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_triggers.lib.php M libraries/server_privileges.lib.php M libraries/server_status_monitor.lib.php M libraries/server_user_groups.lib.php M libraries/sql.lib.php M libraries/tracking.lib.php M libraries/transformations.lib.php M libraries/user_preferences.lib.php M test/classes/plugin/import/ImportLdiTest.php M test/libraries/PMA_server_privileges_test.php M user_password.php Log Message: ----------- Properly escape strings in MySQL statement values Use *_real_escape string functions provided by connectors to escape strings while exporting Fix #12453 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Conflicts: libraries/server_privileges.lib.php Commit: d5c9a193f48026b21cd5ff77c130300b3fbc568e https://github.com/phpmyadmin/phpmyadmin/commit/d5c9a193f48026b21cd5ff77c13… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-29 (Sat, 29 Oct 2016) Changed paths: M phpunit.xml.dist M test/classes/TableTest.php M test/classes/ThemeManagerTest.php M test/classes/TrackerTest.php Log Message: ----------- Fix tests for Table, ThemeManager, Tracker classes Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: bd449f740512ce10de9ac00a9970d6ee80d85ab4 https://github.com/phpmyadmin/phpmyadmin/commit/bd449f740512ce10de9ac00a997… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-10-29 (Sat, 29 Oct 2016) Changed paths: M test/classes/controllers/TableSearchControllerTest.php M test/classes/navigation/NavigationTest.php Log Message: ----------- Fix tests in Navigation, TableSearchController Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 956f3179cbb6a75b1bc5e5768684e377275e5ece https://github.com/phpmyadmin/phpmyadmin/commit/956f3179cbb6a75b1bc5e576868… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/DbSearch.php M libraries/db_table_exists.lib.php M phpunit.xml.dist M test/classes/DbSearchTest.php M test/classes/navigation/NavigationTest.php M test/classes/plugin/export/ExportHtmlwordTest.php M test/classes/plugin/export/ExportOdtTest.php M test/classes/plugin/export/ExportSqlTest.php M test/classes/plugin/export/ExportTexytextTest.php Log Message: ----------- Fix Navigation tests and Export tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 00bfc9d45de0f73e0db16056edad0e9e3b1c95ef https://github.com/phpmyadmin/phpmyadmin/commit/00bfc9d45de0f73e0db16056eda… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M phpunit.xml.dist Log Message: ----------- Fixed regressive change in phpunit config file Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 6a79e7c0c05dea6a0f0f90daba5dcc5be116c22d https://github.com/phpmyadmin/phpmyadmin/commit/6a79e7c0c05dea6a0f0f90daba5… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M test/classes/navigation/NodeTest.php M test/classes/plugin/export/ExportXmlTest.php M test/classes/plugin/import/ImportOdsTest.php Log Message: ----------- Fixed some tests in Export, Import and Node Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 46d3f940d7960d40d018179d659453d0630002e7 https://github.com/phpmyadmin/phpmyadmin/commit/46d3f940d7960d40d018179d659… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M test/libraries/PMA_PMD_common_test.php Log Message: ----------- Fixed test errors in PMD_Common tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: fe71fbda566eb5e22c82032214061f129c8b66bf https://github.com/phpmyadmin/phpmyadmin/commit/fe71fbda566eb5e22c820322140… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M test/libraries/PMA_central_columns_test.php Log Message: ----------- Fixed tests in Central Columns Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 675186ee003e5ed480db9b962149e94a52a28274 https://github.com/phpmyadmin/phpmyadmin/commit/675186ee003e5ed480db9b96214… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M test/classes/plugin/export/ExportXmlTest.php M test/libraries/PMA_designer_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_server_user_groups_test.php M test/libraries/PMA_user_preferences_test.php Log Message: ----------- Fixed tests in Designer, Insert edit for, UserGroups, User preferences Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 02dcfc81982f97e0e41d5326ea7028ab35154d97 https://github.com/phpmyadmin/phpmyadmin/commit/02dcfc81982f97e0e41d5326ea7… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M test/classes/TrackerTest.php M test/classes/plugin/export/ExportLatexTest.php M test/classes/plugin/export/ExportXmlTest.php M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php Log Message: ----------- Fix errors with TrackerTest Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 8b6e102cf77a53bb4fffd2a59a04afbc616aac16 https://github.com/phpmyadmin/phpmyadmin/commit/8b6e102cf77a53bb4fffd2a59a0… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-04 (Fri, 04 Nov 2016) Changed paths: M phpunit.xml.dist M test/classes/plugin/export/ExportXmlTest.php Log Message: ----------- Fixed small error in XML test Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 3f48d9cb5f2059d25b750332d9388d6be764dd9d https://github.com/phpmyadmin/phpmyadmin/commit/3f48d9cb5f2059d25b750332d93… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-05 (Sat, 05 Nov 2016) Changed paths: M test/classes/TrackerTest.php M test/classes/plugin/export/ExportOdsTest.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Fixed some more test errors Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 0d03c97ce6fb2a6187a6d5c4fdcce6590376eb3e https://github.com/phpmyadmin/phpmyadmin/commit/0d03c97ce6fb2a6187a6d5c4fdc… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-06 (Sun, 06 Nov 2016) Changed paths: M test/classes/plugin/export/ExportOdsTest.php M test/classes/plugin/export/ExportSqlTest.php Log Message: ----------- Fix more test errors Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 28a658fda035d87faf5600f94bc8346e51a5208e https://github.com/phpmyadmin/phpmyadmin/commit/28a658fda035d87faf5600f94bc… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M test/classes/plugin/export/ExportSqlTest.php Log Message: ----------- Fix more tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 67501106e0fa6699c95eba039d2688d72ae219ce https://github.com/phpmyadmin/phpmyadmin/commit/67501106e0fa6699c95eba039d2… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M test/classes/plugin/export/ExportSqlTest.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- clear some more tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 06e9b62a2572da393db464896c7c7fd054350fae https://github.com/phpmyadmin/phpmyadmin/commit/06e9b62a2572da393db464896c7… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-07 (Mon, 07 Nov 2016) Changed paths: M test/classes/plugin/export/ExportSqlTest.php M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Remove tests against unsupported versions Remove duplicate test, fix other tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: cb7abad0b55fcbc991c223c7925a6d3f729d0939 https://github.com/phpmyadmin/phpmyadmin/commit/cb7abad0b55fcbc991c223c7925… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-09 (Wed, 09 Nov 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/Util.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M test/libraries/common/PMA_quoting_slashing_test.php M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php Log Message: ----------- Remove call to old methods, fix tests Remove definition of old method. Remove related tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: c9348b682e5c002b293d36818d5035d0a5eb2f9f https://github.com/phpmyadmin/phpmyadmin/commit/c9348b682e5c002b293d36818d5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M db_operations.php M db_tracking.php M import.php M libraries/DatabaseInterface.php M libraries/DbSearch.php M libraries/DisplayResults.php M libraries/Menu.php M libraries/Partition.php M libraries/RecentFavoriteTable.php M libraries/SavedSearches.php M libraries/SystemDatabase.php M libraries/Table.php M libraries/Tracker.php M libraries/Util.php M libraries/bookmark.lib.php M libraries/central_columns.lib.php M libraries/common.inc.php M libraries/controllers/server/ServerVariablesController.php M libraries/controllers/table/TableSearchController.php M libraries/controllers/table/TableStructureController.php M libraries/create_addfield.lib.php M libraries/db_designer.lib.php M libraries/db_table_exists.lib.php M libraries/dbi/DBIDummy.php M libraries/dbi/DBIExtension.php M libraries/dbi/DBIMysql.php M libraries/dbi/DBIMysqli.php M libraries/display_export.lib.php M libraries/export.lib.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/mysql_charsets.lib.php M libraries/navigation/Navigation.php M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/Node.php M libraries/navigation/nodes/NodeDatabase.php M libraries/navigation/nodes/NodeTable.php M libraries/operations.lib.php M libraries/plugins/export/ExportSql.php M libraries/plugins/export/ExportXml.php M libraries/plugins/import/ImportCsv.php M libraries/plugins/import/ImportLdi.php M libraries/plugins/schema/pdf/Pdf.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/relation_cleanup.lib.php M libraries/replication.inc.php M libraries/replication_gui.lib.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_triggers.lib.php M libraries/server_privileges.lib.php M libraries/server_status_monitor.lib.php M libraries/server_user_groups.lib.php M libraries/sql.lib.php M libraries/tracking.lib.php M libraries/transformations.lib.php M libraries/user_preferences.lib.php M phpunit.xml.dist M test/classes/DbSearchTest.php M test/classes/TableTest.php M test/classes/ThemeManagerTest.php M test/classes/TrackerTest.php M test/classes/controllers/TableSearchControllerTest.php M test/classes/navigation/NavigationTest.php M test/classes/navigation/NodeTest.php M test/classes/plugin/export/ExportHtmlwordTest.php M test/classes/plugin/export/ExportLatexTest.php M test/classes/plugin/export/ExportOdsTest.php M test/classes/plugin/export/ExportOdtTest.php M test/classes/plugin/export/ExportSqlTest.php M test/classes/plugin/export/ExportTexytextTest.php M test/classes/plugin/export/ExportXmlTest.php M test/classes/plugin/import/ImportLdiTest.php M test/classes/plugin/import/ImportOdsTest.php M test/libraries/PMA_PMD_common_test.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_designer_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_server_user_groups_test.php M test/libraries/PMA_user_preferences_test.php M test/libraries/common/PMA_quoting_slashing_test.php M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php M user_password.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12564' into QA_4_6 Commit: ef0f08e7d311c106bea54c221b6b15e5d306914b https://github.com/phpmyadmin/phpmyadmin/commit/ef0f08e7d311c106bea54c221b6… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12564 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f4c0331202450d69ba63975e7216887666d29172 https://github.com/phpmyadmin/phpmyadmin/commit/f4c0331202450d69ba63975e721… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M po/it.po Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/dd828ebce0e3...f4c033120245

1 0

[phpmyadmin/phpmyadmin] 6a737d: Translated using Weblate (Italian)
by Stefano Martinelli 10 Nov '16

10 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6a737d0011e22ae53bd2c4cd88c41b7640e79387 https://github.com/phpmyadmin/phpmyadmin/commit/6a737d0011e22ae53bd2c4cd88c… Author: Stefano Martinelli <stefano.ste.martinelli(a)gmail.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M po/it.po Log Message: ----------- Translated using Weblate (Italian) Currently translated at 100.0% (3232 of 3232 strings) [CI skip]

1 0

[phpmyadmin/phpmyadmin] dd828e: Translated using Weblate (Italian)
by Stefano Martinelli 10 Nov '16

10 Nov '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: dd828ebce0e3a3f1af1a493c320178ff6f30d0c5 https://github.com/phpmyadmin/phpmyadmin/commit/dd828ebce0e3a3f1af1a493c320… Author: Stefano Martinelli <stefano.ste.martinelli(a)gmail.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M po/it.po Log Message: ----------- Translated using Weblate (Italian) Currently translated at 100.0% (3222 of 3222 strings) [CI skip]

1 0

[phpmyadmin/phpmyadmin] 32a381: Fixes #12322, no default function selected for for...
by Michal Čihař 10 Nov '16

10 Nov '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 32a381d0a595ae03fde6e16a0dfabbe671fb85b2 https://github.com/phpmyadmin/phpmyadmin/commit/32a381d0a595ae03fde6e16a0df… Author: Roger Walt <roger.walt(a)gmail.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M libraries/Util.php M libraries/insert_edit.lib.php Log Message: ----------- Fixes #12322, no default function selected for foreignkey fields Signed-off-by: Roger Walt <roger.walt(a)gmail.com> Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 08840559ba6de7e16b89ae863816b45c7df8939f https://github.com/phpmyadmin/phpmyadmin/commit/08840559ba6de7e16b89ae86381… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M libraries/Util.php M libraries/rte/rte_routines.lib.php M test/libraries/PMA_insert_edit_test.php Log Message: ----------- Adjust code to changes in #12372 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 4cd1814469653510a36b52a4f7c20c35bc2fa686 https://github.com/phpmyadmin/phpmyadmin/commit/4cd1814469653510a36b52a4f7c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-10 (Thu, 10 Nov 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12372 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/683c2dc291d2...4cd181446965

1 0