Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: 036549a8dea2c98d728f84f158dc184c377d2c50 https://github.com/phpmyadmin/phpmyadmin/commit/036549a8dea2c98d728f84f158dc... Author: Marc Delisle <marc@infomarc.info> Date: 2014-10-31 (Fri, 31 Oct 2014) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.2.12-dev Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 7658f9311af6aa6081a64ce113cce678472b62dd https://github.com/phpmyadmin/phpmyadmin/commit/7658f9311af6aa6081a64ce113cc... Author: Sevdimali İsa <sevdimaliisayev@mail.ru> Date: 2014-10-31 (Fri, 31 Oct 2014) Changed paths: M po/az.po Log Message: ----------- Translated using Weblate (Azerbaijani) Currently translated at 47.9% (1326 of 2768 strings) [CI skip] Commit: 10d2d634c385a9a86aa2d98b6a502cf1e3aa604c https://github.com/phpmyadmin/phpmyadmin/commit/10d2d634c385a9a86aa2d98b6a50... Author: josep constanti <jconstanti@ovi.com> Date: 2014-10-31 (Fri, 31 Oct 2014) Changed paths: M po/ca.po Log Message: ----------- Translated using Weblate (Catalan) Currently translated at 88.7% (2457 of 2768 strings) [CI skip] Commit: 414d80c38843b4b48d3cc37d2b0a41b97d9cf1aa https://github.com/phpmyadmin/phpmyadmin/commit/414d80c38843b4b48d3cc37d2b0a... Author: Aputsiaq Niels Janussen <aj@isit.gl> Date: 2014-10-31 (Fri, 31 Oct 2014) Changed paths: M po/da.po Log Message: ----------- Translated using Weblate (Danish) Currently translated at 100.0% (2768 of 2768 strings) [CI skip] Commit: 1ce48950d01afa516ad4d1757acc687802833ec9 https://github.com/phpmyadmin/phpmyadmin/commit/1ce48950d01afa516ad4d1757acc... Author: Yugal Pantola <yug.scorpio@gmail.com> Date: 2014-10-31 (Fri, 31 Oct 2014) Changed paths: M po/hi.po Log Message: ----------- Translated using Weblate (Hindi) Currently translated at 46.4% (1287 of 2768 strings) [CI skip] Commit: 4bbc49744ee78eedab4200a59f0f4a830ecd363b https://github.com/phpmyadmin/phpmyadmin/commit/4bbc49744ee78eedab4200a59f0f... Author: Aso Naderi <aso.naderi@gmail.com> Date: 2014-10-31 (Fri, 31 Oct 2014) Changed paths: M po/ckb.po Log Message: ----------- Translated using Weblate (Kurdish Sorani) Currently translated at 19.1% (531 of 2768 strings) [CI skip] Commit: 960efb0b563cda4d77810eca7b19e033989ec470 https://github.com/phpmyadmin/phpmyadmin/commit/960efb0b563cda4d77810eca7b19... Author: Weblate <noreply@weblate.org> Date: 2014-10-31 (Fri, 31 Oct 2014) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Commit: e743305764ebedb88dd149776309ff8828236a43 https://github.com/phpmyadmin/phpmyadmin/commit/e743305764ebedb88dd149776309... Author: Atul Pratap Singh <atulpratapsingh05@gmail.com> Date: 2014-11-02 (Sun, 02 Nov 2014) Changed paths: M ChangeLog M libraries/Header.class.php Log Message: ----------- Fix bug#4574 Blank/white page when JavaScript disabled Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com> Commit: 087efc6c02edb18ff8cbeac9f2368b94e02964ac https://github.com/phpmyadmin/phpmyadmin/commit/087efc6c02edb18ff8cbeac9f236... Author: Sevdimali İsa <sevdimaliisayev@mail.ru> Date: 2014-11-02 (Sun, 02 Nov 2014) Changed paths: M po/az.po Log Message: ----------- Translated using Weblate (Azerbaijani) Currently translated at 48.0% (1331 of 2768 strings) [CI skip] Commit: de4672d4d3fb3f8a0f053441682b3020821791c3 https://github.com/phpmyadmin/phpmyadmin/commit/de4672d4d3fb3f8a0f053441682b... Author: Weblate <noreply@weblate.org> Date: 2014-11-02 (Sun, 02 Nov 2014) Changed paths: M ChangeLog M libraries/Header.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Commit: 4360a174e57c78e2dee71f097389fbe48cbf1a5d https://github.com/phpmyadmin/phpmyadmin/commit/4360a174e57c78e2dee71f097389... Author: Marc Delisle <marc@infomarc.info> Date: 2014-11-04 (Tue, 04 Nov 2014) Changed paths: M ChangeLog M js/common.js Log Message: ----------- bug ReferenceError: targeurl is not defined Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: eef8565b7339904ebe9d0ac6989714fcef0ee26b https://github.com/phpmyadmin/phpmyadmin/commit/eef8565b7339904ebe9d0ac69897... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-11-04 (Tue, 04 Nov 2014) Changed paths: M ChangeLog M js/sql.js Log Message: ----------- bug #4577 Multi row actions cause full page reloads Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: e4d5503bcf87e34a2e04b50652da0bc7ec69fc2c https://github.com/phpmyadmin/phpmyadmin/commit/e4d5503bcf87e34a2e04b50652da... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-11-04 (Tue, 04 Nov 2014) Changed paths: M js/sql.js M js/tbl_structure.js Log Message: ----------- bug #4577 Additional fix for table structure page. Multi submits can be inputs as well Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 10aa41463c05ecc2c1dfa26ca8317eb56f14796c https://github.com/phpmyadmin/phpmyadmin/commit/10aa41463c05ecc2c1dfa26ca831... Author: Michal Čihař <michal@cihar.com> Date: 2014-11-04 (Tue, 04 Nov 2014) Changed paths: M po/fa.po Log Message: ----------- Translated using Weblate (Persian) Currently translated at 31.5% (874 of 2768 strings) [CI skip] Commit: f04b5cf6fc8d0e118fc708f5b64e6faa54035418 https://github.com/phpmyadmin/phpmyadmin/commit/f04b5cf6fc8d0e118fc708f5b64e... Author: Weblate <noreply@weblate.org> Date: 2014-11-04 (Tue, 04 Nov 2014) Changed paths: M ChangeLog M js/common.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Commit: d8c7d8f0184574a98d1e768464ed130013975214 https://github.com/phpmyadmin/phpmyadmin/commit/d8c7d8f0184574a98d1e768464ed... Author: Michal Čihař <michal@cihar.com> Date: 2014-11-05 (Wed, 05 Nov 2014) Changed paths: M build.xml Log Message: ----------- Fix configuration for jshint to generate checkstyle compatible reports Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 403c9d23d769f97f821848480231620b939be2ae https://github.com/phpmyadmin/phpmyadmin/commit/403c9d23d769f97f821848480231... Author: Yogeshwar <charanyogeshwar@gmail.com> Date: 2014-11-05 (Wed, 05 Nov 2014) Changed paths: M po/hi.po Log Message: ----------- Translated using Weblate (Hindi) Currently translated at 46.6% (1290 of 2768 strings) [CI skip] Commit: ad8ed1d041f69e21c4337d35d6d47079b2600517 https://github.com/phpmyadmin/phpmyadmin/commit/ad8ed1d041f69e21c4337d35d6d4... Author: Weblate <noreply@weblate.org> Date: 2014-11-05 (Wed, 05 Nov 2014) Changed paths: M build.xml Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Commit: 1ce3aa607c6993fce128d5a75d7409ff566730ce https://github.com/phpmyadmin/phpmyadmin/commit/1ce3aa607c6993fce128d5a75d74... Author: Michal Čihař <michal@cihar.com> Date: 2014-11-05 (Wed, 05 Nov 2014) Changed paths: M build.xml Log Message: ----------- Add another target for jshint Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 784166614942cc72da7dad0e4b37adc85c427b9b https://github.com/phpmyadmin/phpmyadmin/commit/784166614942cc72da7dad0e4b37... Author: Michal Čihař <michal@cihar.com> Date: 2014-11-05 (Wed, 05 Nov 2014) Changed paths: M scripts/update-po Log Message: ----------- Skip CI for PO files update Signed-off-by: Michal Čihař <michal@cihar.com> Commit: c8daefc57ab912611a455b79fc99a99ca8296563 https://github.com/phpmyadmin/phpmyadmin/commit/c8daefc57ab912611a455b79fc99... Author: Michal Čihař <michal@cihar.com> Date: 2014-11-05 (Wed, 05 Nov 2014) Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files [CI skip] Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 2a58116a968dbf5483279244dba12070afb141c9 https://github.com/phpmyadmin/phpmyadmin/commit/2a58116a968dbf5483279244dba1... Author: Mircəlal <01youknowme@gmail.com> Date: 2014-11-06 (Thu, 06 Nov 2014) Changed paths: M po/az.po Log Message: ----------- Translated using Weblate (Azerbaijani) Currently translated at 48.3% (1338 of 2767 strings) [CI skip] Commit: 1ed62c3fcaf6445d3fbbf0d8e8bb188ad11773b7 https://github.com/phpmyadmin/phpmyadmin/commit/1ed62c3fcaf6445d3fbbf0d8e8bb... Author: Marc Delisle <marc@infomarc.info> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M ChangeLog M libraries/tbl_tracking.lib.php M test/libraries/PMA_tbl_tracking_test.php Log Message: ----------- bug Incorrect text/icon display in Tracking report Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 7c635e9957909bb017448160637e5b4b13831f15 https://github.com/phpmyadmin/phpmyadmin/commit/7c635e9957909bb017448160637e... Author: Michal Čihař <michal@cihar.com> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M po/hy.po Log Message: ----------- Translated using Weblate (Armenian) Currently translated at 3.6% (102 of 2768 strings) [CI skip] Commit: 705f9045bfec568871e5e98a5d42ea98968169e7 https://github.com/phpmyadmin/phpmyadmin/commit/705f9045bfec568871e5e98a5d42... Author: Ziyaddin Sadigov <ziyaddinsadigov@gmail.com> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M po/az.po Log Message: ----------- Translated using Weblate (Azerbaijani) Currently translated at 48.3% (1339 of 2767 strings) [CI skip] Commit: 92178c60b325a6742f8e7a4440144a45fd0ae89f https://github.com/phpmyadmin/phpmyadmin/commit/92178c60b325a6742f8e7a444014... Author: Michal Čihař <michal@cihar.com> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M po/bn.po Log Message: ----------- Translated using Weblate (Bengali) Currently translated at 93.8% (2598 of 2768 strings) [CI skip] Commit: 621a17cdbd3a3ade519faec486483309ad6597fc https://github.com/phpmyadmin/phpmyadmin/commit/621a17cdbd3a3ade519faec48648... Author: josep constanti <jconstanti@ovi.com> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M po/ca.po Log Message: ----------- Translated using Weblate (Catalan) Currently translated at 88.7% (2456 of 2767 strings) [CI skip] Commit: d289e00e73391900756f845ca9f5746346686c27 https://github.com/phpmyadmin/phpmyadmin/commit/d289e00e73391900756f845ca9f5... Author: Michal Čihař <michal@cihar.com> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M po/hu.po Log Message: ----------- Translated using Weblate (Hungarian) Currently translated at 87.2% (2414 of 2767 strings) [CI skip] Commit: ae1ba2e76b09bbc0ae32eed739c06b3bc182b544 https://github.com/phpmyadmin/phpmyadmin/commit/ae1ba2e76b09bbc0ae32eed739c0... Author: Michal Čihař <michal@cihar.com> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M po/lv.po Log Message: ----------- Translated using Weblate (Latvian) Currently translated at 24.0% (665 of 2768 strings) [CI skip] Commit: 04a4917d76fcebb1ea8e514c988643bd1757cc88 https://github.com/phpmyadmin/phpmyadmin/commit/04a4917d76fcebb1ea8e514c9886... Author: Michal Čihař <michal@cihar.com> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M po/mk.po Log Message: ----------- Translated using Weblate (Macedonian) Currently translated at 20.4% (567 of 2768 strings) [CI skip] Commit: 57acf26b1e5b7f3e2a16ce1ea418166237a50e89 https://github.com/phpmyadmin/phpmyadmin/commit/57acf26b1e5b7f3e2a16ce1ea418... Author: Michal Čihař <michal@cihar.com> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M po/ms.po Log Message: ----------- Translated using Weblate (Malay) Currently translated at 13.0% (361 of 2767 strings) [CI skip] Commit: 6363fd82cb39a1e1157e55d9dbb92e7a38a88347 https://github.com/phpmyadmin/phpmyadmin/commit/6363fd82cb39a1e1157e55d9dbb9... Author: Michal Čihař <michal@cihar.com> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M po/mn.po Log Message: ----------- Translated using Weblate (Mongolian) Currently translated at 25.9% (718 of 2768 strings) [CI skip] Commit: 28106296c1ec25bc301e22039e12fc159ebe0240 https://github.com/phpmyadmin/phpmyadmin/commit/28106296c1ec25bc301e22039e12... Author: Michal Čihař <michal@cihar.com> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M po/zh_CN.po Log Message: ----------- Translated using Weblate (Simplified Chinese) Currently translated at 89.4% (2475 of 2768 strings) [CI skip] Commit: fce932bf0c8aa63c1bc42b14f3201981b4c5ac69 https://github.com/phpmyadmin/phpmyadmin/commit/fce932bf0c8aa63c1bc42b14f320... Author: Michal Čihař <michal@cihar.com> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M po/tt.po Log Message: ----------- Translated using Weblate (Tatar) Currently translated at 20.6% (572 of 2767 strings) [CI skip] Commit: b131866f8804a6f0a4107e770edc8ce11c6f90f2 https://github.com/phpmyadmin/phpmyadmin/commit/b131866f8804a6f0a4107e770edc... Author: Michal Čihař <michal@cihar.com> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M po/th.po Log Message: ----------- Translated using Weblate (Thai) Currently translated at 38.6% (1070 of 2768 strings) [CI skip] Commit: 8c840dd41e1af4c1e5c9b2e9b3eb41bd9e93b81c https://github.com/phpmyadmin/phpmyadmin/commit/8c840dd41e1af4c1e5c9b2e9b3eb... Author: Michal Čihař <michal@cihar.com> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M po/uz.po Log Message: ----------- Translated using Weblate (Uzbek) Currently translated at 41.1% (1138 of 2767 strings) [CI skip] Commit: acb90eca4c051377fda470f71dae335bc7299278 https://github.com/phpmyadmin/phpmyadmin/commit/acb90eca4c051377fda470f71dae... Author: Michal Čihař <michal@cihar.com> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M po/uz@latin.po Log Message: ----------- Translated using Weblate (Uzbek (latin)) Currently translated at 40.0% (1108 of 2768 strings) [CI skip] Commit: 025934000784542920760066578364d4c8348fda https://github.com/phpmyadmin/phpmyadmin/commit/0259340007845429207600665783... Author: Weblate <noreply@weblate.org> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M ChangeLog M libraries/tbl_tracking.lib.php M test/libraries/PMA_tbl_tracking_test.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Commit: ffcd97aa48702618432952260ac6e83c260426e0 https://github.com/phpmyadmin/phpmyadmin/commit/ffcd97aa48702618432952260ac6... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-11-11 (Tue, 11 Nov 2014) Changed paths: M ChangeLog M libraries/sql.lib.php Log Message: ----------- bug #4404 Recordset return from procedure display nothing Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 1d54c59049bc11e5655f95575025ced494367e26 https://github.com/phpmyadmin/phpmyadmin/commit/1d54c59049bc11e5655f95575025... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-11-11 (Tue, 11 Nov 2014) Changed paths: M ChangeLog M js/rte.js Log Message: ----------- #4584 Edit dialog for routines is too long for smaller displays Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 7775cc8d31f26266d799271876509131017922bc https://github.com/phpmyadmin/phpmyadmin/commit/7775cc8d31f26266d79927187650... Author: Atul Pratap Singh <atulpratapsingh05@gmail.com> Date: 2014-11-12 (Wed, 12 Nov 2014) Changed paths: M js/jquery/jquery.menuResizer-1.0.js M libraries/structure.lib.php Log Message: ----------- Fix bug#4586 Javascript error after moving a column Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com> Commit: 03c89704fa0880d8bac3b008591bb3e758f23aea https://github.com/phpmyadmin/phpmyadmin/commit/03c89704fa0880d8bac3b008591b... Author: Atul Pratap Singh <atulpratapsingh05@gmail.com> Date: 2014-11-12 (Wed, 12 Nov 2014) Changed paths: M ChangeLog Log Message: ----------- Changelog entry Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com> Commit: e1a722dee799f5013cdff90c611d65a4ac760cca https://github.com/phpmyadmin/phpmyadmin/commit/e1a722dee799f5013cdff90c611d... Author: Marc Delisle <marc@infomarc.info> Date: 2014-11-16 (Sun, 16 Nov 2014) Changed paths: M ChangeLog M libraries/DisplayResults.class.php Log Message: ----------- bug #4576 Issue with long comments on table columns Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 9f9e6937cad1e6c7e9889de3e62fb20bd8c51836 https://github.com/phpmyadmin/phpmyadmin/commit/9f9e6937cad1e6c7e9889de3e62f... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-11-18 (Tue, 18 Nov 2014) Changed paths: M ChangeLog M libraries/operations.lib.php Log Message: ----------- #4599 Input field unnecessarily selected on focus Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: e7b2f5415a9f1ae2e15a1037d8e4d95c2e37e81e https://github.com/phpmyadmin/phpmyadmin/commit/e7b2f5415a9f1ae2e15a1037d8e4... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog M libraries/operations.lib.php Log Message: ----------- Merge pull request #1403 from madhuracj/Bug4599 #4599 Input field unnecessarily selected on focus Commit: 2e42e8a11b9cf43e08064c5a7ccd11325fe08106 https://github.com/phpmyadmin/phpmyadmin/commit/2e42e8a11b9cf43e08064c5a7ccd... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog M libraries/display_export.lib.php Log Message: ----------- bug #4602 Exporting selected rows exports all rows of the query Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 8252099d9d5d026ffc08e2205fa73bf85537fe39 https://github.com/phpmyadmin/phpmyadmin/commit/8252099d9d5d026ffc08e2205fa7... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-11-19 (Wed, 19 Nov 2014) Changed paths: M ChangeLog M tbl_export.php Log Message: ----------- bug #4444 No insert statement produced in SQL export for queries with alias Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> 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: bfc61051b78f562914d12b60e0ae94dd131c2ba0 https://github.com/phpmyadmin/phpmyadmin/commit/bfc61051b78f562914d12b60e0ae... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-11-20 (Thu, 20 Nov 2014) Changed paths: M ChangeLog M libraries/relation.lib.php Log Message: ----------- bug #4603 Field disabled when internal relations used 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: e86d97c23d7e7cea23f6fe186c812f1ed85fe337 https://github.com/phpmyadmin/phpmyadmin/commit/e86d97c23d7e7cea23f6fe186c81... 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.12 release Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: b61020605803d4c03a16584ba76fa3573130408e https://github.com/phpmyadmin/phpmyadmin/commit/b61020605803d4c03a16584ba76f... Author: Marc Delisle <marc@infomarc.info> Date: 2014-11-20 (Thu, 20 Nov 2014) Changed paths: M ChangeLog M README M build.xml M doc/conf.py M js/common.js M js/jquery/jquery.menuResizer-1.0.js M js/rte.js M js/sql.js M js/tbl_structure.js M libraries/Config.class.php M libraries/DisplayResults.class.php M libraries/Header.class.php M libraries/Theme.class.php M libraries/display_export.lib.php M libraries/error_report.lib.php M libraries/gis/GIS_Factory.class.php M libraries/mult_submits.lib.php M libraries/operations.lib.php M libraries/relation.lib.php M libraries/sql.lib.php M libraries/structure.lib.php M libraries/tbl_printview.lib.php M libraries/tbl_tracking.lib.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M scripts/update-po M tbl_export.php M tbl_zoom_select.php M test/libraries/PMA_tbl_tracking_test.php Log Message: ----------- Merge branch 'MAINT_4_2_12' into STABLE Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ce144165cf30...b61020605803