Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9364e2eee5681681caf7205c0933bc18af11e233 https://github.com/phpmyadmin/phpmyadmin/commit/9364e2eee5681681caf7205c0933... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths: M ChangeLog M libraries/error_report.lib.php
Log Message: ----------- bug #4596 [security] XSS through exception stack
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: b99b6b6672ff2419f05b05740c80c7a23c1da994 https://github.com/phpmyadmin/phpmyadmin/commit/b99b6b6672ff2419f05b05740c80... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths: M ChangeLog M libraries/error_report.lib.php
Log Message: ----------- bug #4595 [security] Path traversal can lead to leakage of line count
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: d32da348c4de2379482a48661ce968a55eebe5c4 https://github.com/phpmyadmin/phpmyadmin/commit/d32da348c4de2379482a48661ce9... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths: M ChangeLog M libraries/tbl_printview.lib.php
Log Message: ----------- bug #4578 [security] XSS vulnerability in table print view
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 1bc04ec95038f2356ad33752090001bf1c047208 https://github.com/phpmyadmin/phpmyadmin/commit/1bc04ec95038f2356ad337520900... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths: M ChangeLog M tbl_zoom_select.php
Log Message: ----------- bug #4579 [security] XSS vulnerability in zoom search page
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 80cd40b6687a6717860d345d6eb55bef2908e961 https://github.com/phpmyadmin/phpmyadmin/commit/80cd40b6687a6717860d345d6eb5... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths: M ChangeLog M libraries/gis/GIS_Factory.class.php
Log Message: ----------- bug #4594 [security] Path traversal in file inclusion of GIS factory
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 2a3b7393d1d5a8ba0543699df94a08a0f5728fe0 https://github.com/phpmyadmin/phpmyadmin/commit/2a3b7393d1d5a8ba0543699df94a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths: M ChangeLog M libraries/mult_submits.lib.php
Log Message: ----------- bug #4598 [security] XSS in multi submit
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 2ffdbf2d7daa0b92541d8b754e2afac555d3ed21 https://github.com/phpmyadmin/phpmyadmin/commit/2ffdbf2d7daa0b92541d8b754e2a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths: M ChangeLog M libraries/Config.class.php M libraries/Theme.class.php
Log Message: ----------- bug #4597 [security] XSS through pma_fontsize cookie
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 82f13d3e1bd21154391b9ae6f4cd5491df58d486 https://github.com/phpmyadmin/phpmyadmin/commit/82f13d3e1bd21154391b9ae6f4cd... Author: Marc Delisle marc@infomarc.info Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths: M ChangeLog M libraries/Config.class.php M libraries/Theme.class.php M libraries/error_report.lib.php M libraries/gis/GIS_Factory.class.php M libraries/mult_submits.lib.php M libraries/tbl_printview.lib.php M tbl_zoom_select.php
Log Message: ----------- Fix merge conflict
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 3443cc1ca4bfe4d4c9383e84ba5188adbb4a2ab9 https://github.com/phpmyadmin/phpmyadmin/commit/3443cc1ca4bfe4d4c9383e84ba51... Author: Marc Delisle marc@infomarc.info Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.2.13-dev
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 93366c8c2403a1dc07d9b198a423d250ffb7ecd2 https://github.com/phpmyadmin/phpmyadmin/commit/93366c8c2403a1dc07d9b198a423... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths: M ChangeLog M libraries/Config.class.php M libraries/Theme.class.php M libraries/error_report.lib.php M libraries/gis/GIS_Factory.class.php M libraries/mult_submits.lib.php M libraries/tbl_printview.lib.php M tbl_zoom_select.php
Log Message: ----------- Merge branch 'QA_4_2' into QA_4_3
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c7d9a9968381...93366c8c2403