- Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] 201020: Include replication.inc.php only if the database i...
by Madhura Jayaratne 12 Aug '15

12 Aug '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 20102085caea029379eea99ee420c7bf4c6ab00b https://github.com/phpmyadmin/phpmyadmin/commit/20102085caea029379eea99ee42… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M libraries/controllers/DatabaseStructureController.class.php Log Message: ----------- Include replication.inc.php only if the database is in a slave replication process Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] b5a620: Remove unnecessary line break
by Madhura Jayaratne 12 Aug '15

12 Aug '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b5a620777e4f327a4de9e91f1c496cf4898ebb3e https://github.com/phpmyadmin/phpmyadmin/commit/b5a620777e4f327a4de9e91f1c4… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M libraries/controllers/DatabaseStructureController.class.php Log Message: ----------- Remove unnecessary line break Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: a908a747b87fcbaf028a69ae445d91410934c340 https://github.com/phpmyadmin/phpmyadmin/commit/a908a747b87fcbaf028a69ae445… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M po/cs.po Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8e555034371f...a908a747b87f

1 0

[phpmyadmin/phpmyadmin] b2d464: Translated using Weblate (Czech)
by Weblate 12 Aug '15

12 Aug '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b2d4640b2c1fe7e67344ab47b9d799b57518f29d https://github.com/phpmyadmin/phpmyadmin/commit/b2d4640b2c1fe7e67344ab47b9d… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M po/cs.po Log Message: ----------- Translated using Weblate (Czech) Currently translated at 95.5% (3057 of 3201 strings) [CI skip] Commit: 8e555034371fd8f83e699a2df72e56554700a661 https://github.com/phpmyadmin/phpmyadmin/commit/8e555034371fd8f83e699a2df72… Author: Weblate <noreply(a)weblate.org> Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/618706685183...8e555034371f

1 0

[phpmyadmin/phpmyadmin] ea701d: Do not repeat the same conditions
by Madhura Jayaratne 12 Aug '15

12 Aug '15

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

1 0

[phpmyadmin/phpmyadmin] c0b6e1: Add missing includes and update member variables
by Atul Pratap Singh 12 Aug '15

12 Aug '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c0b6e18f5ccf2b502f0a09fb15f7e5c10dbd3727 https://github.com/phpmyadmin/phpmyadmin/commit/c0b6e18f5ccf2b502f0a09fb15f… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M libraries/controllers/DatabaseStructureController.class.php M libraries/db_common.inc.php M libraries/db_info.inc.php Log Message: ----------- Add missing includes and update member variables Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] 762d67: Rewrote a part of the import mechanism.
by Marc Delisle 12 Aug '15

12 Aug '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 762d67dc363037be2c5eb5f4925a9968dc4dec18 https://github.com/phpmyadmin/phpmyadmin/commit/762d67dc363037be2c5eb5f4925… Author: Dan Ungureanu <udan1107(a)gmail.com> Date: 2015-08-11 (Tue, 11 Aug 2015) Changed paths: M libraries/plugins/import/ImportSql.class.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/OptionsArray.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 M libraries/sql-parser/src/Utils/BufferedQuery.php M libraries/sql-parser/src/Utils/Query.php M test/classes/plugin/import/ImportSql_test.php Log Message: ----------- Rewrote a part of the import mechanism. Updated sql-parser library to udan11/sql-parser@e713c9fa1d79fd7bc90c63016f9f3bff8f983794. Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com> Commit: b619077beda8e2f3b6aa5fa5f86896063d0d5256 https://github.com/phpmyadmin/phpmyadmin/commit/b619077beda8e2f3b6aa5fa5f86… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-08-11 (Tue, 11 Aug 2015) Changed paths: M libraries/plugins/import/ImportSql.class.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/OptionsArray.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 M libraries/sql-parser/src/Utils/BufferedQuery.php M libraries/sql-parser/src/Utils/Query.php M test/classes/plugin/import/ImportSql_test.php Log Message: ----------- Merge pull request #11375 from udan11/import_rewrite Rewrote a part of the import mechanism. Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d7c9b2fc947a...b619077beda8

1 0

[phpmyadmin/phpmyadmin] d7c9b2: Refactor code of rte_routines.lib.php.
by Hugues Peccatte 12 Aug '15

12 Aug '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d7c9b2fc947a50495b3903c78ec5f3ebc9559e25 https://github.com/phpmyadmin/phpmyadmin/commit/d7c9b2fc947a50495b3903c78ec… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2015-08-11 (Tue, 11 Aug 2015) Changed paths: M libraries/rte/rte_routines.lib.php Log Message: ----------- Refactor code of rte_routines.lib.php. Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] d8937d: Updated sql-parser to udan11/sql-parser@aef354a430...
by Marc Delisle 12 Aug '15

12 Aug '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d8937d883427e4fce99855c1c0a795c7c0a5d776 https://github.com/phpmyadmin/phpmyadmin/commit/d8937d883427e4fce99855c1c0a… Author: Dan Ungureanu <udan1107(a)gmail.com> Date: 2015-08-11 (Tue, 11 Aug 2015) Changed paths: M libraries/sql-parser/src/Components/ExpressionArray.php M libraries/sql-parser/src/Context.php M libraries/sql-parser/src/Parser.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 Log Message: ----------- Updated sql-parser to udan11/sql-parser@aef354a430d329edcbf12843f8047ef27cb9470c. Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com> Commit: 5024548a7788e65b79bc7d8c75fb75da627d52e1 https://github.com/phpmyadmin/phpmyadmin/commit/5024548a7788e65b79bc7d8c75f… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-08-11 (Tue, 11 Aug 2015) Changed paths: M libraries/sql-parser/src/Components/ExpressionArray.php M libraries/sql-parser/src/Context.php M libraries/sql-parser/src/Parser.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 Log Message: ----------- Merge pull request #11388 from udan11/update Fix #11383 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f5d41a1e6dab...5024548a7788

1 0

[phpmyadmin/phpmyadmin] f5d41a: Fix json markup
by Michal Čihař 11 Aug '15

11 Aug '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f5d41a1e6dab88700c2ee709ed1e5739c6969151 https://github.com/phpmyadmin/phpmyadmin/commit/f5d41a1e6dab88700c2ee709ed1… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-08-11 (Tue, 11 Aug 2015) Changed paths: M composer.json Log Message: ----------- Fix json markup Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 8221cb: Try to add custom composer repository
by Michal Čihař 11 Aug '15

11 Aug '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8221cb2a30402f597f7de236e250965ffaf34f2a https://github.com/phpmyadmin/phpmyadmin/commit/8221cb2a30402f597f7de236e25… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-08-11 (Tue, 11 Aug 2015) Changed paths: M composer.json Log Message: ----------- Try to add custom composer repository See issue #6261 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0