Branch: refs/heads/QA_4_5
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 2b1a68cc4eb935ef3df5c7401d0d1338df09bc72
https://github.com/phpmyadmin/phpmyadmin/commit/2b1a68cc4eb935ef3df5c7401d0…
Author: Dan Ungureanu <udan1107(a)gmail.com>
Date: 2016-02-24 (Wed, 24 Feb 2016)
Changed paths:
M libraries/sql-parser/src/Components/AlterOperation.php
M libraries/sql-parser/src/Components/ArrayObj.php
M libraries/sql-parser/src/Components/Condition.php
M libraries/sql-parser/src/Components/CreateDefinition.php
M libraries/sql-parser/src/Components/Expression.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/SetOperation.php
M libraries/sql-parser/src/Parser.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Statements/CreateStatement.php
M libraries/sql-parser/src/Statements/DropStatement.php
M libraries/sql-parser/src/Token.php
M libraries/sql-parser/src/Utils/Formatter.php
M libraries/sql-parser/src/Utils/Query.php
Log Message:
-----------
Updates sql-parser to phpmyadmin/sql-parser@5c489d91f561cb0a63e0b63b29d6da71f626a137 (v3.4.0).
Fixes #11971. CREATE UNIQUE INDEX index type is not recognized by parser.
Fixes #11982. Row count wrong when grouping joined tables.
Fixes #12012. Column definition with default value and comment in CREATE TABLE expoerted faulty.
Fixes #12020. New statement but no delimiter and unexpected token with REPLACE.
Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com>
Branch: refs/heads/QA_4_6
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 2b1a68cc4eb935ef3df5c7401d0d1338df09bc72
https://github.com/phpmyadmin/phpmyadmin/commit/2b1a68cc4eb935ef3df5c7401d0…
Author: Dan Ungureanu <udan1107(a)gmail.com>
Date: 2016-02-24 (Wed, 24 Feb 2016)
Changed paths:
M libraries/sql-parser/src/Components/AlterOperation.php
M libraries/sql-parser/src/Components/ArrayObj.php
M libraries/sql-parser/src/Components/Condition.php
M libraries/sql-parser/src/Components/CreateDefinition.php
M libraries/sql-parser/src/Components/Expression.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/SetOperation.php
M libraries/sql-parser/src/Parser.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Statements/CreateStatement.php
M libraries/sql-parser/src/Statements/DropStatement.php
M libraries/sql-parser/src/Token.php
M libraries/sql-parser/src/Utils/Formatter.php
M libraries/sql-parser/src/Utils/Query.php
Log Message:
-----------
Updates sql-parser to phpmyadmin/sql-parser@5c489d91f561cb0a63e0b63b29d6da71f626a137 (v3.4.0).
Fixes #11971. CREATE UNIQUE INDEX index type is not recognized by parser.
Fixes #11982. Row count wrong when grouping joined tables.
Fixes #12012. Column definition with default value and comment in CREATE TABLE expoerted faulty.
Fixes #12020. New statement but no delimiter and unexpected token with REPLACE.
Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com>
Commit: 90605cc9a8cc69dad01b1b46f1cffcbe931f723a
https://github.com/phpmyadmin/phpmyadmin/commit/90605cc9a8cc69dad01b1b46f1c…
Author: Dan Ungureanu <udan1107(a)gmail.com>
Date: 2016-02-24 (Wed, 24 Feb 2016)
Changed paths:
M libraries/sql-parser/src/Components/AlterOperation.php
M libraries/sql-parser/src/Components/ArrayObj.php
M libraries/sql-parser/src/Components/Condition.php
M libraries/sql-parser/src/Components/CreateDefinition.php
M libraries/sql-parser/src/Components/Expression.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/SetOperation.php
M libraries/sql-parser/src/Parser.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Statements/CreateStatement.php
M libraries/sql-parser/src/Statements/DropStatement.php
M libraries/sql-parser/src/Token.php
M libraries/sql-parser/src/Utils/Formatter.php
M libraries/sql-parser/src/Utils/Query.php
Log Message:
-----------
Merge branch 'QA_4_5' into QA_4_6
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/968edb64bd69...90605cc9a8cc
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: c82baa09a7c548d7b93462a8d263a8c740b83e7e
https://github.com/phpmyadmin/phpmyadmin/commit/c82baa09a7c548d7b93462a8d26…
Author: Yury Vidal <yuryvidal(a)gmail.com>
Date: 2016-02-24 (Wed, 24 Feb 2016)
Changed paths:
M po/pt_BR.po
Log Message:
-----------
Translated using Weblate (Portuguese (Brazil))
Currently translated at 91.8% (2951 of 3214 strings)
[CI skip]
Commit: a0845e92fc0847e89bda92a19672155826d5cc2b
https://github.com/phpmyadmin/phpmyadmin/commit/a0845e92fc0847e89bda92a1967…
Author: Weblate <noreply(a)weblate.org>
Date: 2016-02-24 (Wed, 24 Feb 2016)
Changed paths:
M composer.json
M libraries/Language.php
M libraries/common.inc.php
R libraries/php-gettext/gettext.inc
R libraries/php-gettext/gettext.php
R libraries/php-gettext/streams.php
M libraries/vendor_config.php
M test/bootstrap-dist.php
R test/libraries/php-gettext/Locales_test.php
R test/libraries/php-gettext/PMA_FileReader_test.php
R test/libraries/php-gettext/PMA_StreamReader_test.php
R test/libraries/php-gettext/PMA_StringReader_test.php
R test/libraries/php-gettext/PMA_gettext_test.php
R test/libraries/php-gettext/Parsing_test.php
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/09d3286895ba...a0845e92fc08
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 912bf964c7f258085c3c9332eb825aa46cedfb6c
https://github.com/phpmyadmin/phpmyadmin/commit/912bf964c7f258085c3c9332eb8…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-02-24 (Wed, 24 Feb 2016)
Changed paths:
M composer.json
M libraries/common.inc.php
R libraries/php-gettext/gettext.inc
R libraries/php-gettext/gettext.php
R libraries/php-gettext/streams.php
M libraries/vendor_config.php
M test/bootstrap-dist.php
R test/libraries/php-gettext/Locales_test.php
R test/libraries/php-gettext/PMA_FileReader_test.php
R test/libraries/php-gettext/PMA_StreamReader_test.php
R test/libraries/php-gettext/PMA_StringReader_test.php
R test/libraries/php-gettext/PMA_gettext_test.php
R test/libraries/php-gettext/Parsing_test.php
Log Message:
-----------
Replace embedded php-gettext library with motranslator
Fixes #12018
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 676514a7e8f25489c7ee3d86ef1a2a44f04532df
https://github.com/phpmyadmin/phpmyadmin/commit/676514a7e8f25489c7ee3d86ef1…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-02-24 (Wed, 24 Feb 2016)
Changed paths:
M libraries/Language.php
Log Message:
-----------
Remove code not needed with motranslator
- the charset is always UTF-8
- the gettext constants do not have to be defined
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 09d3286895ba2a6b09dfde5af6afc9ae4175dcef
https://github.com/phpmyadmin/phpmyadmin/commit/09d3286895ba2a6b09dfde5af6a…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-02-24 (Wed, 24 Feb 2016)
Changed paths:
M composer.json
M libraries/Language.php
M libraries/common.inc.php
R libraries/php-gettext/gettext.inc
R libraries/php-gettext/gettext.php
R libraries/php-gettext/streams.php
M libraries/vendor_config.php
M test/bootstrap-dist.php
R test/libraries/php-gettext/Locales_test.php
R test/libraries/php-gettext/PMA_FileReader_test.php
R test/libraries/php-gettext/PMA_StreamReader_test.php
R test/libraries/php-gettext/PMA_StringReader_test.php
R test/libraries/php-gettext/PMA_gettext_test.php
R test/libraries/php-gettext/Parsing_test.php
Log Message:
-----------
Merge pull request #12023 from nijel/motranslator
Replace embedded php-gettext library with motranslator
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bdfbddf77154...09d3286895ba