Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: 50442a2cd8ed07b1df4adb85a4679b78f61da685 https://github.com/phpmyadmin/phpmyadmin/commit/50442a2cd8ed07b1df4adb85a467... Author: Marc Delisle marc@infomarc.info Date: 2014-03-06 (Thu, 06 Mar 2014)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.1.0-dev
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 32edccc541065e14aece63cc5d14da78dae230e6 https://github.com/phpmyadmin/phpmyadmin/commit/32edccc541065e14aece63cc5d14... Author: Krtin Kumar krtinkumar@gmail.com Date: 2014-03-07 (Fri, 07 Mar 2014)
Changed paths: M js/makegrid.js
Log Message: ----------- Bugfix4301
Signed-off-by: Krtin Kumar krtinkumar@gmail.com
Commit: e8be0639c0052a9ee4b43ad32c6986eb14a11d9c https://github.com/phpmyadmin/phpmyadmin/commit/e8be0639c0052a9ee4b43ad32c69... Author: Marc Delisle marc@infomarc.info Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths: M js/makegrid.js
Log Message: ----------- Merge pull request #1020 from krtin/Bug_FIX#4301
Bugfix4301
Commit: eb7cb82b4ac777d433b12443413471cfad887a89 https://github.com/phpmyadmin/phpmyadmin/commit/eb7cb82b4ac777d433b124434134... Author: Marc Delisle marc@infomarc.info Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entry
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 45606abccb8afa02fe119021d1f2ad18b5910b7f https://github.com/phpmyadmin/phpmyadmin/commit/45606abccb8afa02fe119021d1f2... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-03-09 (Sun, 09 Mar 2014)
Changed paths: M ChangeLog M libraries/common.inc.php
Log Message: ----------- bug #4278 reCaptcha re-login requires double effort
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 5fdb93de0aee5397c943bded440b01afc68e8785 https://github.com/phpmyadmin/phpmyadmin/commit/5fdb93de0aee5397c943bded440b... Author: Marc Delisle marc@infomarc.info Date: 2014-03-09 (Sun, 09 Mar 2014)
Changed paths: M libraries/plugins/export/ExportPhparray.class.php
Log Message: ----------- Fix comment
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 056b40b0ae0699ec3895f55bcbb5a4cdd3631668 https://github.com/phpmyadmin/phpmyadmin/commit/056b40b0ae0699ec3895f55bcbb5... Author: Yungu Kim crimsonpi@gmail.com Date: 2014-03-11 (Tue, 11 Mar 2014)
Changed paths: M po/ko.po
Log Message: ----------- Translated using Weblate (Korean)
Currently translated at 75.9% (2088 of 2749)
Commit: 8ca233d511696a51c84bd5e2b67fc3e75b627692 https://github.com/phpmyadmin/phpmyadmin/commit/8ca233d511696a51c84bd5e2b67f... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2014-03-13 (Thu, 13 Mar 2014)
Changed paths: M ChangeLog M js/tbl_change.js
Log Message: ----------- Fix bug#4324: Insert page datepicker not showing up
Signed-off-by: Atul Pratap Singh atulpratapsingh05@gmail.com
Commit: baecb782e571ce952814870949bbf6930d3fb55d https://github.com/phpmyadmin/phpmyadmin/commit/baecb782e571ce952814870949bb... Author: Aayush Anand aayushism12@gmail.com Date: 2014-03-13 (Thu, 13 Mar 2014)
Changed paths: M js/functions.js
Log Message: ----------- Fix bug #3991
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 8eff2e52ef6f8795b7aa2a10d7c85e1b780a77d1 https://github.com/phpmyadmin/phpmyadmin/commit/8eff2e52ef6f8795b7aa2a10d7c8... Author: Marc Delisle marc@infomarc.info Date: 2014-03-13 (Thu, 13 Mar 2014)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entry
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 8b2d5c4cec96cfd0ffd8595609cc552fe97cc1be https://github.com/phpmyadmin/phpmyadmin/commit/8b2d5c4cec96cfd0ffd8595609cc... Author: Erik Hepsø hepso@hoved.org Date: 2014-03-13 (Thu, 13 Mar 2014)
Changed paths: M po/nb.po
Log Message: ----------- Translated using Weblate (Norwegian Bokmål)
Currently translated at 66.4% (1828 of 2749)
Commit: 199d560e8e5a74555939d2083322fe3435ca6a5e https://github.com/phpmyadmin/phpmyadmin/commit/199d560e8e5a74555939d2083322... Author: Nicholas Arnesen baretester@live.no Date: 2014-03-13 (Thu, 13 Mar 2014)
Changed paths: M po/nb.po
Log Message: ----------- Translated using Weblate (Norwegian Bokmål)
Currently translated at 66.5% (1829 of 2749)
Commit: 3e83565cf22332f5968cf77ac6861e8d3bd354ed https://github.com/phpmyadmin/phpmyadmin/commit/3e83565cf22332f5968cf77ac686... Author: Michal Čihař michal@cihar.com Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths: M test/classes/PMA_Advisor_test.php
Log Message: ----------- Fix order of params to assertEquals
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 3d0f2370318702b27f3a36b42ab3cb38adb727c7 https://github.com/phpmyadmin/phpmyadmin/commit/3d0f2370318702b27f3a36b42ab3... Author: Michal Čihař michal@cihar.com Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths: M test/classes/PMA_Advisor_test.php
Log Message: ----------- Fix expected message to match code
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 53cc186591f574299fe1951873fa9458b291b6e2 https://github.com/phpmyadmin/phpmyadmin/commit/53cc186591f574299fe1951873fa... Author: Michal Čihař michal@cihar.com Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths: M libraries/Advisor.class.php
Log Message: ----------- Fixed ob_start/eval problems in phpunit
When running in phpunit, the eval can raise exception, so treat it same as it would be output returned by the eval. Without catching it, output buffering gets one more level of nesting leading to occassional timeouts in Travis-CI.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: c8c77db60874710e54e5beb318077e3b2707fc9e https://github.com/phpmyadmin/phpmyadmin/commit/c8c77db60874710e54e5beb31807... Author: Erik Hepsø hepso@hoved.org Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths: M po/nb.po
Log Message: ----------- Translated using Weblate (Norwegian Bokmål)
Currently translated at 66.8% (1837 of 2749)
Commit: 99b7b74040ce0b7e66c6d70cfffb5e08a6b1a4c0 https://github.com/phpmyadmin/phpmyadmin/commit/99b7b74040ce0b7e66c6d70cfffb... Author: Weblate noreply@weblate.org Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths: M libraries/Advisor.class.php M test/classes/PMA_Advisor_test.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1
Commit: 9fbabd62029522e0100ce9eb3df382dddab7ebf0 https://github.com/phpmyadmin/phpmyadmin/commit/9fbabd62029522e0100ce9eb3df3... Author: Michal Čihař michal@cihar.com Date: 2014-03-14 (Fri, 14 Mar 2014)
Changed paths: M libraries/Advisor.class.php
Log Message: ----------- Backport Advisor cleanups from master
Signed-off-by: Michal Čihař michal@cihar.com
Commit: b2900f12af56f32a97f212542be25bc2931cdef0 https://github.com/phpmyadmin/phpmyadmin/commit/b2900f12af56f32a97f212542be2... Author: Marc Delisle marc@infomarc.info Date: 2014-03-16 (Sun, 16 Mar 2014)
Changed paths: M ChangeLog M js/functions.js
Log Message: ----------- bug #4323 QueryWindow ignores CodeMirror
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: b8587c1d9b118f721e2813ef6f9067c112356f42 https://github.com/phpmyadmin/phpmyadmin/commit/b8587c1d9b118f721e2813ef6f90... Author: Pl plamen_mbx@yahoo.com Date: 2014-03-16 (Sun, 16 Mar 2014)
Changed paths: M po/bg.po
Log Message: ----------- Translated using Weblate (Bulgarian)
Currently translated at 71.5% (1966 of 2749)
Commit: ae235662e881c2065a8ccb9373fde0a76cda4092 https://github.com/phpmyadmin/phpmyadmin/commit/ae235662e881c2065a8ccb9373fd... Author: Marc Delisle marc@infomarc.info Date: 2014-03-16 (Sun, 16 Mar 2014)
Changed paths: M po/fr.po
Log Message: ----------- Translated using Weblate (French)
Currently translated at 100.0% (2749 of 2749)
Commit: 31f550167f2bc97c7911ea42838bdbbf261b61bb https://github.com/phpmyadmin/phpmyadmin/commit/31f550167f2bc97c7911ea42838b... Author: Yungu Kim crimsonpi@gmail.com Date: 2014-03-16 (Sun, 16 Mar 2014)
Changed paths: M po/ko.po
Log Message: ----------- Translated using Weblate (Korean)
Currently translated at 76.6% (2108 of 2749)
Commit: 4b0de85a8f040589c7fb296724fd195629d94784 https://github.com/phpmyadmin/phpmyadmin/commit/4b0de85a8f040589c7fb296724fd... Author: Burak Yavuz hitowerdigit@hotmail.com Date: 2014-03-16 (Sun, 16 Mar 2014)
Changed paths: M po/tr.po
Log Message: ----------- Translated using Weblate (Turkish)
Currently translated at 100.0% (2749 of 2749)
Commit: beb62dbd7f8868c71139201351fb632b5d27ec5d https://github.com/phpmyadmin/phpmyadmin/commit/beb62dbd7f8868c71139201351fb... Author: Weblate noreply@weblate.org Date: 2014-03-16 (Sun, 16 Mar 2014)
Changed paths: M ChangeLog M js/functions.js
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1
Commit: 09108aedda9c5c54351f35f0fc8f3c2fb58b03a1 https://github.com/phpmyadmin/phpmyadmin/commit/09108aedda9c5c54351f35f0fc8f... Author: Ashutosh Dhundhara ashutoshdhundhara@yahoo.com Date: 2014-03-18 (Tue, 18 Mar 2014)
Changed paths: M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php
Log Message: ----------- Bug: None of the live charts shown on "Status -> Monitor" page.
Signed-off-by: Ashutosh Dhundhara ashutoshdhundhara@yahoo.com Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 70ffeaacf372f82aef9ac8780adc281974519dde https://github.com/phpmyadmin/phpmyadmin/commit/70ffeaacf372f82aef9ac8780adc... Author: Marc Delisle marc@infomarc.info Date: 2014-03-18 (Tue, 18 Mar 2014)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entry
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: a2070cd195acaddbb0e000a674024a4602789e56 https://github.com/phpmyadmin/phpmyadmin/commit/a2070cd195acaddbb0e000a67402... Author: Carles Mata info@appsinet.com Date: 2014-03-18 (Tue, 18 Mar 2014)
Changed paths: M po/ca.po
Log Message: ----------- Translated using Weblate (Catalan)
Currently translated at 93.9% (2584 of 2749)
Commit: 8abc3f1d8db4360c11f2c059f36b0a2a495d84a6 https://github.com/phpmyadmin/phpmyadmin/commit/8abc3f1d8db4360c11f2c059f36b... Author: Giovanni Sora g.sora@tiscali.it Date: 2014-03-18 (Tue, 18 Mar 2014)
Changed paths: M po/ia.po
Log Message: ----------- Translated using Weblate (Interlingua)
Currently translated at 41.6% (1144 of 2749)
Commit: 2db6d499c6c23c83b21fc85af5f46fe4ab32d24f https://github.com/phpmyadmin/phpmyadmin/commit/2db6d499c6c23c83b21fc85af5f4... Author: Weblate noreply@weblate.org Date: 2014-03-18 (Tue, 18 Mar 2014)
Changed paths: M ChangeLog M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1
Commit: 786256469cea2e27626d205671c40e3f8e1924df https://github.com/phpmyadmin/phpmyadmin/commit/786256469cea2e27626d205671c4... Author: Michal Čihař michal@cihar.com Date: 2014-03-19 (Wed, 19 Mar 2014)
Changed paths: M libraries/Header.class.php
Log Message: ----------- Allow www.google.com only in case we are using reCAPTCHA
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 5199ad8dc2058a49cc7026dd85953d5193ebadac https://github.com/phpmyadmin/phpmyadmin/commit/5199ad8dc2058a49cc7026dd8595... Author: Michal Čihař michal@cihar.com Date: 2014-03-19 (Wed, 19 Mar 2014)
Changed paths: M libraries/Header.class.php
Log Message: ----------- Add Content-Security-Policy header
This is standard and obsoletes X-Content-Security-Policy and X-Webkit-CSP, but we still keep the old ones to provide headers for old browsers.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 5cb584b9637780d555a73cc034d85f90700070c5 https://github.com/phpmyadmin/phpmyadmin/commit/5cb584b9637780d555a73cc034d8... Author: Michal Čihař michal@cihar.com Date: 2014-03-19 (Wed, 19 Mar 2014)
Changed paths: M libraries/Header.class.php
Log Message: ----------- Allow inline styles in CSP
Signed-off-by: Michal Čihař michal@cihar.com
Commit: eab5d68b9dcc037713f940a0d2bca1b39bdfbe30 https://github.com/phpmyadmin/phpmyadmin/commit/eab5d68b9dcc037713f940a0d2bc... Author: Michal Čihař michal@cihar.com Date: 2014-03-19 (Wed, 19 Mar 2014)
Changed paths: M libraries/Header.class.php
Log Message: ----------- Fix typo in CSP
Signed-off-by: Michal Čihař michal@cihar.com
Commit: c56523bebd83cadf24382dffc7187e4893085a9f https://github.com/phpmyadmin/phpmyadmin/commit/c56523bebd83cadf24382dffc718... Author: Michal Čihař michal@cihar.com Date: 2014-03-20 (Thu, 20 Mar 2014)
Changed paths: M libraries/Header.class.php
Log Message: ----------- Allow styles from ourselves in CSP
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 23c4f3eea2febd4cb0d59f4a9211e00b4467936a https://github.com/phpmyadmin/phpmyadmin/commit/23c4f3eea2febd4cb0d59f4a9211... Author: Peter Sone Koldkjær rapelling@gmail.com Date: 2014-03-20 (Thu, 20 Mar 2014)
Changed paths: M po/da.po
Log Message: ----------- Translated using Weblate (Danish)
Currently translated at 99.8% (2746 of 2749)
Commit: f92b4afbbd093db9f7f590e222cd99d27752c805 https://github.com/phpmyadmin/phpmyadmin/commit/f92b4afbbd093db9f7f590e222cd... Author: Anawin Wongsadit imonmac@hotmail.com Date: 2014-03-20 (Thu, 20 Mar 2014)
Changed paths: M po/th.po
Log Message: ----------- Translated using Weblate (Thai)
Currently translated at 42.0% (1157 of 2749)
Commit: 454cc7ca7204b7109386095f53fba3b5369ff6b4 https://github.com/phpmyadmin/phpmyadmin/commit/454cc7ca7204b7109386095f53fb... Author: Weblate noreply@weblate.org Date: 2014-03-20 (Thu, 20 Mar 2014)
Changed paths: M libraries/Header.class.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1
Commit: 763eae1463f929b060beab31624a7715e3887b02 https://github.com/phpmyadmin/phpmyadmin/commit/763eae1463f929b060beab31624a... Author: Marc Delisle marc@infomarc.info Date: 2014-03-22 (Sat, 22 Mar 2014)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.1.10 release
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 7f82ab4bfa54c789611971797681a2479f62812d https://github.com/phpmyadmin/phpmyadmin/commit/7f82ab4bfa54c789611971797681... Author: Marc Delisle marc@infomarc.info Date: 2014-03-22 (Sat, 22 Mar 2014)
Changed paths: M ChangeLog M README M doc/conf.py M js/functions.js M js/makegrid.js M js/tbl_change.js M libraries/Advisor.class.php M libraries/Config.class.php M libraries/Header.class.php M libraries/common.inc.php M libraries/plugins/export/ExportPhparray.class.php M po/bg.po M po/ca.po M po/da.po M po/fr.po M po/ia.po M po/ko.po M po/nb.po M po/th.po M po/tr.po M test/classes/PMA_Advisor_test.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php
Log Message: ----------- Merge branch 'MAINT_4_1_10' into STABLE
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4c4f2e47bf10...7f82ab4bfa54