Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cfc96202fe204170a846a81ded0008206b0c6e9d https://github.com/phpmyadmin/phpmyadmin/commit/cfc96202fe204170a846a81ded0… Author: William Desportes <williamdes(a)wdes.fr> Date: 2018-12-20 (Thu, 12 December 2018) +01:00 Changed paths: M libraries/classes/Plugins/Export/ExportSql.php Log Message: ----------- Fix #13788 - Exporting a view structure, no database selected error Fix #13788 - Exporting a view structure based on another view with a sub-query throws no database selected error Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: a5b50b35bfe316d69eaf26389ec970fa8b918ed7 https://github.com/phpmyadmin/phpmyadmin/commit/a5b50b35bfe316d69eaf26389ec… Author: William Desportes <williamdes(a)wdes.fr> Date: 2018-12-20 (Thu, 12 December 2018) +01:00 Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog entry for #13788 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: d327674d728d6dea5abe157eb91b5d057de40bfd https://github.com/phpmyadmin/phpmyadmin/commit/d327674d728d6dea5abe157eb91… Author: William Desportes <williamdes(a)wdes.fr> Date: 2018-12-21 (Fri, 12 December 2018) +01:00 Changed paths: M test/classes/Plugins/Export/ExportSqlTest.php M test/classes/TrackerTest.php Log Message: ----------- Fix tests for #13788 - Exporting a view structure Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 1ead268e42644ccd2573f0d304796b395782ff19 https://github.com/phpmyadmin/phpmyadmin/commit/1ead268e42644ccd2573f0d3047… Author: William Desportes <williamdes(a)wdes.fr> Date: 2018-12-21 (Fri, 12 December 2018) +01:00 Changed paths: M libraries/classes/Config.php Log Message: ----------- Add support for commondir file in .git dir - See : https://git-scm.com/docs/gitrepository-layout/2.5.1 - See : https://git-scm.com/docs/gitrepository-layout #14391 Cherry-picked-from: 13e34b400abb509fd108332a007b2f6638361eb9 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: a6b6792cfbc83494e8e5f73dfe2f5fc91af87759 https://github.com/phpmyadmin/phpmyadmin/commit/a6b6792cfbc83494e8e5f73dfe2… Author: William Desportes <williamdes(a)wdes.fr> Date: 2018-12-21 (Fri, 12 December 2018) +01:00 Changed paths: M libraries/classes/Config.php M test/classes/ConfigTest.php Log Message: ----------- Added tests for Config::checkGitRevision and Config::isGitRevision #14253 Cherry-Picked-From: 9687dfbfd2613cf279430b81288d11ee1561826b Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 3ca66461373955f9f92c1dc5beb01a39885bddba https://github.com/phpmyadmin/phpmyadmin/commit/3ca66461373955f9f92c1dc5beb… Author: William Desportes <williamdes(a)wdes.fr> Date: 2018-12-21 (Fri, 12 December 2018) +01:00 Changed paths: M libraries/classes/Config.php Log Message: ----------- Fix found by phpstan See: cc2665121d8931b702c08ff12182cde9c452ee43 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 99cee9e389d826af4f1ca1e2872fbf9e692c8246 https://github.com/phpmyadmin/phpmyadmin/commit/99cee9e389d826af4f1ca1e2872… Author: William Desportes <williamdes(a)wdes.fr> Date: 2018-12-21 (Fri, 12 December 2018) +01:00 Changed paths: M index.php M libraries/classes/Config.php M libraries/classes/Display/GitRevision.php Log Message: ----------- Fix #14635 - Git revision error See: #14762 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: a8148f1fa7d827678b4d7dafaaac2ca31c22903d https://github.com/phpmyadmin/phpmyadmin/commit/a8148f1fa7d827678b4d7dafaaa… Author: William Desportes <williamdes(a)wdes.fr> Date: 2018-12-21 (Fri, 12 December 2018) +01:00 Changed paths: M test/classes/ConfigTest.php Log Message: ----------- Add tests for #14635 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: b6f38940f43929a77369e90daeb97e12bb517c1b https://github.com/phpmyadmin/phpmyadmin/commit/b6f38940f43929a77369e90daeb… Author: William Desportes <williamdes(a)wdes.fr> Date: 2018-12-21 (Fri, 12 December 2018) +01:00 Changed paths: M ChangeLog M libraries/classes/Plugins/Export/ExportSql.php M test/classes/Plugins/Export/ExportSqlTest.php M test/classes/TrackerTest.php Log Message: ----------- Merge pull request #14799 from williamdes/issue-13788-export-view Fix #13788 - Exporting a view structure, no database selected error Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 3da7230faf3b7cc57a02a7f0d6c87c98a9a3a1c9 https://github.com/phpmyadmin/phpmyadmin/commit/3da7230faf3b7cc57a02a7f0d6c… Author: William Desportes <williamdes(a)wdes.fr> Date: 2018-12-21 (Fri, 12 December 2018) +01:00 Changed paths: M index.php M libraries/classes/Config.php M libraries/classes/Display/GitRevision.php M test/classes/ConfigTest.php Log Message: ----------- Merge remote-tracking branch 'williamdes/issues-14635-14762-git-dir-removed' into QA_4_8 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: c433dd3c236ec3c26f0818094fdc55a0e5f299ad https://github.com/phpmyadmin/phpmyadmin/commit/c433dd3c236ec3c26f0818094fd… Author: William Desportes <williamdes(a)wdes.fr> Date: 2018-12-21 (Fri, 12 December 2018) +01:00 Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog entry for #14635 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: fe587e05b401379dc53e968054941cd797dd0359 https://github.com/phpmyadmin/phpmyadmin/commit/fe587e05b401379dc53e9680549… Author: William Desportes <williamdes(a)wdes.fr> Date: 2018-12-21 (Fri, 12 December 2018) +01:00 Changed paths: M ChangeLog M index.php M libraries/classes/Config.php M libraries/classes/Display/GitRevision.php M libraries/classes/Plugins/Export/ExportSql.php M test/classes/ConfigTest.php M test/classes/Plugins/Export/ExportSqlTest.php M test/classes/TrackerTest.php Log Message: ----------- Merge branch 'QA_4_8' Signed-off-by: William Desportes <williamdes(a)wdes.fr>