Branch: refs/heads/master
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: d06f92de67e4eca0087f587b1c41af19703397c7
https://github.com/phpmyadmin/phpmyadmin/commit/d06f92de67e4eca0087f587b1c4…
Author: Daniel Heße <hesse.daniel93(a)gmail.com>
Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths:
M po/de.po
Log Message:
-----------
Translated using Weblate (German)
Currently translated at 99.7% (3213 of 3222 strings)
[CI skip]
Commit: c654a50d87a725f9dabbb97326a2b7855b8254ec
https://github.com/phpmyadmin/phpmyadmin/commit/c654a50d87a725f9dabbb97326a…
Author: Kurt Eilertsen <kurt(a)kheds.com>
Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths:
M po/nb.po
Log Message:
-----------
Translated using Weblate (Norwegian Bokmål)
Currently translated at 57.4% (1851 of 3222 strings)
[CI skip]
Commit: d6adb187b2d4be3004f8c38c87ac270e25aa979f
https://github.com/phpmyadmin/phpmyadmin/commit/d6adb187b2d4be3004f8c38c87a…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-01-23 (Mon, 23 Jan 2017)
Log Message:
-----------
Merge branch 'QA_4_6'
Commit: e4bf53690679332c23d0ff2b4865ad844d60d996
https://github.com/phpmyadmin/phpmyadmin/commit/e4bf53690679332c23d0ff2b486…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths:
M db_sql_format.php
M export.php
M libraries/DisplayResults.php
M libraries/Linter.php
M libraries/Table.php
M libraries/Util.php
M libraries/autoloader.php
M libraries/common.inc.php
M libraries/controllers/table/TableStructureController.php
M libraries/import.lib.php
M libraries/parse_analyze.lib.php
M libraries/plugins/export/ExportSql.php
M libraries/plugins/import/ImportSql.php
M libraries/relation.lib.php
M libraries/rte/rte_list.lib.php
M libraries/rte/rte_routines.lib.php
M libraries/sql-parser/ClassLoader.php
M libraries/sql-parser/autoload.php
M libraries/sql-parser/src/Component.php
M libraries/sql-parser/src/Components/AlterOperation.php
M libraries/sql-parser/src/Components/Array2d.php
M libraries/sql-parser/src/Components/ArrayObj.php
M libraries/sql-parser/src/Components/CaseExpression.php
M libraries/sql-parser/src/Components/Condition.php
M libraries/sql-parser/src/Components/CreateDefinition.php
M libraries/sql-parser/src/Components/DataType.php
M libraries/sql-parser/src/Components/Expression.php
M libraries/sql-parser/src/Components/ExpressionArray.php
M libraries/sql-parser/src/Components/FunctionCall.php
M libraries/sql-parser/src/Components/IntoKeyword.php
M libraries/sql-parser/src/Components/JoinKeyword.php
M libraries/sql-parser/src/Components/Key.php
M libraries/sql-parser/src/Components/Limit.php
M libraries/sql-parser/src/Components/OptionsArray.php
M libraries/sql-parser/src/Components/OrderKeyword.php
M libraries/sql-parser/src/Components/ParameterDefinition.php
M libraries/sql-parser/src/Components/PartitionDefinition.php
M libraries/sql-parser/src/Components/Reference.php
M libraries/sql-parser/src/Components/RenameOperation.php
M libraries/sql-parser/src/Components/SetOperation.php
M libraries/sql-parser/src/Components/UnionKeyword.php
M libraries/sql-parser/src/Context.php
M libraries/sql-parser/src/Contexts/ContextMySql50000.php
M libraries/sql-parser/src/Contexts/ContextMySql50100.php
M libraries/sql-parser/src/Contexts/ContextMySql50500.php
M libraries/sql-parser/src/Contexts/ContextMySql50600.php
M libraries/sql-parser/src/Contexts/ContextMySql50700.php
M libraries/sql-parser/src/Exceptions/LexerException.php
M libraries/sql-parser/src/Exceptions/ParserException.php
M libraries/sql-parser/src/Lexer.php
M libraries/sql-parser/src/Parser.php
M libraries/sql-parser/src/Statement.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Statements/AnalyzeStatement.php
M libraries/sql-parser/src/Statements/BackupStatement.php
M libraries/sql-parser/src/Statements/CallStatement.php
M libraries/sql-parser/src/Statements/CheckStatement.php
M libraries/sql-parser/src/Statements/ChecksumStatement.php
M libraries/sql-parser/src/Statements/CreateStatement.php
M libraries/sql-parser/src/Statements/DeleteStatement.php
M libraries/sql-parser/src/Statements/DropStatement.php
M libraries/sql-parser/src/Statements/ExplainStatement.php
M libraries/sql-parser/src/Statements/InsertStatement.php
M libraries/sql-parser/src/Statements/MaintenanceStatement.php
M libraries/sql-parser/src/Statements/NotImplementedStatement.php
M libraries/sql-parser/src/Statements/OptimizeStatement.php
M libraries/sql-parser/src/Statements/RenameStatement.php
M libraries/sql-parser/src/Statements/RepairStatement.php
M libraries/sql-parser/src/Statements/ReplaceStatement.php
M libraries/sql-parser/src/Statements/RestoreStatement.php
M libraries/sql-parser/src/Statements/SelectStatement.php
M libraries/sql-parser/src/Statements/SetStatement.php
M libraries/sql-parser/src/Statements/ShowStatement.php
M libraries/sql-parser/src/Statements/TransactionStatement.php
M libraries/sql-parser/src/Statements/TruncateStatement.php
M libraries/sql-parser/src/Statements/UpdateStatement.php
M libraries/sql-parser/src/Token.php
M libraries/sql-parser/src/TokensList.php
M libraries/sql-parser/src/UtfString.php
M libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/CLI.php
M libraries/sql-parser/src/Utils/Error.php
M libraries/sql-parser/src/Utils/Formatter.php
M libraries/sql-parser/src/Utils/Misc.php
M libraries/sql-parser/src/Utils/Query.php
M libraries/sql-parser/src/Utils/Routine.php
M libraries/sql-parser/src/Utils/Table.php
M libraries/sql-parser/src/Utils/Tokens.php
M libraries/sql.lib.php
M tbl_export.php
M test/classes/DisplayResultsTest.php
M test/libraries/PMA_import_test.php
M test/libraries/common/PMA_quoting_slashing_test.php
Log Message:
-----------
Update to SQL Parser 4.0.1
It now follows PSR-4 and uses PhpMyAdmin namespace prefix.
See
https://github.com/phpmyadmin/sql-parser/issues/126
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 27fb0b58af920a017a12b5fa89c6e90195b58504
https://github.com/phpmyadmin/phpmyadmin/commit/27fb0b58af920a017a12b5fa89c…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths:
M composer.json
M db_sql_format.php
M export.php
M libraries/DisplayResults.php
M libraries/Linter.php
M libraries/Table.php
M libraries/Tracker.php
M libraries/Util.php
M libraries/common.inc.php
M libraries/controllers/table/TableStructureController.php
M libraries/import.lib.php
M libraries/parse_analyze.lib.php
M libraries/plugins/export/ExportSql.php
M libraries/plugins/import/ImportSql.php
M libraries/relation.lib.php
M libraries/rte/rte_list.lib.php
M libraries/rte/rte_routines.lib.php
M libraries/sql.lib.php
M tbl_export.php
M test/classes/DisplayResultsTest.php
M test/libraries/PMA_import_test.php
M test/libraries/common/PMA_quoting_slashing_test.php
Log Message:
-----------
Merge branch 'QA_4_6'
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/b87362b7d23b...27fb0b58af92