Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 93e354c2e33347a138234d236b2e987a7f092b14 https://github.com/phpmyadmin/phpmyadmin/commit/93e354c2e33347a138234d236b2… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-01-07 (Sat, 07 Jan 2017) Changed paths: M doc/config.rst M index.php M libraries/common.inc.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php A phpinfo.php Log Message: ----------- Revert "Remove option to show phpinfo() ($cfg['ShowPhpInfo'])" This reverts commit e67e69229a1df3a26df12b1bae89065834fd85b4. Commit: 1089a7d67e39f9017ae96c92b922f89648dff240 https://github.com/phpmyadmin/phpmyadmin/commit/1089a7d67e39f9017ae96c92b92… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-01-07 (Sat, 07 Jan 2017) Changed paths: M phpinfo.php Log Message: ----------- Limit what we display in phpinfo - general information - configuration - modules This way we avoid displaying sensitive things (such as httpOnly cookies from environment of variables). Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: fdbef2dcc8e027155e3e5f3af8e460482830c9e0 https://github.com/phpmyadmin/phpmyadmin/commit/fdbef2dcc8e027155e3e5f3af8e… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-01-07 (Sat, 07 Jan 2017) Changed paths: M doc/config.rst Log Message: ----------- Add warning about enabling phpinfo Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 4abbe78a071d46283c5db485f38d8db691322e18 https://github.com/phpmyadmin/phpmyadmin/commit/4abbe78a071d46283c5db485f38… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-01-07 (Sat, 07 Jan 2017) Changed paths: M libraries/common.inc.php Log Message: ----------- Remove unused entries from goto whitelist Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 2eed93afeedf16a043409c56cd94404f507c3e27 https://github.com/phpmyadmin/phpmyadmin/commit/2eed93afeedf16a043409c56cd9… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-01-17 (Tue, 17 Jan 2017) Log Message: ----------- Merge branch 'QA_4_6' Commit: e21b4f998e2ce8d7ed67311583e34209d5f3480c https://github.com/phpmyadmin/phpmyadmin/commit/e21b4f998e2ce8d7ed67311583e… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-01-17 (Tue, 17 Jan 2017) Changed paths: M doc/config.rst M index.php M libraries/common.inc.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php A phpinfo.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12875' into QA_4_6 Commit: eb2898527f44f1b0a397c84247d6fb27a2d8339f https://github.com/phpmyadmin/phpmyadmin/commit/eb2898527f44f1b0a397c84247d… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-01-17 (Tue, 17 Jan 2017) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12495 and #12875 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: dfa8b7e9d8392c9d6c802c418a513e9701d1e92a https://github.com/phpmyadmin/phpmyadmin/commit/dfa8b7e9d8392c9d6c802c418a5… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-01-17 (Tue, 17 Jan 2017) Changed paths: M ChangeLog M libraries/insert_edit.lib.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Commit: 5c3f74d8753d9b6bde6fe882d4b98319b1f38e18 https://github.com/phpmyadmin/phpmyadmin/commit/5c3f74d8753d9b6bde6fe882d4b… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-01-17 (Tue, 17 Jan 2017) Changed paths: M ChangeLog M doc/config.rst M index.php M libraries/common.inc.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php A phpinfo.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9f2b39258a52...5c3f74d8753d