Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: dc05a0e2a97f33b55787835f2ea26e90e0c5b04a
https://github.com/phpmyadmin/phpmyadmin/commit/dc05a0e2a97f33b55787835f2ea…
Author: Kristjan Räts <kristjanrats(a)gmail.com>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M po/et.po
Log Message:
-----------
Translated using Weblate (Estonian)
Currently translated at 100.0% (3211 of 3211 strings)
[CI skip]
Commit: e1081d143195b2b4cf04450beccf5cc1fda29e1c
https://github.com/phpmyadmin/phpmyadmin/commit/e1081d143195b2b4cf04450becc…
Author: Weblate <noreply(a)weblate.org>
Date: 2015-12-01 (Tue, 01 Dec 2015)
Changed paths:
M libraries/rte/rte_routines.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5
Commit: fcc89aa203bbbeb0586ba7bec4cd8ae436cdd1bf
https://github.com/phpmyadmin/phpmyadmin/commit/fcc89aa203bbbeb0586ba7bec4c…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-12-02 (Wed, 02 Dec 2015)
Changed paths:
M libraries/Table.class.php
M test/classes/PMA_Table_test.php
Log Message:
-----------
Fix - exclude db name in SQL when relations are made between table in the same db
To prevent replication from breaking when replicating to a db with different name
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: d33af6a721220abfb7d825a0d9120a1020863cdd
https://github.com/phpmyadmin/phpmyadmin/commit/d33af6a721220abfb7d825a0d91…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-12-02 (Wed, 02 Dec 2015)
Changed paths:
M po/et.po
Log Message:
-----------
Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5
Commit: 36ddd9c67033b81d762e94c5c704d95ddc1a5eea
https://github.com/phpmyadmin/phpmyadmin/commit/36ddd9c67033b81d762e94c5c70…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-12-02 (Wed, 02 Dec 2015)
Changed paths:
M libraries/Table.php
M test/classes/TableTest.php
Log Message:
-----------
Merge branch 'QA_4_5'
Conflicts:
libraries/Table.php
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/50325e58e8bc...36ddd9c67033
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 50325e58e8bc3676f1274690455ca8922b69f364
https://github.com/phpmyadmin/phpmyadmin/commit/50325e58e8bc3676f1274690455…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-12-02 (Wed, 02 Dec 2015)
Changed paths:
M test/libraries/PMA_FormDisplay_tpl_test.php
Log Message:
-----------
We cannot guarantee that this input will be included.
It is included only once and is controlled by a static variable.
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 26e96680f456df92d04d0ad0e04688d3cedcfa4e
https://github.com/phpmyadmin/phpmyadmin/commit/26e96680f456df92d04d0ad0e04…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-12-02 (Wed, 02 Dec 2015)
Changed paths:
M test/classes/config/PageSettingsTest.php
M test/classes/controllers/ServerDatabasesControllerTest.php
M test/classes/controllers/ServerVariablesControllerTest.php
Log Message:
-----------
Fix some test failures
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 34b03a3494dddf942a70c5292154aa58a5ea08b3
https://github.com/phpmyadmin/phpmyadmin/commit/34b03a3494dddf942a70c529215…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-12-02 (Wed, 02 Dec 2015)
Changed paths:
M .travis.yml
M ChangeLog
M composer.json
M index.php
M libraries/dbi/DBIDummy.php
M libraries/plugins/auth/AuthenticationHttp.php
M libraries/properties/options/OptionsPropertyOneItem.php
M libraries/properties/options/groups/OptionsPropertySubgroup.php
M phpunit.xml.dist
M phpunit.xml.hhvm
M phpunit.xml.nocoverage
M test/classes/PMA_StringTest.php
M test/classes/UtilTest.php
M test/classes/controllers/ServerDatabasesControllerTest.php
M test/classes/controllers/TableStructureControllerTest.php
M test/classes/gis/GISLinestringTest.php
M test/classes/gis/GISMultilinestringTest.php
M test/classes/gis/GISMultipointTest.php
M test/classes/gis/GISMultipolygonTest.php
M test/classes/gis/GISPointTest.php
M test/classes/gis/GISPolygonTest.php
M test/classes/navigation/NodeTest.php
M test/classes/properties/plugins/ExportPluginPropertiesTest.php
M test/libraries/PMA_operations_test.php
M test/libraries/rte/PMA_TRI_getEditorForm_test.php
M test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/45284ed3ad95...34b03a3494dd