Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 5f4903bb4a84e6b646f11c2a3b9e8151b59f4b9e
https://github.com/phpmyadmin/phpmyadmin/commit/5f4903bb4a84e6b646f11c2a3b9…
Author: Alpix <contact(a)alpix.eu>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M po/de.po
Log Message:
-----------
Translated using Weblate (German)
Currently translated at 98.8% (3161 of 3198 strings)
[CI skip]
Commit: 89e3820bae2fd53c789ce951fac30b5a75e201f5
https://github.com/phpmyadmin/phpmyadmin/commit/89e3820bae2fd53c789ce951fac…
Author: Weblate <noreply(a)weblate.org>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M ChangeLog
A ajax.php
M js/export.js
M js/messages.php
M libraries/display_export.lib.php
A templates/export/alias_add.phtml
A templates/export/alias_item.phtml
M test/libraries/PMA_display_export_test.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7
Commit: 7af85633c49e8025e9688db76fa19844dcf30e03
https://github.com/phpmyadmin/phpmyadmin/commit/7af85633c49e8025e9688db76fa…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
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: c0d841c50f42e05270d3bde60fba86e1a3582b45
https://github.com/phpmyadmin/phpmyadmin/commit/c0d841c50f42e05270d3bde60fb…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
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: c218e5e025ee298886bfbc357568502b52e56356
https://github.com/phpmyadmin/phpmyadmin/commit/c218e5e025ee298886bfbc35756…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Log Message:
-----------
Merge branch 'QA_4_7'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3e7c083c91cc...c218e5e025ee
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 4f4aafd1e3a724e79e0c95d596d045083fc8d3e7
https://github.com/phpmyadmin/phpmyadmin/commit/4f4aafd1e3a724e79e0c95d596d…
Author: Viktar Vauchkevich <victorenator(a)gmail.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M po/be.po
Log Message:
-----------
Translated using Weblate (Belarusian)
Currently translated at 60.7% (1944 of 3198 strings)
[CI skip]
Commit: 9a0d189349f12a8b9bc76384e0005616ba512bab
https://github.com/phpmyadmin/phpmyadmin/commit/9a0d189349f12a8b9bc76384e00…
Author: Cindy Dallaire <c.dallaire93(a)gmail.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M po/fr.po
Log Message:
-----------
Translated using Weblate (French)
Currently translated at 98.2% (3142 of 3198 strings)
[CI skip]
Commit: dcea3ce38bc676aa7dcd650e15626e58eac31dc4
https://github.com/phpmyadmin/phpmyadmin/commit/dcea3ce38bc676aa7dcd650e156…
Author: João Medeiros <medeiros.joaquim(a)gmail.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M po/pt_BR.po
Log Message:
-----------
Translated using Weblate (Portuguese (Brazil))
Currently translated at 98.5% (3151 of 3198 strings)
[CI skip]
Commit: 97e604adb720a0337364d4f6527938e68b62d05b
https://github.com/phpmyadmin/phpmyadmin/commit/97e604adb720a0337364d4f6527…
Author: Weblate <noreply(a)weblate.org>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M ChangeLog
M doc/config.rst
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7
Commit: 358d2fd1f1dca6bfb16fb415e76bb9b0b68f0499
https://github.com/phpmyadmin/phpmyadmin/commit/358d2fd1f1dca6bfb16fb415e76…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M ChangeLog
A ajax.php
M js/export.js
M js/messages.php
M libraries/display_export.lib.php
A templates/export/alias_add.phtml
A templates/export/alias_item.phtml
M test/libraries/PMA_display_export_test.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Rewrite export alias defining
The old code did load all colums for all tables in all databases in
export. This can easily explode for server wide exports or exports on
database with lot of tables.
It has been rewritten in a way to load required data on demand from
server. This will make aliases defining slightly slower, but I think
it's acceptable price for making the export work on larger databases.
Fixes #13008
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 30d509238ab3a400217edc9a6bcf8884755c724b
https://github.com/phpmyadmin/phpmyadmin/commit/30d509238ab3a400217edc9a6bc…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_7'
Commit: c065224d1cfb6f065d699d1cce6c4c68fc3598ad
https://github.com/phpmyadmin/phpmyadmin/commit/c065224d1cfb6f065d699d1cce6…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M ChangeLog
A ajax.php
M js/export.js
M js/messages.php
M libraries/display_export.lib.php
A templates/export/alias_add.phtml
A templates/export/alias_item.phtml
M test/libraries/PMA_display_export_test.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Merge branch 'QA_4_7'
Commit: b372e0d554eff01f5753be38a20943afe642b11a
https://github.com/phpmyadmin/phpmyadmin/commit/b372e0d554eff01f5753be38a20…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M js/indexes.js
M templates/table/index_form.twig
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f0f9311cf5a0...b372e0d554ef
Branch: refs/heads/QA_4_7
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 5f4903bb4a84e6b646f11c2a3b9e8151b59f4b9e
https://github.com/phpmyadmin/phpmyadmin/commit/5f4903bb4a84e6b646f11c2a3b9…
Author: Alpix <contact(a)alpix.eu>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M po/de.po
Log Message:
-----------
Translated using Weblate (German)
Currently translated at 98.8% (3161 of 3198 strings)
[CI skip]
Commit: 89e3820bae2fd53c789ce951fac30b5a75e201f5
https://github.com/phpmyadmin/phpmyadmin/commit/89e3820bae2fd53c789ce951fac…
Author: Weblate <noreply(a)weblate.org>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M ChangeLog
A ajax.php
M js/export.js
M js/messages.php
M libraries/display_export.lib.php
A templates/export/alias_add.phtml
A templates/export/alias_item.phtml
M test/libraries/PMA_display_export_test.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/358d2fd1f1dc...89e3820bae2f
Branch: refs/heads/QA_4_7
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 358d2fd1f1dca6bfb16fb415e76bb9b0b68f0499
https://github.com/phpmyadmin/phpmyadmin/commit/358d2fd1f1dca6bfb16fb415e76…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M ChangeLog
A ajax.php
M js/export.js
M js/messages.php
M libraries/display_export.lib.php
A templates/export/alias_add.phtml
A templates/export/alias_item.phtml
M test/libraries/PMA_display_export_test.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Rewrite export alias defining
The old code did load all colums for all tables in all databases in
export. This can easily explode for server wide exports or exports on
database with lot of tables.
It has been rewritten in a way to load required data on demand from
server. This will make aliases defining slightly slower, but I think
it's acceptable price for making the export work on larger databases.
Fixes #13008
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 16aa30cd56e87ada372fbf4c6a69ed3d18c388b6
https://github.com/phpmyadmin/phpmyadmin/commit/16aa30cd56e87ada372fbf4c6a6…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M templates/table/index_form.twig
Log Message:
-----------
Fix #13350 Add Index issue
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 522f1a714e805326bc28294b3a5db080ab1785fb
https://github.com/phpmyadmin/phpmyadmin/commit/522f1a714e805326bc28294b3a5…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M ChangeLog
M db_structure.php
M doc/config.rst
M js/codemirror/LICENSE
M js/codemirror/addon/hint/sql-hint.js
M js/codemirror/addon/lint/lint.js
M js/codemirror/addon/lint/sql-lint.js
M js/codemirror/lib/codemirror.css
M js/codemirror/lib/codemirror.js
M js/codemirror/mode/javascript/javascript.js
M js/codemirror/mode/sql/sql.js
M js/common.js
M js/config.js
M js/console.js
M js/db_central_columns.js
M js/db_operations.js
M js/db_search.js
M js/db_structure.js
M js/db_tracking.js
M js/error_report.js
M js/export.js
M js/functions.js
M js/gis_data_editor.js
M js/indexes.js
M js/jquery/additional-methods.js
R js/jquery/jquery.cookie.js
M js/jquery/jquery.min.js
M js/jquery/jquery.validate.js
M js/jquery/src/jquery/attributes/attr.js
M js/jquery/src/jquery/attributes/val.js
M js/jquery/src/jquery/callbacks.js
M js/jquery/src/jquery/core.js
M js/jquery/src/jquery/core/init.js
A js/jquery/src/jquery/core/nodeName.js
M js/jquery/src/jquery/core/ready-no-deferred.js
M js/jquery/src/jquery/core/ready.js
M js/jquery/src/jquery/css.js
M js/jquery/src/jquery/css/curCSS.js
M js/jquery/src/jquery/data/Data.js
M js/jquery/src/jquery/deferred.js
M js/jquery/src/jquery/deprecated.js
M js/jquery/src/jquery/effects.js
M js/jquery/src/jquery/event.js
M js/jquery/src/jquery/manipulation.js
M js/jquery/src/jquery/manipulation/getAll.js
M js/jquery/src/jquery/offset.js
M js/jquery/src/jquery/queue.js
M js/jquery/src/jquery/serialize.js
M js/jquery/src/jquery/traversing.js
A js/jquery/src/jquery/wrapper.js
A js/js.cookie.js
M js/makegrid.js
M js/navigation.js
M js/normalization.js
M js/pmd/move.js
M js/replication.js
M js/rte.js
M js/server_databases.js
M js/server_privileges.js
M js/server_status_monitor.js
M js/server_variables.js
M js/sql.js
M js/tbl_change.js
M js/tbl_operations.js
M js/tbl_relation.js
M js/tbl_select.js
M js/tbl_structure.js
M js/tbl_tracking.js
M js/tbl_zoom_plot_jqplot.js
M libraries/Footer.php
M libraries/Header.php
M libraries/Menu.php
M libraries/Util.php
M libraries/controllers/database/DatabaseStructureController.php
M libraries/server_common.inc.php
M templates/console/display.twig
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/40fb31f460ee...522f1a714e80
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 40fb31f460ee1f21621fb60880ab0e5ace34394a
https://github.com/phpmyadmin/phpmyadmin/commit/40fb31f460ee1f21621fb60880a…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M libraries/Util.php
Log Message:
-----------
Remove unused code
The url_params and args seems to be used in same way, but I could not
find any user of url_params.
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 9b627d685b373f0bd006246596e20b56d6b0c18e
https://github.com/phpmyadmin/phpmyadmin/commit/9b627d685b373f0bd006246596e…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M js/common.js
Log Message:
-----------
Remove no longer needed token parameter
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 608f80e227ad2e12a6062320a7e2ffc19eebf783
https://github.com/phpmyadmin/phpmyadmin/commit/608f80e227ad2e12a6062320a7e…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M libraries/Menu.php
M libraries/server_common.inc.php
Log Message:
-----------
Avoid passing empty parameter
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: e34ce858753824a1b73f9e47718a202efe8eebd3
https://github.com/phpmyadmin/phpmyadmin/commit/e34ce858753824a1b73f9e47718…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M libraries/server_common.inc.php
Log Message:
-----------
Avoid checking parameters which are set in same script
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 6a12e159945003652f0249ec1ece61abb6eb52e1
https://github.com/phpmyadmin/phpmyadmin/commit/6a12e159945003652f0249ec1ec…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M libraries/Footer.php
M libraries/Util.php
Log Message:
-----------
Remove checked_special global variable
It anyway doesn't work as intented due to most scripts not doing checks
this way.
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 45640d5e0f39ab2829c42e5a6d78461060542b85
https://github.com/phpmyadmin/phpmyadmin/commit/45640d5e0f39ab2829c42e5a6d7…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-06-13 (Tue, 13 Jun 2017)
Changed paths:
M libraries/Util.php
Log Message:
-----------
Remove unused request parameter for Util::checkParameters
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a7fb02fb1e99...45640d5e0f39