Branch: refs/heads/master
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: ea701dfcc1236ce15a48058a09f5717b292520d4
https://github.com/phpmyadmin/phpmyadmin/commit/ea701dfcc1236ce15a48058a09f…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M libraries/plugins/auth/AuthenticationCookie.class.php
Log Message:
-----------
Do not repeat the same conditions
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 618706685183431675671eb62d5e0c94bf841a4a
https://github.com/phpmyadmin/phpmyadmin/commit/618706685183431675671eb62d5…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M .travis.yml
M ChangeLog
M composer.json
M libraries/Config.class.php
M libraries/controllers/DatabaseStructureController.class.php
M libraries/db_common.inc.php
M libraries/db_info.inc.php
M libraries/plugins/import/ImportSql.class.php
M libraries/rte/rte_routines.lib.php
M libraries/sql-parser/src/Components/ExpressionArray.php
M libraries/sql-parser/src/Components/JoinKeyword.php
M libraries/sql-parser/src/Components/OptionsArray.php
M libraries/sql-parser/src/Context.php
M libraries/sql-parser/src/Lexer.php
M libraries/sql-parser/src/Parser.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Token.php
A libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/Query.php
M libraries/sql-parser/src/Utils/Table.php
M libraries/sql.lib.php
M test/classes/plugin/import/ImportSql_test.php
M test/install-runkit
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/c0b6e18f5ccf...618706685183