Branch: refs/heads/master
Home: https://github.com/phpmyadmin/localized_docs
Commit: a950aff7c06aa136a09940a759dfcf3eaa9eef0d
https://github.com/phpmyadmin/localized_docs/commit/a950aff7c06aa136a09940a…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-10 (Thu, 10 Nov 2016)
Changed paths:
M phpmyadmin
Log Message:
-----------
Update phpmyadmin submodule
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: c85eb4ed70f5d4e73e49459557535b7b380c30f6
https://github.com/phpmyadmin/localized_docs/commit/c85eb4ed70f5d4e73e49459…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-10 (Thu, 10 Nov 2016)
Changed paths:
M locale/bookmarks.pot
M locale/charts.pot
M locale/config.pot
M locale/copyright.pot
M locale/credits.pot
M locale/developers.pot
M locale/faq.pot
M locale/glossary.pot
M locale/import_export.pot
M locale/index.pot
M locale/intro.pot
M locale/other.pot
M locale/privileges.pot
M locale/relations.pot
M locale/require.pot
M locale/setup.pot
M locale/transformations.pot
M locale/user.pot
M locale/vendors.pot
M po/ar.mo
M po/ar.po
M po/az.mo
M po/az.po
M po/bs.mo
M po/bs.po
M po/ca.mo
M po/ca.po
M po/cs.mo
M po/cs.po
M po/da.mo
M po/da.po
M po/de.mo
M po/de.po
M po/documentation.pot
M po/el.mo
M po/el.po
M po/en_GB.mo
M po/en_GB.po
M po/eo.mo
M po/eo.po
M po/es.mo
M po/es.po
M po/et.mo
M po/et.po
M po/fi.mo
M po/fi.po
M po/fr.mo
M po/fr.po
M po/fy.mo
M po/fy.po
M po/gl.mo
M po/gl.po
M po/hu.mo
M po/hu.po
M po/hy.mo
M po/hy.po
M po/id.mo
M po/id.po
M po/it.mo
M po/it.po
M po/ja.mo
M po/ja.po
M po/ka.mo
M po/ka.po
M po/ko.mo
M po/ko.po
M po/lt.mo
M po/lt.po
M po/mn.mo
M po/mn.po
M po/nb.mo
M po/nb.po
M po/nl.mo
M po/nl.po
M po/pl.mo
M po/pl.po
M po/pt_BR.mo
M po/pt_BR.po
M po/ro.mo
M po/ro.po
M po/sk.mo
M po/sk.po
M po/sl.mo
M po/sl.po
M po/sq.mo
M po/sq.po
M po/sv.mo
M po/sv.po
M po/tr.mo
M po/tr.po
M po/zh_CN.mo
M po/zh_CN.po
M po/zh_TW.mo
M po/zh_TW.po
Log Message:
-----------
Update po files
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Compare: https://github.com/phpmyadmin/localized_docs/compare/6d3c57cc4b8b...c85eb4e…
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 683c2dc291d2bcadf33423fccc7a097f83ba5f88
https://github.com/phpmyadmin/phpmyadmin/commit/683c2dc291d2bcadf33423fccc7…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-10 (Thu, 10 Nov 2016)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/brx.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/eo.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/fy.po
M po/gl.po
M po/gu.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/li.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/ne.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(a)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(a)latin.po
M po/vi.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(a)cihar.com>
Commit: 2ea6e324ca1284925b75245629390a1323241555
https://github.com/phpmyadmin/phpmyadmin/commit/2ea6e324ca1284925b752456293…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-10 (Thu, 10 Nov 2016)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/brx.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/eo.po
M po/es.po
M po/et.po
M po/eu.po
M po/fa.po
M po/fi.po
M po/fil.po
M po/fr.po
M po/fy.po
M po/gl.po
M po/gu.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/ig.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kab.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/li.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/ne.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(a)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(a)latin.po
M po/vi.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(a)cihar.com>
Commit: 28592743a0645054a55a37ba6a8c2ce5cce5da6e
https://github.com/phpmyadmin/phpmyadmin/commit/28592743a0645054a55a37ba6a8…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-10 (Thu, 10 Nov 2016)
Log Message:
-----------
Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/986012bce01d...28592743a064
Branch: refs/heads/QA_4_6
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 683c2dc291d2bcadf33423fccc7a097f83ba5f88
https://github.com/phpmyadmin/phpmyadmin/commit/683c2dc291d2bcadf33423fccc7…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-10 (Thu, 10 Nov 2016)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/brx.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/eo.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/fy.po
M po/gl.po
M po/gu.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/li.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/ne.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(a)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(a)latin.po
M po/vi.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(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 986012bce01de6daeda697057a55837164ac9ed5
https://github.com/phpmyadmin/phpmyadmin/commit/986012bce01de6daeda697057a5…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-10 (Thu, 10 Nov 2016)
Changed paths:
M templates/table/search/rows_normal.phtml
M templates/table/search/rows_zoom.phtml
Log Message:
-----------
Fold hidden input into exiting rows
This makes it easier to change them using CSS, see pr #12287.
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: ec08844246b19263feecd01b21b2aa61dac73701
https://github.com/phpmyadmin/phpmyadmin/commit/ec08844246b19263feecd01b21b…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-11-10 (Thu, 10 Nov 2016)
Changed paths:
M browse_foreigners.php
M libraries/relation.lib.php
Log Message:
-----------
Use a forcing parameter to get $the_total records for a foreign key column
Required at some specific places for ex. browse_foreigners.php (reqd for pagination)
This is in continuation of original fix for #12257 (in #12685)
Also fixed an error in an old commit 9880f573441fcac53e61ee17eeaf690c1e06ecb0
related to LIMIT clause generation
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Commit: 0bdb13e960d03b10506a594e452088f3566175b3
https://github.com/phpmyadmin/phpmyadmin/commit/0bdb13e960d03b10506a594e452…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-11-10 (Thu, 10 Nov 2016)
Changed paths:
M browse_foreigners.php
M libraries/relation.lib.php
Log Message:
-----------
Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5dc004dfe064...0bdb13e960d0
Branch: refs/heads/QA_4_6
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: ec08844246b19263feecd01b21b2aa61dac73701
https://github.com/phpmyadmin/phpmyadmin/commit/ec08844246b19263feecd01b21b…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-11-10 (Thu, 10 Nov 2016)
Changed paths:
M browse_foreigners.php
M libraries/relation.lib.php
Log Message:
-----------
Use a forcing parameter to get $the_total records for a foreign key column
Required at some specific places for ex. browse_foreigners.php (reqd for pagination)
This is in continuation of original fix for #12257 (in #12685)
Also fixed an error in an old commit 9880f573441fcac53e61ee17eeaf690c1e06ecb0
related to LIMIT clause generation
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 1f439a4dcc133f7f87846f983c980145c16d65ca
https://github.com/phpmyadmin/phpmyadmin/commit/1f439a4dcc133f7f87846f983c9…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-11-07 (Mon, 07 Nov 2016)
Changed paths:
M libraries/Table.php
M libraries/relation.lib.php
M test/classes/TableTest.php
Log Message:
-----------
Use a work around for testing if numRecords at least N
Fix #12257
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Commit: 14ccebbd4b45f5f2962e853e0b185cf807034684
https://github.com/phpmyadmin/phpmyadmin/commit/14ccebbd4b45f5f2962e853e0b1…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M libraries/Table.php
M libraries/relation.lib.php
M test/classes/TableTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/pull/12685' into QA_4_6
Commit: 9b8758512e86b43029afec42683ec1a13052ef00
https://github.com/phpmyadmin/phpmyadmin/commit/9b8758512e86b43029afec42683…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Changelog entry for #12685
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 5dc004dfe0644f771520e3714b17f9c08931a4f7
https://github.com/phpmyadmin/phpmyadmin/commit/5dc004dfe0644f771520e3714b1…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M ChangeLog
M libraries/Table.php
M libraries/relation.lib.php
M test/classes/TableTest.php
Log Message:
-----------
Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/19db0d1cef1e...5dc004dfe064
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 7a766402794d43e8a8e2220939f24a3b1f7e690f
https://github.com/phpmyadmin/phpmyadmin/commit/7a766402794d43e8a8e2220939f…
Author: Daniel Popiniuc <danielpopiniuc(a)gmail.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M sql/create_tables.sql
A sql/upgrade_column_info_4_6_5+.sql
Log Message:
-----------
Bookmark id that is an auto_increment column can only take positive values starting from 1, therefore should be unsigned otherwise half of allowed interval is wasted from start, and this is the fix for that.
Commit: 2309ef57d2065277339513590b24b02d4115cc39
https://github.com/phpmyadmin/phpmyadmin/commit/2309ef57d2065277339513590b2…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M js/pmd/history.js
M libraries/pmd_common.php
Log Message:
-----------
Add LEFT JOIN for different constraints
If there are two or more columns in the same constraint (foreign key),
we should use AND to concatenate the conditions on LEFT JOIN for both the columns
Fix #12652
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Commit: 2c90167a8aef20fcf36765fbcef42a612fc8f2e5
https://github.com/phpmyadmin/phpmyadmin/commit/2c90167a8aef20fcf36765fbcef…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M js/pmd/history.js
M libraries/pmd_common.php
Log Message:
-----------
Merge remote-tracking branch 'origin/pull/12689' into QA_4_6
Commit: 3debbdd09b3b176bfb1686252ffc221de98e1eb4
https://github.com/phpmyadmin/phpmyadmin/commit/3debbdd09b3b176bfb1686252ff…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Changelog entry for 12689
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 7270a0c79547c9d6800373aa0aa6c4dbb54342d5
https://github.com/phpmyadmin/phpmyadmin/commit/7270a0c79547c9d6800373aa0aa…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M libraries/rte/rte_words.lib.php
Log Message:
-----------
Add missing punctionation
See PR #12686
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 0b62043c7e86b56349927bf410907d4e9f968d78
https://github.com/phpmyadmin/phpmyadmin/commit/0b62043c7e86b56349927bf4109…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M ChangeLog
M js/pmd/history.js
M libraries/pmd_common.php
M libraries/rte/rte_words.lib.php
Log Message:
-----------
Merge branch 'QA_4_6'
Commit: 3b48533288c1558d9f08cdfefdb6719cffc23412
https://github.com/phpmyadmin/phpmyadmin/commit/3b48533288c1558d9f08cdfefdb…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M sql/create_tables.sql
A sql/upgrade_column_info_4_6_5+.sql
Log Message:
-----------
Merge remote-tracking branch 'origin/pull/12688'
Commit: 9c52cd4c6654e4178070215095f8c7a08aea2961
https://github.com/phpmyadmin/phpmyadmin/commit/9c52cd4c6654e4178070215095f…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
R sql/upgrade_column_info_4_6_5+.sql
A sql/upgrade_tables_4_7_0+.sql
Log Message:
-----------
Correctly name upgrade file (pr #12688)
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 76eaef75842577d743782e643d5d393323df8620
https://github.com/phpmyadmin/phpmyadmin/commit/76eaef75842577d743782e643d5…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Changelog entry for #12688
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 19db0d1cef1ef74ca466a3008b4d3a28d125642e
https://github.com/phpmyadmin/phpmyadmin/commit/19db0d1cef1ef74ca466a3008b4…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M doc/setup.rst
Log Message:
-----------
Document upgrading for #12688
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c2da1a803fa6...19db0d1cef1e