Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: d83a7a7a81e72088fe679f7ae79c936e4f8106f9 https://github.com/phpmyadmin/phpmyadmin/commit/d83a7a7a81e72088fe679f7ae79c... Author: Chan Je Park ejnahc@gmail.com Date: 2016-03-22 (Tue, 22 Mar 2016)
Changed paths: M po/ko.po
Log Message: ----------- Translated using Weblate (Korean)
Currently translated at 78.0% (2507 of 3211 strings)
[CI skip]
Commit: 4def458ad7dae92bd0357a482035809763922671 https://github.com/phpmyadmin/phpmyadmin/commit/4def458ad7dae92bd0357a482035... Author: Weblate noreply@weblate.org Date: 2016-03-22 (Tue, 22 Mar 2016)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: c9dd2e8a78f198107ec86dbd86cc6d259cbcc576 https://github.com/phpmyadmin/phpmyadmin/commit/c9dd2e8a78f198107ec86dbd86cc... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-03-17 (Thu, 17 Mar 2016)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php
Log Message: ----------- Prepare for 4.6.1-dev
Signed-off-by: Isaac Bennetch bennetch@gmail.com
Commit: 7a444c2f170641ce88c72d6087b03dd5aa0e3682 https://github.com/phpmyadmin/phpmyadmin/commit/7a444c2f170641ce88c72d6087b0... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-03-24 (Thu, 24 Mar 2016)
Changed paths: M ChangeLog M libraries/insert_edit.lib.php
Log Message: ----------- Fix #12120 PMA_Util not found in insert_edit.lib.php
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 155ad55e91e266e87a3e8ffa33c6dc9a4a060861 https://github.com/phpmyadmin/phpmyadmin/commit/155ad55e91e266e87a3e8ffa33c6... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-03-24 (Thu, 24 Mar 2016)
Changed paths: M po/si.po
Log Message: ----------- Translated using Weblate (Sinhala)
Currently translated at 60.6% (1947 of 3211 strings)
[CI skip]
Commit: 3c398261b75e5501b11238e0f1082cc234e8aeb5 https://github.com/phpmyadmin/phpmyadmin/commit/3c398261b75e5501b11238e0f108... Author: Weblate noreply@weblate.org Date: 2016-03-24 (Thu, 24 Mar 2016)
Changed paths: M ChangeLog M libraries/insert_edit.lib.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 5d755b194a965e7ff4388751cf1878e8868571b0 https://github.com/phpmyadmin/phpmyadmin/commit/5d755b194a965e7ff4388751cf18... Author: Michal Čihař michal@cihar.com Date: 2016-03-24 (Thu, 24 Mar 2016)
Changed paths: M ChangeLog M libraries/LanguageManager.php M libraries/display_select_lang.lib.php
Log Message: ----------- Fixed activation of some languages
We need to maintain mixed case language codes as well.
Fixes #12118
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 705b1aebd659a0219b42dc203194221fac5c42a0 https://github.com/phpmyadmin/phpmyadmin/commit/705b1aebd659a0219b42dc203194... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-03-24 (Thu, 24 Mar 2016)
Changed paths: M doc/glossary.rst M doc/setup.rst
Log Message: ----------- Fixup for missing glossary terms
Signed-off-by: Isaac Bennetch bennetch@gmail.com
Commit: 370620a868b5cb373abb250a9e7453c567dd4664 https://github.com/phpmyadmin/phpmyadmin/commit/370620a868b5cb373abb250a9e74... Author: Michal Čihař michal@cihar.com Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths: M doc/glossary.rst M doc/setup.rst
Log Message: ----------- Merge pull request #12127 from ibennetch/glossary
Fixup for missing glossary terms
Commit: 43a4a042ceb3e5ae50313e7a7250f0513ab97e79 https://github.com/phpmyadmin/phpmyadmin/commit/43a4a042ceb3e5ae50313e7a7250... Author: Michal Čihař michal@cihar.com Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths: M ChangeLog M normalization.php
Log Message: ----------- Fixed error in 3NF step of normalization
Fixes #12121
Signed-off-by: Michal Čihař michal@cihar.com
Commit: a6e9314cf37bce6a4683e13dcac14698de4ff21e https://github.com/phpmyadmin/phpmyadmin/commit/a6e9314cf37bce6a4683e13dcac1... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-03-27 (Sun, 27 Mar 2016)
Changed paths: M ChangeLog M libraries/TypesMySQL.php
Log Message: ----------- Fix offering JSON datatype in incompatible MySQL versions
Fixes #12135
Signed-off-by: Isaac Bennetch bennetch@gmail.com
Commit: f4907d78578289083247a2334bef1ebc2349fd67 https://github.com/phpmyadmin/phpmyadmin/commit/f4907d78578289083247a2334bef... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-03-28 (Mon, 28 Mar 2016)
Changed paths: M ChangeLog M libraries/TypesMySQL.php
Log Message: ----------- Merge pull request #12136 from ibennetch/json
Fix offering JSON datatype in incompatible MySQL versions
Commit: 61dbcafa5663e6f7b5ceed8452fafd6e9a0fc5da https://github.com/phpmyadmin/phpmyadmin/commit/61dbcafa5663e6f7b5ceed8452fa... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-03-28 (Mon, 28 Mar 2016)
Changed paths: M libraries/TypesMySQL.php
Log Message: ----------- JSON data type is not supported in MariaDB
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: f4541c8da67f8ac0e937778babe0fdcd0722b324 https://github.com/phpmyadmin/phpmyadmin/commit/f4541c8da67f8ac0e937778babe0... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-03-28 (Mon, 28 Mar 2016)
Changed paths: M ChangeLog M libraries/dbi/DBIMysqli.php
Log Message: ----------- Fix #12132 Can not open table with JSON field
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 3c139e5899a91dd44526761161b8c6f6c8d529bb https://github.com/phpmyadmin/phpmyadmin/commit/3c139e5899a91dd44526761161b8... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-03-29 (Tue, 29 Mar 2016)
Changed paths: M ChangeLog M libraries/dbi/DBIMysqli.php
Log Message: ----------- Merge pull request #12141 from madhuracj/issue12132
Fix #12132 Can not open table with JSON field
Commit: cb91d94705c36e90530835d725a58d1ba565ed6d https://github.com/phpmyadmin/phpmyadmin/commit/cb91d94705c36e90530835d725a5... Author: Ricardo Crivelli ricardocrivelli@gmail.com Date: 2016-03-29 (Tue, 29 Mar 2016)
Changed paths: M po/pt_BR.po
Log Message: ----------- Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.3% (2964 of 3211 strings)
[CI skip]
Commit: a1dd261603cf6f510098bb0b75a22aba54dbdf0c https://github.com/phpmyadmin/phpmyadmin/commit/a1dd261603cf6f510098bb0b75a2... Author: Weblate noreply@weblate.org Date: 2016-03-29 (Tue, 29 Mar 2016)
Changed paths: M ChangeLog M libraries/dbi/DBIMysqli.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 413f66f4c2fff81ee58bd375c9e970a56e9c4a96 https://github.com/phpmyadmin/phpmyadmin/commit/413f66f4c2fff81ee58bd375c9e9... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-03-31 (Thu, 31 Mar 2016)
Changed paths: M ChangeLog M js/sql.js
Log Message: ----------- Fix #12125 Cannot highlight a column if I scroll down from the top of the table
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 6d7acf969a1ef98f37701be1935fb015b1bb39ba https://github.com/phpmyadmin/phpmyadmin/commit/6d7acf969a1ef98f37701be1935f... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-03-31 (Thu, 31 Mar 2016)
Changed paths: M ChangeLog M libraries/dbi/DBIMysqli.php M po/pt_BR.po
Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6
Conflicts: ChangeLog
Commit: e0a340f107993920d9c83949ff3c99fd1608f437 https://github.com/phpmyadmin/phpmyadmin/commit/e0a340f107993920d9c83949ff3c... Author: Krisztián Patai pataikrisztian@gmail.com Date: 2016-03-31 (Thu, 31 Mar 2016)
Changed paths: M po/hu.po
Log Message: ----------- Translated using Weblate (Hungarian)
Currently translated at 95.1% (3056 of 3212 strings)
[CI skip]
Commit: 863d2fb4c397b80f345f127bf68b656cc0205c1e https://github.com/phpmyadmin/phpmyadmin/commit/863d2fb4c397b80f345f127bf68b... Author: Eshin Kunishima ek@esh.ink Date: 2016-03-31 (Thu, 31 Mar 2016)
Changed paths: M po/ja.po
Log Message: ----------- Translated using Weblate (Japanese)
Currently translated at 67.6% (2173 of 3211 strings)
[CI skip]
Commit: 33e32daf17441473b7d17d281b98d973c3ef4bda https://github.com/phpmyadmin/phpmyadmin/commit/33e32daf17441473b7d17d281b98... Author: Weblate noreply@weblate.org Date: 2016-03-31 (Thu, 31 Mar 2016)
Changed paths: M ChangeLog M js/sql.js
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: a65a4213d7ab94172d0b2d23d0b1c43295ad1d2a https://github.com/phpmyadmin/phpmyadmin/commit/a65a4213d7ab94172d0b2d23d0b1... Author: Michal Čihař michal@cihar.com Date: 2016-04-05 (Tue, 05 Apr 2016)
Changed paths: M ChangeLog M libraries/common.inc.php
Log Message: ----------- Load gettext before autoloader
This fixes possible PHP error in SQL parser as it tries to define __() if it's not existing. Later loading of gettext just breaks this.
Fixes #12154
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 810a5cb9fc15f8169d565450d20c35ac6427400d https://github.com/phpmyadmin/phpmyadmin/commit/810a5cb9fc15f8169d565450d20c... Author: Anders Jonsson anders.jonsson@norsjovallen.se Date: 2016-04-05 (Tue, 05 Apr 2016)
Changed paths: M po/sv.po
Log Message: ----------- Translated using Weblate (Swedish)
Currently translated at 97.8% (3142 of 3211 strings)
[CI skip]
Commit: a83a1092df1e62f9054b3b37fb70d8cceb33b15c https://github.com/phpmyadmin/phpmyadmin/commit/a83a1092df1e62f9054b3b37fb70... Author: Murodjon Abduvohidov maueraa@mail.ru Date: 2016-04-05 (Tue, 05 Apr 2016)
Changed paths: M po/uz.po
Log Message: ----------- Translated using Weblate (Uzbek)
Currently translated at 33.2% (1067 of 3211 strings)
[CI skip]
Commit: d2a669b832b74ca8008bb35c938ba8b7fbcf50c7 https://github.com/phpmyadmin/phpmyadmin/commit/d2a669b832b74ca8008bb35c938b... Author: Weblate noreply@weblate.org Date: 2016-04-05 (Tue, 05 Apr 2016)
Changed paths: M ChangeLog M libraries/common.inc.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 66c0fbd6319e639b0ae752e2d0d292773c00bc7b https://github.com/phpmyadmin/phpmyadmin/commit/66c0fbd6319e639b0ae752e2d0d2... Author: Michal Čihař michal@cihar.com Date: 2016-04-05 (Tue, 05 Apr 2016)
Changed paths: M libraries/dbi/DBIMysqli.php
Log Message: ----------- Simplify SSL setup
Simplify setup to follow current PHP documentation:
- the MYSQLI_CLIENT_SSL flag should not be needed - there is mysqli_option flag to turn of certificate verification - remove check for defined constants, all should be there in PHP versions we support
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 1580d2fa4d1d8917c004e0b8a7e866e5ff5383eb https://github.com/phpmyadmin/phpmyadmin/commit/1580d2fa4d1d8917c004e0b8a7e8... Author: Michal Čihař michal@cihar.com Date: 2016-04-05 (Tue, 05 Apr 2016)
Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.php
Log Message: ----------- Fixed SQL quoting in SQL export
The fix for 4.5 branch was wrongly merged here.
Fixes #12029
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 51b5a236c736a827acad4daf4d23a591978d6e68 https://github.com/phpmyadmin/phpmyadmin/commit/51b5a236c736a827acad4daf4d23... Author: Michal Čihař michal@cihar.com Date: 2016-04-06 (Wed, 06 Apr 2016)
Changed paths: M libraries/php-gettext/gettext.inc
Log Message: ----------- Fix check for not set domain
Fixes #12154
Signed-off-by: Michal Čihař michal@cihar.com
Commit: f58349481d0f7ae3793db4e0ebf83774ce1026c5 https://github.com/phpmyadmin/phpmyadmin/commit/f58349481d0f7ae3793db4e0ebf8... Author: Michal Čihař michal@cihar.com Date: 2016-04-06 (Wed, 06 Apr 2016)
Changed paths: M libraries/common.inc.php
Log Message: ----------- Avoid destroying already initalized gettext variables
Signed-off-by: Michal Čihař michal@cihar.com
Commit: ec984877d827c72c614100c5fc4574c61fbd0b28 https://github.com/phpmyadmin/phpmyadmin/commit/ec984877d827c72c614100c5fc45... Author: Michal Čihař michal@cihar.com Date: 2016-04-06 (Wed, 06 Apr 2016)
Changed paths: M ChangeLog M db_structure.php M libraries/controllers/database/DatabaseStructureController.php
Log Message: ----------- Improve performance of database structure page
There is no need to get full list of tables twice, it's enough to do it in the controller itself.
Fixes #12129
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e009217f433edcb4eca93586a8db15cc4c282bf2 https://github.com/phpmyadmin/phpmyadmin/commit/e009217f433edcb4eca93586a8db... Author: Michal Čihař michal@cihar.com Date: 2016-04-06 (Wed, 06 Apr 2016)
Changed paths: M libraries/controllers/database/DatabaseStructureController.php
Log Message: ----------- Fix check for system schema
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 96a2e3e35adcbd3157b3c7e278c36afc56463f20 https://github.com/phpmyadmin/phpmyadmin/commit/96a2e3e35adcbd3157b3c7e278c3... Author: Michal Čihař michal@cihar.com Date: 2016-04-06 (Wed, 06 Apr 2016)
Changed paths: M libraries/controllers/database/DatabaseStructureController.php
Log Message: ----------- Avoid using globals for things we have as class attribute
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 73278068a975c40442ee5192a44a4a578b05b764 https://github.com/phpmyadmin/phpmyadmin/commit/73278068a975c40442ee5192a44a... Author: Michal Čihař michal@cihar.com Date: 2016-04-06 (Wed, 06 Apr 2016)
Changed paths: M test/classes/controllers/DatabaseStructureControllerTest.php
Log Message: ----------- Adjust tests to simplified DatabaseStructureController
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 7413208ce723d7d1c315a70b8789de91b0c202f8 https://github.com/phpmyadmin/phpmyadmin/commit/7413208ce723d7d1c315a70b8789... Author: Michal Čihař michal@cihar.com Date: 2016-04-06 (Wed, 06 Apr 2016)
Changed paths: M libraries/dbi/DBIMysqli.php
Log Message: ----------- Merge pull request #12157 from nijel/ssl
Simplify SSL setup
Commit: 7de636d8260da7552d6b1609cfa15711589a148b https://github.com/phpmyadmin/phpmyadmin/commit/7de636d8260da7552d6b1609cfa1... Author: Michal Čihař michal@cihar.com Date: 2016-04-06 (Wed, 06 Apr 2016)
Changed paths: M ChangeLog M libraries/plugin_interface.lib.php
Log Message: ----------- Fix PHP error if user did unpack new version over old one
By doing stricter check on filename, we avoid old classes which break autoloader.
Fixes #12159
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 659c89e46451c44e2d5d663f060f4a0179449c40 https://github.com/phpmyadmin/phpmyadmin/commit/659c89e46451c44e2d5d663f060f... Author: Michal Čihař michal@cihar.com Date: 2016-04-06 (Wed, 06 Apr 2016)
Changed paths: M ChangeLog M libraries/sql-parser/src/Components/Expression.php
Log Message: ----------- Update SQL Parser to 8de4749d803858859fcf7a39b1bbf058745920f0
See #12165
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 0db84175b3adea9a20b74cf5c8823669cad24fec https://github.com/phpmyadmin/phpmyadmin/commit/0db84175b3adea9a20b74cf5c882... Author: Michal Čihař michal@cihar.com Date: 2016-04-06 (Wed, 06 Apr 2016)
Changed paths: M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php
Log Message: ----------- Update SQL parser to 95118e6db10c642a1d518e666c2aaed1b4991492
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 16dc45bb9db69ec26ecff9114e48f29ebcb3844b https://github.com/phpmyadmin/phpmyadmin/commit/16dc45bb9db69ec26ecff9114e48... Author: Michal Čihař michal@cihar.com Date: 2016-04-06 (Wed, 06 Apr 2016)
Changed paths: M doc/setup.rst
Log Message: ----------- Make warning a bit stronger
Obviously users are doing this for ages and are surprised that the old script doesn't work with new code.
Issue #12159
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 5e965bedf3e4207a267777b0f230e91ae111f4c4 https://github.com/phpmyadmin/phpmyadmin/commit/5e965bedf3e4207a267777b0f230... Author: Michal Čihař michal@cihar.com Date: 2016-04-06 (Wed, 06 Apr 2016)
Changed paths: M doc/setup.rst
Log Message: ----------- Make upgrade warning a bit more descriptive
Issue #12164
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 141c455d8fe1d4dd3f6feafc6c37f5d98fddcc4a https://github.com/phpmyadmin/phpmyadmin/commit/141c455d8fe1d4dd3f6feafc6c37... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-04-07 (Thu, 07 Apr 2016)
Changed paths: M doc/setup.rst
Log Message: ----------- Minor grammar fix
Signed-off-by: Isaac Bennetch bennetch@gmail.com
Commit: 5ad6f3825dd40e47509436991efb4a77fea87c14 https://github.com/phpmyadmin/phpmyadmin/commit/5ad6f3825dd40e47509436991efb... Author: Burak Yavuz hitowerdigit@hotmail.com Date: 2016-04-11 (Mon, 11 Apr 2016)
Changed paths: M po/tr.po
Log Message: ----------- Translated using Weblate (Turkish)
Currently translated at 100.0% (3211 of 3211 strings)
[CI skip]
Commit: 45395a6eee0d7ad779e49a777ca391e77ecb4b67 https://github.com/phpmyadmin/phpmyadmin/commit/45395a6eee0d7ad779e49a777ca3... Author: Ming Tsay mt@moztw.org Date: 2016-04-12 (Tue, 12 Apr 2016)
Changed paths: M po/zh_TW.po
Log Message: ----------- Translated using Weblate (Chinese (Taiwan))
Currently translated at 98.1% (3153 of 3211 strings)
[CI skip]
Commit: 3a981d165a7c0417dbe7356a82d5389bdad16835 https://github.com/phpmyadmin/phpmyadmin/commit/3a981d165a7c0417dbe7356a82d5... Author: Michal Čihař michal@cihar.com Date: 2016-04-13 (Wed, 13 Apr 2016)
Changed paths: M libraries/Table.class.php
Log Message: ----------- Remove debugging code
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e234747f67069c4b6a0308dd256b3f84ebe2f026 https://github.com/phpmyadmin/phpmyadmin/commit/e234747f67069c4b6a0308dd256b... Author: Michal Čihař michal@cihar.com Date: 2016-04-13 (Wed, 13 Apr 2016)
Log Message: ----------- Merge branch 'QA_4_5' into QA_4_6
Commit: 9ff296f841ef45d5035c4df983d80639a15cd340 https://github.com/phpmyadmin/phpmyadmin/commit/9ff296f841ef45d5035c4df983d8... Author: Michal Čihař michal@cihar.com Date: 2016-04-13 (Wed, 13 Apr 2016)
Changed paths: M libraries/import.lib.php
Log Message: ----------- Remove debugging code
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 0e084c3486af54a0c4061fae1077a5876e5a254a https://github.com/phpmyadmin/phpmyadmin/commit/0e084c3486af54a0c4061fae1077... Author: Giovanni Sora g.sora@tiscali.it Date: 2016-04-13 (Wed, 13 Apr 2016)
Changed paths: M po/ia.po
Log Message: ----------- Translated using Weblate (Interlingua)
Currently translated at 73.5% (2364 of 3213 strings)
[CI skip]
Commit: 17690918481b8f34f056558f5adaa4bc75644b3f https://github.com/phpmyadmin/phpmyadmin/commit/17690918481b8f34f056558f5ada... Author: Stefano Martinelli stefano.ste.martinelli@gmail.com Date: 2016-04-13 (Wed, 13 Apr 2016)
Changed paths: M po/it.po
Log Message: ----------- Translated using Weblate (Italian)
Currently translated at 100.0% (3211 of 3211 strings)
[CI skip]
Commit: 5b1759ff6884614c545b26b319c5cf362d392a95 https://github.com/phpmyadmin/phpmyadmin/commit/5b1759ff6884614c545b26b319c5... Author: Weblate noreply@weblate.org Date: 2016-04-13 (Wed, 13 Apr 2016)
Changed paths: M libraries/import.lib.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: ac0ff3ab2081d02f5c82dfad0a710df7f1cef438 https://github.com/phpmyadmin/phpmyadmin/commit/ac0ff3ab2081d02f5c82dfad0a71... Author: Burak Yavuz hitowerdigit@hotmail.com Date: 2016-04-15 (Fri, 15 Apr 2016)
Changed paths: M po/tr.po
Log Message: ----------- Translated using Weblate (Turkish)
Currently translated at 100.0% (3211 of 3211 strings)
[CI skip]
Commit: 23d507af54a074d42323ab35d9adaea13537da6d https://github.com/phpmyadmin/phpmyadmin/commit/23d507af54a074d42323ab35d9ad... Author: Guilherme guilherme@rigon.info Date: 2016-04-15 (Fri, 15 Apr 2016)
Changed paths: M po/pt_BR.po
Log Message: ----------- Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.4% (2967 of 3211 strings)
[CI skip]
Commit: 5480e57c4d9070658f4f17fabedbba922982927a https://github.com/phpmyadmin/phpmyadmin/commit/5480e57c4d9070658f4f17fabedb... Author: Petr Kadlec mormegil@centrum.cz Date: 2016-04-16 (Sat, 16 Apr 2016)
Changed paths: M po/cs.po
Log Message: ----------- Translated using Weblate (Czech)
Currently translated at 94.4% (3033 of 3211 strings)
[CI skip]
Commit: 1867c094d731a2b3675f740d971c16514a0453e5 https://github.com/phpmyadmin/phpmyadmin/commit/1867c094d731a2b3675f740d971c... Author: Szász Attila undernetangel@gmail.com Date: 2016-04-17 (Sun, 17 Apr 2016)
Changed paths: M po/hu.po
Log Message: ----------- Translated using Weblate (Hungarian)
Currently translated at 95.9% (3081 of 3212 strings)
[CI skip]
Commit: fdec3afe1b4ce4c41fa565ab819209ed5a0391c3 https://github.com/phpmyadmin/phpmyadmin/commit/fdec3afe1b4ce4c41fa565ab8192... Author: Michal Čihař michal@cihar.com Date: 2016-04-18 (Mon, 18 Apr 2016)
Changed paths: M libraries/dbi/DBIMysqli.php
Log Message: ----------- Fix disabling SSL client verification
Issue #12146
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 1132c66eb8d14fabf99fbd95803896ea59676b64 https://github.com/phpmyadmin/phpmyadmin/commit/1132c66eb8d14fabf99fbd958038... Author: Rogerio Marques rogerio@algoincomum.com.br Date: 2016-04-18 (Mon, 18 Apr 2016)
Changed paths: M po/pt_BR.po
Log Message: ----------- Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.4% (2970 of 3211 strings)
[CI skip]
Commit: 65052df07f49218a1edb38dbb61979fe70e934bc https://github.com/phpmyadmin/phpmyadmin/commit/65052df07f49218a1edb38dbb619... Author: Weblate noreply@weblate.org Date: 2016-04-18 (Mon, 18 Apr 2016)
Changed paths: M libraries/dbi/DBIMysqli.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 8a764f1a6edb6400f0cbb85814875313e86bad24 https://github.com/phpmyadmin/phpmyadmin/commit/8a764f1a6edb6400f0cbb8581487... Author: Michal Čihař michal@cihar.com Date: 2016-04-18 (Mon, 18 Apr 2016)
Changed paths: M libraries/dbi/DBIMysqli.php
Log Message: ----------- Do not hide errors from our code
This should not emit any PHP warnings at all.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: b204a2daa5591307e343f2285220397e8c225d40 https://github.com/phpmyadmin/phpmyadmin/commit/b204a2daa5591307e343f2285220... Author: Michal Čihař michal@cihar.com Date: 2016-04-18 (Mon, 18 Apr 2016)
Changed paths: M po/pt_BR.po
Log Message: ----------- Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.4% (2970 of 3211 strings)
[CI skip]
Commit: fa1d452e03a7522fbcf37b9649bd5b7421367c4c https://github.com/phpmyadmin/phpmyadmin/commit/fa1d452e03a7522fbcf37b9649bd... Author: Michal Čihař michal@cihar.com Date: 2016-04-18 (Mon, 18 Apr 2016)
Changed paths: M libraries/dbi/DBIMysqli.php
Log Message: ----------- Do not hide errors from database connection attempts
Without these errors it's impossible to figure out what went wrong in the SSL negotiation. All you get is error 2002 without any means to diagnose and all important information is issued as PHP warnings.
Issue #12146
Signed-off-by: Michal Čihař michal@cihar.com
Commit: ea428dc86002261bff653067cbf28dd6da895144 https://github.com/phpmyadmin/phpmyadmin/commit/ea428dc86002261bff653067cbf2... Author: Michal Čihař michal@cihar.com Date: 2016-04-18 (Mon, 18 Apr 2016)
Changed paths: M test/classes/ErrorHandlerTest.php
Log Message: ----------- Make ErrorHandler test more complete
Actually test handling of stored errors.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 951f1fed5f2123ad7e10f8d2b0779d5ec7cb8a74 https://github.com/phpmyadmin/phpmyadmin/commit/951f1fed5f2123ad7e10f8d2b077... Author: Michal Čihař michal@cihar.com Date: 2016-04-18 (Mon, 18 Apr 2016)
Changed paths: M libraries/ErrorHandler.php M test/classes/ErrorHandlerTest.php
Log Message: ----------- Add method to slice errors from the handler
This can be useful to pop n-last errors.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: cfbc31bfa62ea3841f766146adc06fecdfd38f4b https://github.com/phpmyadmin/phpmyadmin/commit/cfbc31bfa62ea3841f766146adc0... Author: Michal Čihař michal@cihar.com Date: 2016-04-18 (Mon, 18 Apr 2016)
Changed paths: M libraries/DatabaseInterface.php
Log Message: ----------- Better reporting of connection errors
We really do not care about traceback or parameters in this case, all we need is to display the message coming from PHP.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 9e2ae0c6acf369ad9dfd8eea8ca32fc849ad1e37 https://github.com/phpmyadmin/phpmyadmin/commit/9e2ae0c6acf369ad9dfd8eea8ca3... Author: Michal Čihař michal@cihar.com Date: 2016-04-18 (Mon, 18 Apr 2016)
Changed paths: M libraries/DatabaseInterface.php M libraries/ErrorHandler.php M libraries/dbi/DBIMysqli.php M test/classes/ErrorHandlerTest.php
Log Message: ----------- Merge pull request #12193 from nijel/connect-error
Do not hide errors from database connection attempts
Commit: 4e0ca4601de48412b93cad230957ee4b5a94c3ba https://github.com/phpmyadmin/phpmyadmin/commit/4e0ca4601de48412b93cad230957... Author: Michal Čihař michal@cihar.com Date: 2016-04-18 (Mon, 18 Apr 2016)
Changed paths: M ChangeLog M doc/config.rst
Log Message: ----------- Document setup with Google Cloud SQL
Document what needs to be done to connect to Google Cloud SQL.
Fixes #12146
Signed-off-by: Michal Čihař michal@cihar.com
Commit: b4267b2fac7d1ae650fda8eb43a5e18136437bb9 https://github.com/phpmyadmin/phpmyadmin/commit/b4267b2fac7d1ae650fda8eb43a5... Author: Michal Čihař michal@cihar.com Date: 2016-04-18 (Mon, 18 Apr 2016)
Changed paths: M doc/config.rst
Log Message: ----------- Add backlinks to configuration options
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 72c832cf59e7da81a2eca9693bb59bb8b139a5d2 https://github.com/phpmyadmin/phpmyadmin/commit/72c832cf59e7da81a2eca9693bb5... Author: Michal Čihař michal@cihar.com Date: 2016-04-19 (Tue, 19 Apr 2016)
Changed paths: M ChangeLog M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Utils/BufferedQuery.php M libraries/sql-parser/src/Utils/Formatter.php
Log Message: ----------- Update SQL parser to 3.4.3
Revision 84c8ba677d4f27b2a02c9e1bae5e9d0356575338
Fixes #12197
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 425a12eff9b95607efba368398e841abbc73c33c https://github.com/phpmyadmin/phpmyadmin/commit/425a12eff9b95607efba368398e8... Author: Liška nicefox1@gmail.com Date: 2016-04-19 (Tue, 19 Apr 2016)
Changed paths: M po/cs.po
Log Message: ----------- Translated using Weblate (Czech)
Currently translated at 94.4% (3034 of 3211 strings)
[CI skip]
Commit: 0f2897ac801f79ecdc8cba406376e0623434156e https://github.com/phpmyadmin/phpmyadmin/commit/0f2897ac801f79ecdc8cba406376... Author: bladerunn3r tkrzywonos@gmail.com Date: 2016-04-19 (Tue, 19 Apr 2016)
Changed paths: M po/pl.po
Log Message: ----------- Translated using Weblate (Polish)
Currently translated at 82.6% (2655 of 3211 strings)
[CI skip]
Commit: 3794b829e3137dc91c719ecab7881ffd9bc52e0c https://github.com/phpmyadmin/phpmyadmin/commit/3794b829e3137dc91c719ecab788... Author: Weblate noreply@weblate.org Date: 2016-04-19 (Tue, 19 Apr 2016)
Changed paths: M ChangeLog M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Utils/BufferedQuery.php M libraries/sql-parser/src/Utils/Formatter.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 8b29917eca5778b61dff701a6082060c83d3e6c5 https://github.com/phpmyadmin/phpmyadmin/commit/8b29917eca5778b61dff701a6082... Author: Michal Čihař michal@cihar.com Date: 2016-04-19 (Tue, 19 Apr 2016)
Changed paths: M .scrutinizer.yml R PMAStandard/Sniffs/Commenting/ClassCommentSniff.php R PMAStandard/Sniffs/Commenting/FileCommentSniff.php R PMAStandard/Sniffs/Commenting/FunctionCommentSniff.php R PMAStandard/Sniffs/Files/SpacesAroundConcatSniff.php R PMAStandard/ruleset.xml M build.xml M composer.json M phpunit.xml.dist
Log Message: ----------- Use coding standard from phpmyadmin/coding-standard
It is way cleaner to have the coding standard separte and use it when checking.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 04b5ae45ec6fecb89f774da2f65f6d153948323c https://github.com/phpmyadmin/phpmyadmin/commit/04b5ae45ec6fecb89f774da2f65f... Author: Michal Čihař michal@cihar.com Date: 2016-04-19 (Tue, 19 Apr 2016)
Changed paths: M composer.json
Log Message: ----------- Move coding standard to dev requires
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 999db1491c86bd669b1a8aad1c630159b577551b https://github.com/phpmyadmin/phpmyadmin/commit/999db1491c86bd669b1a8aad1c63... Author: Michal Čihař michal@cihar.com Date: 2016-04-20 (Wed, 20 Apr 2016)
Changed paths: M ChangeLog M libraries/Config.php
Log Message: ----------- Fixed setting of language from user configuration
Fixes #12202
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e0724d2660eedb35302d61466cb726182c7fcaf4 https://github.com/phpmyadmin/phpmyadmin/commit/e0724d2660eedb35302d61466cb7... Author: Michal Čihař michal@cihar.com Date: 2016-04-20 (Wed, 20 Apr 2016)
Changed paths: M ChangeLog M libraries/Util.php M libraries/dbi/DBIDummy.php M test/classes/UtilTest.php
Log Message: ----------- Fixed check for ndb version
Fixes #12200
Signed-off-by: Michal Čihař michal@cihar.com
Commit: f329a38639df7c23d7834516e4830d1c52d87e45 https://github.com/phpmyadmin/phpmyadmin/commit/f329a38639df7c23d7834516e483... Author: Michal Čihař michal@cihar.com Date: 2016-04-20 (Wed, 20 Apr 2016)
Changed paths: M test/classes/UtilTest.php
Log Message: ----------- Add missing variable
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 9ba7d44c1899b57a6ffbb5bc20979d90a023d18d https://github.com/phpmyadmin/phpmyadmin/commit/9ba7d44c1899b57a6ffbb5bc2097... Author: Michal Čihař michal@cihar.com Date: 2016-04-21 (Thu, 21 Apr 2016)
Changed paths: M ChangeLog M setup/config.php
Log Message: ----------- Fixed loading of configuration file
If the loaded configuration is same as the one used, include_once will not load it.
Fixes #12206
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 7e19be3a1082c3c603ae52d0ecb74a97fc9bcf2c https://github.com/phpmyadmin/phpmyadmin/commit/7e19be3a1082c3c603ae52d0ecb7... Author: Michal Čihař michal@cihar.com Date: 2016-04-21 (Thu, 21 Apr 2016)
Changed paths: M ChangeLog M libraries/Util.php M libraries/session.inc.php
Log Message: ----------- Check if sessions are working and report failures
- Always check for session_start erorrs and report them, this catches completely broken session storage or no free inodes for files - Check whether session can be written, this catches the full disk case
Fixes #12204
Signed-off-by: Michal Čihař michal@cihar.com
Commit: b12b1ae08a64cccc85313ff4dce7fe3d56ed4b5d https://github.com/phpmyadmin/phpmyadmin/commit/b12b1ae08a64cccc85313ff4dce7... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-04-24 (Sun, 24 Apr 2016)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- ORDER BY clause should include Select subexpressions' names
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 26da637ab4d325e3e706552c37a52c963761299b https://github.com/phpmyadmin/phpmyadmin/commit/26da637ab4d325e3e706552c37a5... Author: Deven Bansod devenbansod@users.noreply.github.com Date: 2016-04-25 (Mon, 25 Apr 2016)
Changed paths: M libraries/server_privileges.lib.php
Log Message: ----------- Merge pull request #12213 from devenbansod/fix_#12211
ORDER BY clause should include Select subexpressions' names
Commit: 6d02018dc156abd17b1e778d9459c632a399618d https://github.com/phpmyadmin/phpmyadmin/commit/6d02018dc156abd17b1e778d9459... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-04-25 (Mon, 25 Apr 2016)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entry for #12211
Fixed #12211 in b12b1ae
Signed-off-by: Deven Bansod devenbansod.bits@gmail.com
Commit: 53a51b953c7813204f70c2bed8d91daa26151e0a https://github.com/phpmyadmin/phpmyadmin/commit/53a51b953c7813204f70c2bed8d9... Author: Michal Čihař michal@cihar.com Date: 2016-04-25 (Mon, 25 Apr 2016)
Changed paths: M doc/config.rst
Log Message: ----------- Document when ssl_verify was added
Issue #12146
Signed-off-by: Michal Čihař michal@cihar.com
Commit: fc8486094c94df2250993d9b90887f36990661f4 https://github.com/phpmyadmin/phpmyadmin/commit/fc8486094c94df2250993d9b9088... Author: Michal Čihař michal@cihar.com Date: 2016-04-26 (Tue, 26 Apr 2016)
Changed paths: M ChangeLog M js/config.js
Log Message: ----------- Fixed config tab persistence errors
The URL hash can get appended php session ID breaking the hash lookup.
Fixes #12215
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 71078d61ad001deb219c7c846d146c902629abbd https://github.com/phpmyadmin/phpmyadmin/commit/71078d61ad001deb219c7c846d14... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-04-26 (Tue, 26 Apr 2016)
Changed paths: M doc/faq.rst
Log Message: ----------- Add FAQ on preventing path disclosure
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 6fdb046f9b9d893e267483ec5e6d8a973685b986 https://github.com/phpmyadmin/phpmyadmin/commit/6fdb046f9b9d893e267483ec5e6d... Author: Michal Čihař michal@cihar.com Date: 2016-04-26 (Tue, 26 Apr 2016)
Changed paths: M ChangeLog M js/functions.js M libraries/replication_gui.lib.php M libraries/server_privileges.lib.php
Log Message: ----------- Move javascript code for password to functions.js
- This allows to share the code - Also fixed bad references to fields
Fixes #12217
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 0cd7caee7149d8c1945664c0b165b6441885b2d9 https://github.com/phpmyadmin/phpmyadmin/commit/0cd7caee7149d8c1945664c0b165... Author: Michal Čihař michal@cihar.com Date: 2016-04-26 (Tue, 26 Apr 2016)
Changed paths: M js/functions.js M libraries/replication_gui.lib.php M libraries/server_privileges.lib.php
Log Message: ----------- Share js code for username input and fix it
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 54b38e29990a0a9fde9de28cd826a8e981bbd9dd https://github.com/phpmyadmin/phpmyadmin/commit/54b38e29990a0a9fde9de28cd826... Author: Michal Čihař michal@cihar.com Date: 2016-04-26 (Tue, 26 Apr 2016)
Changed paths: M js/functions.js M libraries/replication_gui.lib.php M libraries/server_privileges.lib.php
Log Message: ----------- Share js code for hostname input and fix it
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 586e238f01c7cb4eccf064bb5de3347c8c97bd14 https://github.com/phpmyadmin/phpmyadmin/commit/586e238f01c7cb4eccf064bb5de3... Author: Michal Čihař michal@cihar.com Date: 2016-04-26 (Tue, 26 Apr 2016)
Changed paths: M ChangeLog M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Parser.php
Log Message: ----------- Update SQL parser to 3.4.4
Revision 1ec169a2a76110bbd0734da23a43c4d23c1eecfb
Fixes #12144 Fixes #12205
Signed-off-by: Michal Čihař michal@cihar.com
Commit: df08b53e433d5302ff38ebcefc91d80ba4b7910b https://github.com/phpmyadmin/phpmyadmin/commit/df08b53e433d5302ff38ebcefc91... Author: Michal Čihař michal@cihar.com Date: 2016-04-26 (Tue, 26 Apr 2016)
Changed paths: M ChangeLog M libraries/controllers/table/TableStructureController.php
Log Message: ----------- Fixed editing of VIEW structure
Fixes #12171
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 13814f1006bce325a525172b5899958283f5fc20 https://github.com/phpmyadmin/phpmyadmin/commit/13814f1006bce325a525172b5899... Author: Chien Wei Lin cwlin0416@gmail.com Date: 2016-04-28 (Thu, 28 Apr 2016)
Changed paths: M po/zh_TW.po
Log Message: ----------- Translated using Weblate (Chinese (Taiwan))
Currently translated at 100.0% (3211 of 3211 strings)
[CI skip]
Commit: 2e0ed0d7c7cff34a31465947f834deb580a3d8fc https://github.com/phpmyadmin/phpmyadmin/commit/2e0ed0d7c7cff34a31465947f834... Author: Michal Čihař michal@cihar.com Date: 2016-04-29 (Fri, 29 Apr 2016)
Changed paths: M ChangeLog
Log Message: ----------- Changelog entry for #12208
Commit: 5c5ba2d065dce0bc22cfd1bf9550e9a3ad67758b https://github.com/phpmyadmin/phpmyadmin/commit/5c5ba2d065dce0bc22cfd1bf9550... Author: Julien ITARD julienitard@gmail.com Date: 2016-04-29 (Fri, 29 Apr 2016)
Changed paths: M po/fr.po
Log Message: ----------- Translated using Weblate (French)
Currently translated at 99.9% (3209 of 3211 strings)
[CI skip]
Commit: 94ec333a35f534d258c178f3ed8cc9d8974a7b7a https://github.com/phpmyadmin/phpmyadmin/commit/94ec333a35f534d258c178f3ed8c... Author: Weblate noreply@weblate.org Date: 2016-04-29 (Fri, 29 Apr 2016)
Changed paths: M ChangeLog
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: d2dc9481d2af25b035778c67eaf0bfd2d2c59dd8 https://github.com/phpmyadmin/phpmyadmin/commit/d2dc9481d2af25b035778c67eaf0... Author: Michal Čihař michal@cihar.com Date: 2016-04-29 (Fri, 29 Apr 2016)
Changed paths: M libraries/error_report.lib.php
Log Message: ----------- Fix possible path existence disclossure
On non released versions (where line counts are not precalculated) it was possible to check for file existence due to limited checks for supplied path.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 8326aaebe54083d9726e153abdd303a141fe5ad3 https://github.com/phpmyadmin/phpmyadmin/commit/8326aaebe54083d9726e153abdd3... Author: Michal Čihař michal@cihar.com Date: 2016-04-29 (Fri, 29 Apr 2016)
Changed paths: M changelog.php M libraries/core.lib.php
Log Message: ----------- Pass links to external sites in changelog through url.php
This avoids possible information disclossure in the links (token).
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 59e56bd63a5e023b797d82eb272cd074e3b4bfd1 https://github.com/phpmyadmin/phpmyadmin/commit/59e56bd63a5e023b797d82eb272c... Author: Michal Čihař michal@cihar.com Date: 2016-04-29 (Fri, 29 Apr 2016)
Changed paths: M index.php M libraries/core.lib.php
Log Message: ----------- Pass link to demo server through url.php
Signed-off-by: Michal Čihař michal@cihar.com
Commit: bdb20d14997a0ee543d7824f2a2410ed6aa82e02 https://github.com/phpmyadmin/phpmyadmin/commit/bdb20d14997a0ee543d7824f2a24... Author: Michal Čihař michal@cihar.com Date: 2016-04-29 (Fri, 29 Apr 2016)
Changed paths: M index.php
Log Message: ----------- Remove link to wiki
It's outdated and will be soon completely disabled.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: b2f77691e915feb3aed02862f6d559a1f4645c85 https://github.com/phpmyadmin/phpmyadmin/commit/b2f77691e915feb3aed02862f6d5... Author: Michal Čihař michal@cihar.com Date: 2016-04-29 (Fri, 29 Apr 2016)
Changed paths: M changelog.php M index.php
Log Message: ----------- Use https links where applicable
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 07fd0bce678e83d5f81d7a683f1052fe45764d0c https://github.com/phpmyadmin/phpmyadmin/commit/07fd0bce678e83d5f81d7a683f10... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-05-02 (Mon, 02 May 2016)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php
Log Message: ----------- 4.6.1 release
Signed-off-by: Isaac Bennetch bennetch@gmail.com
Commit: 55b56001c492b14efa75b49dc7d76422922b9a15 https://github.com/phpmyadmin/phpmyadmin/commit/55b56001c492b14efa75b49dc7d7... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-05-02 (Mon, 02 May 2016)
Changed paths: M .scrutinizer.yml M ChangeLog R PMAStandard/Sniffs/Commenting/ClassCommentSniff.php R PMAStandard/Sniffs/Commenting/FileCommentSniff.php R PMAStandard/Sniffs/Commenting/FunctionCommentSniff.php R PMAStandard/Sniffs/Files/SpacesAroundConcatSniff.php R PMAStandard/ruleset.xml M README M build.xml M changelog.php M composer.json M db_structure.php M doc/conf.py M doc/config.rst M doc/faq.rst M doc/glossary.rst M doc/setup.rst M index.php M js/config.js M js/functions.js M js/sql.js M libraries/Config.php M libraries/DatabaseInterface.php M libraries/ErrorHandler.php M libraries/LanguageManager.php M libraries/TypesMySQL.php M libraries/Util.php M libraries/common.inc.php M libraries/controllers/database/DatabaseStructureController.php M libraries/controllers/table/TableStructureController.php M libraries/core.lib.php M libraries/dbi/DBIDummy.php M libraries/dbi/DBIMysqli.php M libraries/display_select_lang.lib.php M libraries/error_report.lib.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/php-gettext/gettext.inc M libraries/plugin_interface.lib.php M libraries/plugins/export/ExportSql.php M libraries/replication_gui.lib.php M libraries/server_privileges.lib.php M libraries/session.inc.php M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/CreateDefinition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Utils/BufferedQuery.php M libraries/sql-parser/src/Utils/Formatter.php M normalization.php M phpunit.xml.dist M po/cs.po M po/fr.po M po/hu.po M po/ia.po M po/it.po M po/ja.po M po/ko.po M po/pl.po M po/pt_BR.po M po/si.po M po/sv.po M po/tr.po M po/uz.po M po/zh_TW.po M setup/config.php M test/classes/ErrorHandlerTest.php M test/classes/UtilTest.php M test/classes/controllers/DatabaseStructureControllerTest.php
Log Message: ----------- Merge branch 'QA_4_6' into STABLE
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8ac5be8a9778...55b56001c492
-
Isaac Bennetch