[phpMyAdmin Git] [phpmyadmin/sql-parser] db8cc7: Release today

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/sql-parser
  Commit: db8cc795e0ee47f5a9d8c16e58db14cc551b9cd3
  
https://github.com/phpmyadmin/sql-parser/commit/db8cc795e0ee47f5a9d8c16e58db14cc551b9cd3
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M CHANGELOG.md

  Log Message:
  ---
  Release today

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/sql-parser] 5c0905: Add changelog for phpmyadmin/phpmyadmin#12612

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/sql-parser
  Commit: 5c0905149b38f3c68a5f0545efdcc33c687459ee
  
https://github.com/phpmyadmin/sql-parser/commit/5c0905149b38f3c68a5f0545efdcc33c687459ee
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M CHANGELOG.md

  Log Message:
  ---
  Add changelog for phpmyadmin/phpmyadmin#12612

Signed-off-by: Michal Čihař 


  Commit: a12665e725c2ae32e397728429d96b066355e938
  
https://github.com/phpmyadmin/sql-parser/commit/a12665e725c2ae32e397728429d96b066355e938
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M CHANGELOG.md

  Log Message:
  ---
  Add next changelog entry

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/sql-parser/compare/c6c7de777ab3...a12665e725c2___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 5508f2: Use pow() directly

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5508f29ef95fedfa10472ba52e57bed66870a8de
  
https://github.com/phpmyadmin/phpmyadmin/commit/5508f29ef95fedfa10472ba52e57bed66870a8de
  Author: Michal Čihař 
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
M libraries/advisor.lib.php

  Log Message:
  ---
  Use pow() directly

This is anyway what will happen inside Util::pow for negative parameter.

Signed-off-by: Michal Čihař 


  Commit: e8ddbd30ebad99d50e9bf43e1a3efe118060faac
  
https://github.com/phpmyadmin/phpmyadmin/commit/e8ddbd30ebad99d50e9bf43e1a3efe118060faac
  Author: Michal Čihař 
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
M libraries/gis/GISPolygon.php

  Log Message:
  ---
  Do not use Util::pow with sqrt

Using bigger precision and passing it to standard precision makes no
sense.

Signed-off-by: Michal Čihař 


  Commit: b1f2146b7e87c21e98ce09203a2257c2674573a8
  
https://github.com/phpmyadmin/phpmyadmin/commit/b1f2146b7e87c21e98ce09203a2257c2674573a8
  Author: Michal Čihař 
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
M libraries/gis/GISPolygon.php

  Log Message:
  ---
  Avoid using Util::pow when we do not need big precision

Signed-off-by: Michal Čihař 


  Commit: c4d0f1d35b2bc4e1a994c2158709d1beccfe0f71
  
https://github.com/phpmyadmin/phpmyadmin/commit/c4d0f1d35b2bc4e1a994c2158709d1beccfe0f71
  Author: Michal Čihař 
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
M libraries/ip_allow_deny.lib.php

  Log Message:
  ---
  Using built in pow is certainly good enough for 32 bit numbers

Signed-off-by: Michal Čihař 


  Commit: 1997cbc77b5f0303148dfd10e2e2fd4c9809cd64
  
https://github.com/phpmyadmin/phpmyadmin/commit/1997cbc77b5f0303148dfd10e2e2fd4c9809cd64
  Author: Michal Čihař 
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
M libraries/controllers/server/ServerVariablesController.php

  Log Message:
  ---
  Using built in pow is good enough for up to exponent up to 3

Signed-off-by: Michal Čihař 


  Commit: 4d9febb8559bc2d1c721d1d822b1bed7924a2819
  
https://github.com/phpmyadmin/phpmyadmin/commit/4d9febb8559bc2d1c721d1d822b1bed7924a2819
  Author: Michal Čihař 
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
M libraries/import.lib.php

  Log Message:
  ---
  Use built in pow for column calculation

We're certainly not able to process more fields than integer can store.

Signed-off-by: Michal Čihař 


  Commit: 41c485557543b8233406b75d6c2227f2f1ac2c4f
  
https://github.com/phpmyadmin/phpmyadmin/commit/41c485557543b8233406b75d6c2227f2f1ac2c4f
  Author: Michal Čihař 
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
M libraries/Util.php
R test/libraries/common/PMA_pow_test.php

  Log Message:
  ---
  Remove no longer used Util::pow and tests for it

Signed-off-by: Michal Čihař 


  Commit: 0060c36ac9a687f3d03b281565b7f787bb23d6ea
  
https://github.com/phpmyadmin/phpmyadmin/commit/0060c36ac9a687f3d03b281565b7f787bb23d6ea
  Author: Michal Čihař 
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
M libraries/Util.php

  Log Message:
  ---
  Remove usage of Util::pow with forcing builtin pow

Signed-off-by: Michal Čihař 


  Commit: f143245f62e5a75547df0e50845b65237716965b
  
https://github.com/phpmyadmin/phpmyadmin/commit/f143245f62e5a75547df0e50845b65237716965b
  Author: Michal Čihař 
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
M libraries/Util.php

  Log Message:
  ---
  Use builtin pow for calculations

Signed-off-by: Michal Čihař 


  Commit: 9927c37f8d79307db002189b037273128f5ebce4
  
https://github.com/phpmyadmin/phpmyadmin/commit/9927c37f8d79307db002189b037273128f5ebce4
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M libraries/Util.php
M libraries/advisor.lib.php
M libraries/controllers/server/ServerVariablesController.php
M libraries/gis/GISPolygon.php
M libraries/import.lib.php
M libraries/ip_allow_deny.lib.php
R test/libraries/common/PMA_pow_test.php

  Log Message:
  ---
  Merge pull request #12595 from nijel/remove-pow

Remove Util::pow


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/333ada932dd0...9927c37f8d79___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/sql-parser] afd6a9: Add next changelog entry

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/sql-parser
  Commit: afd6a9008e63e2ff7155d69e98b30789c05d8a57
  
https://github.com/phpmyadmin/sql-parser/commit/afd6a9008e63e2ff7155d69e98b30789c05d8a57
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M CHANGELOG.md

  Log Message:
  ---
  Add next changelog entry

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] aa19ff: Update SQL parser to 3.4.9

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: aa19ffde328eeca98e68aab940035cbed01e04dc
  
https://github.com/phpmyadmin/phpmyadmin/commit/aa19ffde328eeca98e68aab940035cbed01e04dc
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M ChangeLog
M libraries/sql-parser/src/Component.php
M libraries/sql-parser/src/Components/AlterOperation.php
M libraries/sql-parser/src/Components/Array2d.php
M libraries/sql-parser/src/Components/ArrayObj.php
A libraries/sql-parser/src/Components/CaseExpression.php
M libraries/sql-parser/src/Components/Condition.php
M libraries/sql-parser/src/Components/CreateDefinition.php
M libraries/sql-parser/src/Components/DataType.php
M libraries/sql-parser/src/Components/Expression.php
M libraries/sql-parser/src/Components/ExpressionArray.php
M libraries/sql-parser/src/Components/FunctionCall.php
M libraries/sql-parser/src/Components/IntoKeyword.php
M libraries/sql-parser/src/Components/JoinKeyword.php
M libraries/sql-parser/src/Components/Key.php
M libraries/sql-parser/src/Components/Limit.php
M libraries/sql-parser/src/Components/OptionsArray.php
M libraries/sql-parser/src/Components/OrderKeyword.php
M libraries/sql-parser/src/Components/ParameterDefinition.php
M libraries/sql-parser/src/Components/PartitionDefinition.php
M libraries/sql-parser/src/Components/Reference.php
M libraries/sql-parser/src/Components/RenameOperation.php
M libraries/sql-parser/src/Components/SetOperation.php
M libraries/sql-parser/src/Components/UnionKeyword.php
M libraries/sql-parser/src/Context.php
M libraries/sql-parser/src/Contexts/ContextMySql5.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/Exceptions/LexerException.php
M libraries/sql-parser/src/Exceptions/ParserException.php
M libraries/sql-parser/src/Lexer.php
M libraries/sql-parser/src/Parser.php
M libraries/sql-parser/src/Statement.php
M libraries/sql-parser/src/Statements/AlterStatement.php
M libraries/sql-parser/src/Statements/AnalyzeStatement.php
M libraries/sql-parser/src/Statements/BackupStatement.php
M libraries/sql-parser/src/Statements/CallStatement.php
M libraries/sql-parser/src/Statements/CheckStatement.php
M libraries/sql-parser/src/Statements/ChecksumStatement.php
M libraries/sql-parser/src/Statements/CreateStatement.php
M libraries/sql-parser/src/Statements/DeleteStatement.php
M libraries/sql-parser/src/Statements/DropStatement.php
M libraries/sql-parser/src/Statements/ExplainStatement.php
M libraries/sql-parser/src/Statements/InsertStatement.php
M libraries/sql-parser/src/Statements/MaintenanceStatement.php
M libraries/sql-parser/src/Statements/NotImplementedStatement.php
M libraries/sql-parser/src/Statements/OptimizeStatement.php
M libraries/sql-parser/src/Statements/RenameStatement.php
M libraries/sql-parser/src/Statements/RepairStatement.php
M libraries/sql-parser/src/Statements/ReplaceStatement.php
M libraries/sql-parser/src/Statements/RestoreStatement.php
M libraries/sql-parser/src/Statements/SelectStatement.php
M libraries/sql-parser/src/Statements/SetStatement.php
M libraries/sql-parser/src/Statements/ShowStatement.php
M libraries/sql-parser/src/Statements/TransactionStatement.php
M libraries/sql-parser/src/Statements/TruncateStatement.php
M libraries/sql-parser/src/Statements/UpdateStatement.php
M libraries/sql-parser/src/Token.php
M libraries/sql-parser/src/TokensList.php
M libraries/sql-parser/src/UtfString.php
M libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/CLI.php
M libraries/sql-parser/src/Utils/Error.php
M libraries/sql-parser/src/Utils/Formatter.php
M libraries/sql-parser/src/Utils/Misc.php
M libraries/sql-parser/src/Utils/Query.php
M libraries/sql-parser/src/Utils/Routine.php
M libraries/sql-parser/src/Utils/Table.php
M libraries/sql-parser/src/Utils/Tokens.php

  Log Message:
  ---
  Update SQL parser to 3.4.9

- issue #12316 Correct export of complex SELECT statements
- issue #12080 Fixed parsing of subselect queries
- issue #11740 Fixed handling DELETE ... USING queries
- issue #12100 Fixed handling of CASE operator

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/sql-parser] 46271f: Remove unused use

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/sql-parser
  Commit: 46271f3c398c0e8d86142518008ef6e309bbf4fc
  
https://github.com/phpmyadmin/sql-parser/commit/46271f3c398c0e8d86142518008ef6e309bbf4fc
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M src/Components/CaseExpression.php

  Log Message:
  ---
  Remove unused use

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] fc0e6c: Remove extra whitespace

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: fc0e6cc095961af11b8f049a1b1f997ba7e23a3a
  
https://github.com/phpmyadmin/phpmyadmin/commit/fc0e6cc095961af11b8f049a1b1f997ba7e23a3a
  Author: Michal Čihař 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M libraries/relation.lib.php
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/b...@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/s...@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/u...@latin.po
M po/vi.po
M po/vls.po
M po/zh_CN.po
M po/zh_TW.po

  Log Message:
  ---
  Remove extra whitespace

Signed-off-by: Michal Čihař 


  Commit: e394ca84a40c2c84509ac15d0fd487c373751404
  
https://github.com/phpmyadmin/phpmyadmin/commit/e394ca84a40c2c84509ac15d0fd487c373751404
  Author: Michal Čihař 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/da.po

  Log Message:
  ---
  Translated using Weblate (Danish)

Currently translated at 92.0% (2952 of 3206 strings)

[CI skip]


  Commit: f31699970f281af7f3e1c767aa29ef29f32baa60
  
https://github.com/phpmyadmin/phpmyadmin/commit/f31699970f281af7f3e1c767aa29ef29f32baa60
  Author: Arie Kurniawan 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/id.po

  Log Message:
  ---
  Translated using Weblate (Indonesian)

Currently translated at 69.5% (2231 of 3206 strings)

[CI skip]

Correcting translate


  Commit: 521e087cec73a0878ed381d178564fc1301fb278
  
https://github.com/phpmyadmin/phpmyadmin/commit/521e087cec73a0878ed381d178564fc1301fb278
  Author: Michal Čihař 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/ckb.po

  Log Message:
  ---
  Translated using Weblate (Kurdish Sorani)

Currently translated at 31.7% (1017 of 3206 strings)

[CI skip]


  Commit: 2fa52f06b9e8bbaf89acaea98d67878a0cf8fb52
  
https://github.com/phpmyadmin/phpmyadmin/commit/2fa52f06b9e8bbaf89acaea98d67878a0cf8fb52
  Author: Michal Čihař 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/pt.po

  Log Message:
  ---
  Translated using Weblate (Portuguese)

Currently translated at 53.7% (1724 of 3206 strings)

[CI skip]


  Commit: cf4a1a9ee24c34649dba11fe37fe60e93bcdd69b
  
https://github.com/phpmyadmin/phpmyadmin/commit/cf4a1a9ee24c34649dba11fe37fe60e93bcdd69b
  Author: Bogdan Ciobaca 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/ro.po

  Log Message:
  ---
  Translated using Weblate (Romanian)

Currently translated at 53.8% (1727 of 3206 strings)

[CI skip]


  Commit: 489e3b5a9a24d3131187f8ca529ad951c9459f63
  
https://github.com/phpmyadmin/phpmyadmin/commit/489e3b5a9a24d3131187f8ca529ad951c9459f63
  Author: Michal Čihař 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/ta.po

  Log Message:
  ---
  Translated using Weblate (Tamil)

Currently translated at 34.2% (1098 of 3206 strings)

[CI skip]


  Commit: 5ded636281d5a2c95a61ced55a59e3446229f9de
  
https://github.com/phpmyadmin/phpmyadmin/commit/5ded636281d5a2c95a61ced55a59e3446229f9de
  Author: Michal Čihař 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/vi.po

  Log Message:
  ---
  Translated using Weblate (Vietnamese)

Currently translated at 86.3% (2768 of 3206 strings)

[CI skip]


  Commit: 8ee14c065ab51a81c072839b1473e359a869544e
  
https://github.com/phpmyadmin/phpmyadmin/commit/8ee14c065ab51a81c072839b1473e359a869544e
  Author: Michal Čihař 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e394ca: Translated using Weblate (Danish)

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: e394ca84a40c2c84509ac15d0fd487c373751404
  
https://github.com/phpmyadmin/phpmyadmin/commit/e394ca84a40c2c84509ac15d0fd487c373751404
  Author: Michal Čihař 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/da.po

  Log Message:
  ---
  Translated using Weblate (Danish)

Currently translated at 92.0% (2952 of 3206 strings)

[CI skip]


  Commit: f31699970f281af7f3e1c767aa29ef29f32baa60
  
https://github.com/phpmyadmin/phpmyadmin/commit/f31699970f281af7f3e1c767aa29ef29f32baa60
  Author: Arie Kurniawan 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/id.po

  Log Message:
  ---
  Translated using Weblate (Indonesian)

Currently translated at 69.5% (2231 of 3206 strings)

[CI skip]

Correcting translate


  Commit: 521e087cec73a0878ed381d178564fc1301fb278
  
https://github.com/phpmyadmin/phpmyadmin/commit/521e087cec73a0878ed381d178564fc1301fb278
  Author: Michal Čihař 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/ckb.po

  Log Message:
  ---
  Translated using Weblate (Kurdish Sorani)

Currently translated at 31.7% (1017 of 3206 strings)

[CI skip]


  Commit: 2fa52f06b9e8bbaf89acaea98d67878a0cf8fb52
  
https://github.com/phpmyadmin/phpmyadmin/commit/2fa52f06b9e8bbaf89acaea98d67878a0cf8fb52
  Author: Michal Čihař 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/pt.po

  Log Message:
  ---
  Translated using Weblate (Portuguese)

Currently translated at 53.7% (1724 of 3206 strings)

[CI skip]


  Commit: cf4a1a9ee24c34649dba11fe37fe60e93bcdd69b
  
https://github.com/phpmyadmin/phpmyadmin/commit/cf4a1a9ee24c34649dba11fe37fe60e93bcdd69b
  Author: Bogdan Ciobaca 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/ro.po

  Log Message:
  ---
  Translated using Weblate (Romanian)

Currently translated at 53.8% (1727 of 3206 strings)

[CI skip]


  Commit: 489e3b5a9a24d3131187f8ca529ad951c9459f63
  
https://github.com/phpmyadmin/phpmyadmin/commit/489e3b5a9a24d3131187f8ca529ad951c9459f63
  Author: Michal Čihař 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/ta.po

  Log Message:
  ---
  Translated using Weblate (Tamil)

Currently translated at 34.2% (1098 of 3206 strings)

[CI skip]


  Commit: 5ded636281d5a2c95a61ced55a59e3446229f9de
  
https://github.com/phpmyadmin/phpmyadmin/commit/5ded636281d5a2c95a61ced55a59e3446229f9de
  Author: Michal Čihař 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/vi.po

  Log Message:
  ---
  Translated using Weblate (Vietnamese)

Currently translated at 86.3% (2768 of 3206 strings)

[CI skip]


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/c455a5cf8f48...5ded636281d5___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] f0c490: Translated using Weblate (Danish)

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: f0c490ac174056545e3344f65d1128eec8a1a123
  
https://github.com/phpmyadmin/phpmyadmin/commit/f0c490ac174056545e3344f65d1128eec8a1a123
  Author: Michal Čihař 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/da.po

  Log Message:
  ---
  Translated using Weblate (Danish)

Currently translated at 91.4% (2943 of 3219 strings)

[CI skip]


  Commit: 7efe9f95af08de7963fdd72d7adc2aee97c2324b
  
https://github.com/phpmyadmin/phpmyadmin/commit/7efe9f95af08de7963fdd72d7adc2aee97c2324b
  Author: Michal Čihař 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/ckb.po

  Log Message:
  ---
  Translated using Weblate (Kurdish Sorani)

Currently translated at 31.6% (1020 of 3219 strings)

[CI skip]


  Commit: a3423f1af12e515d05c1eed3d3207a607e450dab
  
https://github.com/phpmyadmin/phpmyadmin/commit/a3423f1af12e515d05c1eed3d3207a607e450dab
  Author: Michal Čihař 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/pt.po

  Log Message:
  ---
  Translated using Weblate (Portuguese)

Currently translated at 53.4% (1722 of 3219 strings)

[CI skip]


  Commit: 009ffe1433f11f5415269a47a300f0ee1e8ab3b4
  
https://github.com/phpmyadmin/phpmyadmin/commit/009ffe1433f11f5415269a47a300f0ee1e8ab3b4
  Author: Bogdan Ciobaca 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/ro.po

  Log Message:
  ---
  Translated using Weblate (Romanian)

Currently translated at 53.5% (1723 of 3219 strings)

[CI skip]


  Commit: bd03eae9aea6b68b186ad2453753f1b2eddce306
  
https://github.com/phpmyadmin/phpmyadmin/commit/bd03eae9aea6b68b186ad2453753f1b2eddce306
  Author: Michal Čihař 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/ta.po

  Log Message:
  ---
  Translated using Weblate (Tamil)

Currently translated at 34.0% (1095 of 3219 strings)

[CI skip]


  Commit: ee6586306673b797d816bde050536515c42d272e
  
https://github.com/phpmyadmin/phpmyadmin/commit/ee6586306673b797d816bde050536515c42d272e
  Author: Michal Čihař 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/vi.po

  Log Message:
  ---
  Translated using Weblate (Vietnamese)

Currently translated at 85.7% (2759 of 3219 strings)

[CI skip]


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/769be0ef366a...ee6586306673___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/localized_docs] 08eefa: Translated using Weblate (Indonesian)

2016-10-12 Thread Arie Kurniawan
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: 08eefa326a0a48e94bb5fde5573f5d8750af0f14
  
https://github.com/phpmyadmin/localized_docs/commit/08eefa326a0a48e94bb5fde5573f5d8750af0f14
  Author: Arie Kurniawan 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/id.mo
M po/id.po

  Log Message:
  ---
  Translated using Weblate (Indonesian)

Currently translated at 1.7% (39 of 2291 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] ada829: Translated using Weblate (Macedonian)

2016-10-12 Thread Dragan Zlatkovski
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ada82985082c0a4be0cb3df06b667345d7202973
  
https://github.com/phpmyadmin/phpmyadmin/commit/ada82985082c0a4be0cb3df06b667345d7202973
  Author: Dragan Zlatkovski 
  Date:   2016-10-02 (Sun, 02 Oct 2016)

  Changed paths:
M po/mk.po

  Log Message:
  ---
  Translated using Weblate (Macedonian)

Currently translated at 17.2% (554 of 3206 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] a266bf: Translated using Weblate (Indonesian)

2016-10-12 Thread Yogi Erka Julyansa Putra
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a266bf50169191a25a6a8a88b4137313a031763c
  
https://github.com/phpmyadmin/phpmyadmin/commit/a266bf50169191a25a6a8a88b4137313a031763c
  Author: Yogi Erka Julyansa Putra 
  Date:   2016-10-02 (Sun, 02 Oct 2016)

  Changed paths:
M po/id.po

  Log Message:
  ---
  Translated using Weblate (Indonesian)

Currently translated at 68.4% (2205 of 3219 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/localized_docs] 65b12f: Translated using Weblate (French)

2016-10-12 Thread Cédric Corazza
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: 65b12f9f6363c7527a2b30d2686643ee8cb35eb6
  
https://github.com/phpmyadmin/localized_docs/commit/65b12f9f6363c7527a2b30d2686643ee8cb35eb6
  Author: Cédric Corazza 
  Date:   2016-10-01 (Sat, 01 Oct 2016)

  Changed paths:
M po/fr.mo
M po/fr.po

  Log Message:
  ---
  Translated using Weblate (French)

Currently translated at 99.6% (2282 of 2291 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/localized_docs] a603c9: Translated using Weblate (French)

2016-10-12 Thread Cédric Corazza
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: a603c91a6147e48ffcac41287109507650d733fe
  
https://github.com/phpmyadmin/localized_docs/commit/a603c91a6147e48ffcac41287109507650d733fe
  Author: Cédric Corazza 
  Date:   2016-10-01 (Sat, 01 Oct 2016)

  Changed paths:
M po/fr.mo
M po/fr.po

  Log Message:
  ---
  Translated using Weblate (French)

Currently translated at 100.0% (2291 of 2291 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/localized_docs] e9e81b: Translated using Weblate (French)

2016-10-12 Thread Fabrice Pastorek
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: e9e81ba5643080f75dbea0ed2c46ea3e2df1fbf8
  
https://github.com/phpmyadmin/localized_docs/commit/e9e81ba5643080f75dbea0ed2c46ea3e2df1fbf8
  Author: Fabrice Pastorek 
  Date:   2016-10-01 (Sat, 01 Oct 2016)

  Changed paths:
M po/fr.mo
M po/fr.po

  Log Message:
  ---
  Translated using Weblate (French)

Currently translated at 99.6% (2283 of 2291 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/localized_docs] f4c627: Translated using Weblate (French)

2016-10-12 Thread Cédric Corazza
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: f4c6270cf77cf49e0472c6526d248bfedd93847b
  
https://github.com/phpmyadmin/localized_docs/commit/f4c6270cf77cf49e0472c6526d248bfedd93847b
  Author: Cédric Corazza 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M po/fr.mo
M po/fr.po

  Log Message:
  ---
  Translated using Weblate (French)

Currently translated at 100.0% (2291 of 2291 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 6a53b8: Escape database name properly to be used in MySQL ...

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 6a53b89cb7fa9e74ec05e04654242e3368122d00
  
https://github.com/phpmyadmin/phpmyadmin/commit/6a53b89cb7fa9e74ec05e04654242e3368122d00
  Author: Deven Bansod 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M libraries/server_privileges.lib.php

  Log Message:
  ---
  Escape database name properly to be used in MySQL wildcard statements

Fix #12602

Signed-off-by: Deven Bansod 


  Commit: c202b7a87ce0318e848faa6e5d8a24f3f1e9313f
  
https://github.com/phpmyadmin/phpmyadmin/commit/c202b7a87ce0318e848faa6e5d8a24f3f1e9313f
  Author: Deven Bansod 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M po/id.po
M po/zh_CN.po

  Log Message:
  ---
  Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/b9adbff762a3...c202b7a87ce0___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/sql-parser]

2016-10-12 Thread nijel
  Branch: refs/tags/v3.4.9
  Home:   https://github.com/phpmyadmin/sql-parser
___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/sql-parser] e2144e: Changelog entry for #88

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/sql-parser
  Commit: e2144e768791470076a0c19918cc3495bb61c023
  
https://github.com/phpmyadmin/sql-parser/commit/e2144e768791470076a0c19918cc3495bb61c023
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M CHANGELOG.md

  Log Message:
  ---
  Changelog entry for #88

Signed-off-by: Michal Čihař 


  Commit: 1b72bd39ba90580579b86b5f3bbd8f6815f10096
  
https://github.com/phpmyadmin/sql-parser/commit/1b72bd39ba90580579b86b5f3bbd8f6815f10096
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M src/Components/CaseExpression.php

  Log Message:
  ---
  Adjust license URL to be consistent with others (#88)

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/sql-parser/compare/26087604100d...1b72bd39ba90___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/sql-parser] 30b2aa: Fix parsing of subquery in FROM clause

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/sql-parser
  Commit: 30b2aab917931cc45b716ec6401103400fbd5537
  
https://github.com/phpmyadmin/sql-parser/commit/30b2aab917931cc45b716ec6401103400fbd5537
  Author: Deven Bansod 
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
M src/Components/JoinKeyword.php
M src/Parser.php
M tests/Parser/SelectStatementTest.php
A tests/data/parser/parseSelect5.in
A tests/data/parser/parseSelect5.out
A tests/data/parser/parseSelect6.in
A tests/data/parser/parseSelect6.out
A tests/data/parser/parseSelect7.in
A tests/data/parser/parseSelect7.out
A tests/data/parser/parseSelect8.in
A tests/data/parser/parseSelect8.out

  Log Message:
  ---
  Fix parsing of subquery in FROM clause

Fix #52

Signed-off-by: Deven Bansod 


  Commit: c2d9745b21f41f673bd7c314b29ba41e90d78fd1
  
https://github.com/phpmyadmin/sql-parser/commit/c2d9745b21f41f673bd7c314b29ba41e90d78fd1
  Author: Deven Bansod 
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
M src/Components/IntoKeyword.php
M src/Statements/SelectStatement.php
M tests/Utils/QueryTest.php
A tests/data/parser/parseSelect9.in

  Log Message:
  ---
  Fix some errors with INTO keyword more to follow

Add more test cases

Signed-off-by: Deven Bansod 


  Commit: 31e346b48ad1e6ecd2edf271f2373802a08a374a
  
https://github.com/phpmyadmin/sql-parser/commit/31e346b48ad1e6ecd2edf271f2373802a08a374a
  Author: Deven Bansod 
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
M src/Components/IntoKeyword.php
M src/Statements/InsertStatement.php
M src/Statements/ReplaceStatement.php
M tests/Components/IntoKeywordTest.php

  Log Message:
  ---
  Fix parsing and building of SELECT ... INTO @var1 [,@var2...]

Signed-off-by: Deven Bansod 


  Commit: 582f9e662ed315350496c127aee2bd57be4b2e9c
  
https://github.com/phpmyadmin/sql-parser/commit/582f9e662ed315350496c127aee2bd57be4b2e9c
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M src/Components/IntoKeyword.php
M src/Components/JoinKeyword.php
M src/Parser.php
M src/Statements/InsertStatement.php
M src/Statements/ReplaceStatement.php
M src/Statements/SelectStatement.php
M tests/Components/IntoKeywordTest.php
M tests/Parser/SelectStatementTest.php
M tests/Utils/QueryTest.php
A tests/data/parser/parseSelect5.in
A tests/data/parser/parseSelect5.out
A tests/data/parser/parseSelect6.in
A tests/data/parser/parseSelect6.out
A tests/data/parser/parseSelect7.in
A tests/data/parser/parseSelect7.out
A tests/data/parser/parseSelect8.in
A tests/data/parser/parseSelect8.out
A tests/data/parser/parseSelect9.in

  Log Message:
  ---
  Merge pull request #90 from devenbansod/subquery_in_from

Fix parsing of subquery in FROM clause


Compare: 
https://github.com/phpmyadmin/sql-parser/compare/280c72f01c11...582f9e662ed3___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/sql-parser] 280c72: Changelog for #87

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/sql-parser
  Commit: 280c72f01c11a59d54fd6f41eb44ec049e9ad79d
  
https://github.com/phpmyadmin/sql-parser/commit/280c72f01c11a59d54fd6f41eb44ec049e9ad79d
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M CHANGELOG.md

  Log Message:
  ---
  Changelog for #87

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c92517: Translated using Weblate (Kurdish Sorani)

2016-10-12 Thread Ranja Hseen
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c9251735f3a8beab911440bc2df02af0bf4524e7
  
https://github.com/phpmyadmin/phpmyadmin/commit/c9251735f3a8beab911440bc2df02af0bf4524e7
  Author: Ranja Hseen 
  Date:   2016-10-09 (Sun, 09 Oct 2016)

  Changed paths:
M po/ckb.po

  Log Message:
  ---
  Translated using Weblate (Kurdish Sorani)

Currently translated at 17.9% (578 of 3219 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 54c813: If multiple queries are submitted, save the commul...

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 54c81312a9467a704a645e27e619d15f9aed542d
  
https://github.com/phpmyadmin/phpmyadmin/commit/54c81312a9467a704a645e27e619d15f9aed542d
  Author: Deven Bansod 
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
M import.php

  Log Message:
  ---
  If multiple queries are submitted, save the commulative bookmark only once

Fix #12179

Signed-off-by: Deven Bansod 


  Commit: 96eba72fa6363ce4959efbd71b174048a82d7db0
  
https://github.com/phpmyadmin/phpmyadmin/commit/96eba72fa6363ce4959efbd71b174048a82d7db0
  Author: Deven Bansod 
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
M libraries/Util.php
M libraries/sql.lib.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php

  Log Message:
  ---
  Fix #12327: Show as PHP No longer works

Fix output of show_as_php. Don't show the links that are not required
or that may not work as expected

Signed-off-by: Deven Bansod 


  Commit: 9bd75db679fd8b3c7da551074951dc993e66d721
  
https://github.com/phpmyadmin/phpmyadmin/commit/9bd75db679fd8b3c7da551074951dc993e66d721
  Author: Deven Bansod 
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry for #12327

Signed-off-by: Deven Bansod 


  Commit: fdc80a2fd935f8db871b548a6deb2fddbf006e67
  
https://github.com/phpmyadmin/phpmyadmin/commit/fdc80a2fd935f8db871b548a6deb2fddbf006e67
  Author: Deven Bansod 
  Date:   2016-09-30 (Fri, 30 Sep 2016)

  Changed paths:
M js/codemirror/addon/lint/sql-lint.js

  Log Message:
  ---
  Fix #12455: Query history stores separate entry for every letter typed

Don't store history when linting, rather store it only when user has submitted 
the query.

Signed-off-by: Deven Bansod 


  Commit: 5c74f443578152f59a3c688b5cc5cf3d756afff6
  
https://github.com/phpmyadmin/phpmyadmin/commit/5c74f443578152f59a3c688b5cc5cf3d756afff6
  Author: Deven Bansod 
  Date:   2016-09-30 (Fri, 30 Sep 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry for #12455

Signed-off-by: Deven Bansod 


  Commit: 200a92b73801c140d3d916c518e1458be7868557
  
https://github.com/phpmyadmin/phpmyadmin/commit/200a92b73801c140d3d916c518e1458be7868557
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M ChangeLog
M js/codemirror/addon/lint/sql-lint.js

  Log Message:
  ---
  Merge remote-tracking branch 'origin/pull/12601' into QA_4_6


  Commit: 0292b89c4a9a6837c5fce64ba0c80aaf1e216a83
  
https://github.com/phpmyadmin/phpmyadmin/commit/0292b89c4a9a6837c5fce64ba0c80aaf1e216a83
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M ChangeLog
M libraries/Util.php
M libraries/sql.lib.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/pull/12596' into QA_4_6


  Commit: 5071b8a0166672bdfccb18556e58c647aae77df6
  
https://github.com/phpmyadmin/phpmyadmin/commit/5071b8a0166672bdfccb18556e58c647aae77df6
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M import.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/pull/12584' into QA_4_6


  Commit: 4ba041720fb0177f156547b09915d3e13d98144d
  
https://github.com/phpmyadmin/phpmyadmin/commit/4ba041720fb0177f156547b09915d3e13d98144d
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Changelog entry for #12584

Signed-off-by: Michal Čihař 


  Commit: fc5bb4a278702d816eb0713427d22ad645f988d7
  
https://github.com/phpmyadmin/phpmyadmin/commit/fc5bb4a278702d816eb0713427d22ad645f988d7
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M ChangeLog
M import.php
M js/codemirror/addon/lint/sql-lint.js
M libraries/Util.php
M libraries/sql.lib.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/d24848400d1d...fc5bb4a27870___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 4e020d: Update SQL parser to 3.4.10

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 4e020dea6bf173053d0a6ab7e2504f82fab174b4
  
https://github.com/phpmyadmin/phpmyadmin/commit/4e020dea6bf173053d0a6ab7e2504f82fab174b4
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M libraries/sql-parser/src/Components/CaseExpression.php
M libraries/sql-parser/src/Statements/DeleteStatement.php

  Log Message:
  ---
  Update SQL parser to 3.4.10

Fixes #12612

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 54c813: If multiple queries are submitted, save the commul...

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 54c81312a9467a704a645e27e619d15f9aed542d
  
https://github.com/phpmyadmin/phpmyadmin/commit/54c81312a9467a704a645e27e619d15f9aed542d
  Author: Deven Bansod 
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
M import.php

  Log Message:
  ---
  If multiple queries are submitted, save the commulative bookmark only once

Fix #12179

Signed-off-by: Deven Bansod 


  Commit: 96eba72fa6363ce4959efbd71b174048a82d7db0
  
https://github.com/phpmyadmin/phpmyadmin/commit/96eba72fa6363ce4959efbd71b174048a82d7db0
  Author: Deven Bansod 
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
M libraries/Util.php
M libraries/sql.lib.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php

  Log Message:
  ---
  Fix #12327: Show as PHP No longer works

Fix output of show_as_php. Don't show the links that are not required
or that may not work as expected

Signed-off-by: Deven Bansod 


  Commit: 9bd75db679fd8b3c7da551074951dc993e66d721
  
https://github.com/phpmyadmin/phpmyadmin/commit/9bd75db679fd8b3c7da551074951dc993e66d721
  Author: Deven Bansod 
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry for #12327

Signed-off-by: Deven Bansod 


  Commit: fdc80a2fd935f8db871b548a6deb2fddbf006e67
  
https://github.com/phpmyadmin/phpmyadmin/commit/fdc80a2fd935f8db871b548a6deb2fddbf006e67
  Author: Deven Bansod 
  Date:   2016-09-30 (Fri, 30 Sep 2016)

  Changed paths:
M js/codemirror/addon/lint/sql-lint.js

  Log Message:
  ---
  Fix #12455: Query history stores separate entry for every letter typed

Don't store history when linting, rather store it only when user has submitted 
the query.

Signed-off-by: Deven Bansod 


  Commit: 5c74f443578152f59a3c688b5cc5cf3d756afff6
  
https://github.com/phpmyadmin/phpmyadmin/commit/5c74f443578152f59a3c688b5cc5cf3d756afff6
  Author: Deven Bansod 
  Date:   2016-09-30 (Fri, 30 Sep 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry for #12455

Signed-off-by: Deven Bansod 


  Commit: 200a92b73801c140d3d916c518e1458be7868557
  
https://github.com/phpmyadmin/phpmyadmin/commit/200a92b73801c140d3d916c518e1458be7868557
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M ChangeLog
M js/codemirror/addon/lint/sql-lint.js

  Log Message:
  ---
  Merge remote-tracking branch 'origin/pull/12601' into QA_4_6


  Commit: 0292b89c4a9a6837c5fce64ba0c80aaf1e216a83
  
https://github.com/phpmyadmin/phpmyadmin/commit/0292b89c4a9a6837c5fce64ba0c80aaf1e216a83
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M ChangeLog
M libraries/Util.php
M libraries/sql.lib.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/pull/12596' into QA_4_6


  Commit: 5071b8a0166672bdfccb18556e58c647aae77df6
  
https://github.com/phpmyadmin/phpmyadmin/commit/5071b8a0166672bdfccb18556e58c647aae77df6
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M import.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/pull/12584' into QA_4_6


  Commit: 4ba041720fb0177f156547b09915d3e13d98144d
  
https://github.com/phpmyadmin/phpmyadmin/commit/4ba041720fb0177f156547b09915d3e13d98144d
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Changelog entry for #12584

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/0a5ab3bfe954...4ba041720fb0___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e1d5a1: Remove outdated script

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: e1d5a1338d7ba88aa33ad145f4df8acebffea4c0
  
https://github.com/phpmyadmin/phpmyadmin/commit/e1d5a1338d7ba88aa33ad145f4df8acebffea4c0
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
R scripts/revision-info

  Log Message:
  ---
  Remove outdated script

This is not used on the demo, there is separate one in scripts repo.

Fixes #12605

Signed-off-by: Michal Čihař 


  Commit: 0a5ab3bfe954f5222624afdb677ec4d3db1996b8
  
https://github.com/phpmyadmin/phpmyadmin/commit/0a5ab3bfe954f5222624afdb677ec4d3db1996b8
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
R scripts/remove_control_m.sh

  Log Message:
  ---
  Remove unused script

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/4e020dea6bf1...0a5ab3bfe954___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/sql-parser]

2016-10-12 Thread nijel
  Branch: refs/tags/v3.4.10
  Home:   https://github.com/phpmyadmin/sql-parser
___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 4e020d: Update SQL parser to 3.4.10

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 4e020dea6bf173053d0a6ab7e2504f82fab174b4
  
https://github.com/phpmyadmin/phpmyadmin/commit/4e020dea6bf173053d0a6ab7e2504f82fab174b4
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M libraries/sql-parser/src/Components/CaseExpression.php
M libraries/sql-parser/src/Statements/DeleteStatement.php

  Log Message:
  ---
  Update SQL parser to 3.4.10

Fixes #12612

Signed-off-by: Michal Čihař 


  Commit: 48baca47b3afb679915dbf3a14026457415dff6d
  
https://github.com/phpmyadmin/phpmyadmin/commit/48baca47b3afb679915dbf3a14026457415dff6d
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Log Message:
  ---
  Merge branch 'QA_4_6'


  Commit: c8200e1fa4c6e7aac5bb1ac5b3dcbffdf26e9c81
  
https://github.com/phpmyadmin/phpmyadmin/commit/c8200e1fa4c6e7aac5bb1ac5b3dcbffdf26e9c81
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M libraries/Util.php
M libraries/advisor.lib.php
M libraries/controllers/server/ServerVariablesController.php
M libraries/gis/GISPolygon.php
M libraries/import.lib.php
M libraries/ip_allow_deny.lib.php
R test/libraries/common/PMA_pow_test.php

  Log Message:
  ---
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/9927c37f8d79...c8200e1fa4c6___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] d1e353: Fix #12419 wrong description on GRANT option of ta...

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d1e353f23539e12545ee77314df7ccdf4a7ec2e5
  
https://github.com/phpmyadmin/phpmyadmin/commit/d1e353f23539e12545ee77314df7ccdf4a7ec2e5
  Author: Pavel Rochnyack 
  Date:   2016-08-14 (Sun, 14 Aug 2016)

  Changed paths:
M libraries/server_privileges.lib.php
M server_privileges.php

  Log Message:
  ---
  Fix #12419 wrong description on GRANT option of table/routine privileges.

Signed-off-by: Pavel Rochnyack 


  Commit: 26c7a585332f505220c7e7e0c720ae016aafe29e
  
https://github.com/phpmyadmin/phpmyadmin/commit/26c7a585332f505220c7e7e0c720ae016aafe29e
  Author: Deven Bansod 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M libraries/server_privileges.lib.php
M server_privileges.php

  Log Message:
  ---
  Merge pull request #12440 from rpv-tomsk/grant-option-description-12419

Fix #12419 wrong description on GRANT option of table/routine privileges


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/4ba041720fb0...26c7a585332f___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 46ae50: ChangeLog entry for #12419

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 46ae5005080202d10865720e020aa23f4c4ae597
  
https://github.com/phpmyadmin/phpmyadmin/commit/46ae5005080202d10865720e020aa23f4c4ae597
  Author: Deven Bansod 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry for #12419

Signed-off-by: Deven Bansod 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 898073: Fold theme sprites code into Theme.php

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 8980730d3afc3648ffcfddca377112ab77be15b7
  
https://github.com/phpmyadmin/phpmyadmin/commit/8980730d3afc3648ffcfddca377112ab77be15b7
  Author: Michal Čihař 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M libraries/Theme.php
R themes/sprites.css.php

  Log Message:
  ---
  Fold theme sprites code into Theme.php

There is no good reason to have this separate.

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 88f0b6: Translated using Weblate (Interlingua)

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 88f0b6c99dfa4ada5a231e3299e8fac8c894fe0a
  
https://github.com/phpmyadmin/phpmyadmin/commit/88f0b6c99dfa4ada5a231e3299e8fac8c894fe0a
  Author: Giovanni Sora 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M po/ia.po

  Log Message:
  ---
  Translated using Weblate (Interlingua)

Currently translated at 73.9% (2371 of 3206 strings)

[CI skip]


  Commit: 5fa394b12b166c4eae9fb09195bf8c61e6eb40f9
  
https://github.com/phpmyadmin/phpmyadmin/commit/5fa394b12b166c4eae9fb09195bf8c61e6eb40f9
  Author: Weblate 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M libraries/replication.inc.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6


  Commit: 3166e8c0f2bcaf881a5ea626e4ba6f8844e7ff7f
  
https://github.com/phpmyadmin/phpmyadmin/commit/3166e8c0f2bcaf881a5ea626e4ba6f8844e7ff7f
  Author: Deven Bansod 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M server_replication.php

  Log Message:
  ---
  Use values from request parameter url_param only if it is an array

Fix #12350

Signed-off-by: Deven Bansod 


  Commit: b6f76a84ac2e4837fbc2f7d35adb8f2be51475af
  
https://github.com/phpmyadmin/phpmyadmin/commit/b6f76a84ac2e4837fbc2f7d35adb8f2be51475af
  Author: Deven Bansod 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M server_replication.php

  Log Message:
  ---
  Merge branch 'QA_4_6'

Conflicts:
po/ia.po


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/1bd6d1384705...b6f76a84ac2e___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] d5028e: Remove non working todofy badge

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d5028e445ad1dfeda5b130332fed5375edfade4e
  
https://github.com/phpmyadmin/phpmyadmin/commit/d5028e445ad1dfeda5b130332fed5375edfade4e
  Author: Michal Čihař 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M README.rst

  Log Message:
  ---
  Remove non working todofy badge

Signed-off-by: Michal Čihař 


  Commit: 5779005049a6937304030e575e1d2ec70f401fb3
  
https://github.com/phpmyadmin/phpmyadmin/commit/5779005049a6937304030e575e1d2ec70f401fb3
  Author: Michal Čihař 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M README.rst

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/b6f76a84ac2e...5779005049a6___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] d5028e: Remove non working todofy badge

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d5028e445ad1dfeda5b130332fed5375edfade4e
  
https://github.com/phpmyadmin/phpmyadmin/commit/d5028e445ad1dfeda5b130332fed5375edfade4e
  Author: Michal Čihař 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M README.rst

  Log Message:
  ---
  Remove non working todofy badge

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 457f5d: Fix variable name

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 457f5da7f205997b27ef59a04d1cb5b85b47c87e
  
https://github.com/phpmyadmin/phpmyadmin/commit/457f5da7f205997b27ef59a04d1cb5b85b47c87e
  Author: Michal Čihař 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M libraries/Theme.php

  Log Message:
  ---
  Fix variable name

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/website] 1b092b: Pass correct param to super()

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/website
  Commit: 1b092b02cc907091e447eaf57306dc04c045c502
  
https://github.com/phpmyadmin/website/commit/1b092b02cc907091e447eaf57306dc04c045c502
  Author: Michal Čihař 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M demo/management/commands/fetch_versions.py

  Log Message:
  ---
  Pass correct param to super()

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/motranslator] 88e3a1: Consistently use camelCase in API

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/motranslator
  Commit: 88e3a1c8c64638ed7b255f980b8ad90029656ea2
  
https://github.com/phpmyadmin/motranslator/commit/88e3a1c8c64638ed7b255f980b8ad90029656ea2
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M CHANGES.md
M README.md
M src/Loader.php
M src/Translator.php
M src/functions.php
M tests/FunctionsTest.php
M tests/LoaderTest.php
M tests/PluralFormulaTest.php

  Log Message:
  ---
  Consistently use camelCase in API

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/website] 3441f1: Add keybase website claim

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/website
  Commit: 3441f1932c10d9a4b116a006f3ce6ba00b429c95
  
https://github.com/phpmyadmin/website/commit/3441f1932c10d9a4b116a006f3ce6ba00b429c95
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
A .well-known/keybase.txt

  Log Message:
  ---
  Add keybase website claim

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] cd4c83: Fixed regexp for matching browser versions

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: cd4c8374b12601af9e925c5a47dcff6524278996
  
https://github.com/phpmyadmin/phpmyadmin/commit/cd4c8374b12601af9e925c5a47dcff6524278996
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M ChangeLog
M libraries/Config.php

  Log Message:
  ---
  Fixed regexp for matching browser versions

Fixes #12615

Signed-off-by: Michal Čihař 


  Commit: 7f35b62c06b90398098304013b8829a229d94daa
  
https://github.com/phpmyadmin/phpmyadmin/commit/7f35b62c06b90398098304013b8829a229d94daa
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M ChangeLog
M libraries/Config.php

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/f04aa22cc673...7f35b62c06b9___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/localized_docs] 59ba54: Translated using Weblate (German)

2016-10-12 Thread Predatorix Phoenix
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: 59ba54082115a6001d14dd6d3fb727c446a2a52a
  
https://github.com/phpmyadmin/localized_docs/commit/59ba54082115a6001d14dd6d3fb727c446a2a52a
  Author: Predatorix Phoenix 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M po/de.mo
M po/de.po

  Log Message:
  ---
  Translated using Weblate (German)

Currently translated at 26.5% (609 of 2291 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] d1e353: Fix #12419 wrong description on GRANT option of ta...

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d1e353f23539e12545ee77314df7ccdf4a7ec2e5
  
https://github.com/phpmyadmin/phpmyadmin/commit/d1e353f23539e12545ee77314df7ccdf4a7ec2e5
  Author: Pavel Rochnyack 
  Date:   2016-08-14 (Sun, 14 Aug 2016)

  Changed paths:
M libraries/server_privileges.lib.php
M server_privileges.php

  Log Message:
  ---
  Fix #12419 wrong description on GRANT option of table/routine privileges.

Signed-off-by: Pavel Rochnyack 


  Commit: 26c7a585332f505220c7e7e0c720ae016aafe29e
  
https://github.com/phpmyadmin/phpmyadmin/commit/26c7a585332f505220c7e7e0c720ae016aafe29e
  Author: Deven Bansod 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M libraries/server_privileges.lib.php
M server_privileges.php

  Log Message:
  ---
  Merge pull request #12440 from rpv-tomsk/grant-option-description-12419

Fix #12419 wrong description on GRANT option of table/routine privileges


  Commit: f14ad58d69c8b164c4f94ad6143f57604ea063cd
  
https://github.com/phpmyadmin/phpmyadmin/commit/f14ad58d69c8b164c4f94ad6143f57604ea063cd
  Author: Deven Bansod 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M libraries/server_privileges.lib.php
M server_privileges.php

  Log Message:
  ---
  Merge branch 'QA_4_6'


  Commit: 46ae5005080202d10865720e020aa23f4c4ae597
  
https://github.com/phpmyadmin/phpmyadmin/commit/46ae5005080202d10865720e020aa23f4c4ae597
  Author: Deven Bansod 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry for #12419

Signed-off-by: Deven Bansod 


  Commit: f04aa22cc67320530124ba92b7b9c61f273a990e
  
https://github.com/phpmyadmin/phpmyadmin/commit/f04aa22cc67320530124ba92b7b9c61f273a990e
  Author: Deven Bansod 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/fc5bb4a27870...f04aa22cc673___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] cd4c83: Fixed regexp for matching browser versions

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: cd4c8374b12601af9e925c5a47dcff6524278996
  
https://github.com/phpmyadmin/phpmyadmin/commit/cd4c8374b12601af9e925c5a47dcff6524278996
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M ChangeLog
M libraries/Config.php

  Log Message:
  ---
  Fixed regexp for matching browser versions

Fixes #12615

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e2bd78: Use Response instead of Message's display method t...

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: e2bd783f579e9b71b9c6d192ac207e7043b1d519
  
https://github.com/phpmyadmin/phpmyadmin/commit/e2bd783f579e9b71b9c6d192ac207e7043b1d519
  Author: Deven Bansod 
  Date:   2016-09-22 (Thu, 22 Sep 2016)

  Changed paths:
M import.php

  Log Message:
  ---
  Use Response instead of Message's display method to print error

Fix #12569

Signed-off-by: Deven Bansod 


  Commit: 686db2039d7937e8fb869897f022eef16cd3c6d5
  
https://github.com/phpmyadmin/phpmyadmin/commit/686db2039d7937e8fb869897f022eef16cd3c6d5
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M import.php

  Log Message:
  ---
  Merge pull request #12582 from devenbansod/fix_12569

Use Response instead of Message's display method to print error


  Commit: a7786dd93a5ce1ee6a6026864275bb5b753b87ae
  
https://github.com/phpmyadmin/phpmyadmin/commit/a7786dd93a5ce1ee6a6026864275bb5b753b87ae
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Changelog for #12582

Signed-off-by: Michal Čihař 


  Commit: 3f0122b6f45d682d3e35b5fe672910f68d3c10bf
  
https://github.com/phpmyadmin/phpmyadmin/commit/3f0122b6f45d682d3e35b5fe672910f68d3c10bf
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M ChangeLog
M import.php

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/82158f4c482c...3f0122b6f45d___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e2bd78: Use Response instead of Message's display method t...

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: e2bd783f579e9b71b9c6d192ac207e7043b1d519
  
https://github.com/phpmyadmin/phpmyadmin/commit/e2bd783f579e9b71b9c6d192ac207e7043b1d519
  Author: Deven Bansod 
  Date:   2016-09-22 (Thu, 22 Sep 2016)

  Changed paths:
M import.php

  Log Message:
  ---
  Use Response instead of Message's display method to print error

Fix #12569

Signed-off-by: Deven Bansod 


  Commit: 686db2039d7937e8fb869897f022eef16cd3c6d5
  
https://github.com/phpmyadmin/phpmyadmin/commit/686db2039d7937e8fb869897f022eef16cd3c6d5
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M import.php

  Log Message:
  ---
  Merge pull request #12582 from devenbansod/fix_12569

Use Response instead of Message's display method to print error


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/ddf580c51b5f...686db2039d79___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] ddf580: Fix OmniWeb version match (issue #12615)

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ddf580c51b5f7c4b6f295469b327c308863c2509
  
https://github.com/phpmyadmin/phpmyadmin/commit/ddf580c51b5f7c4b6f295469b327c308863c2509
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M libraries/Config.php

  Log Message:
  ---
  Fix OmniWeb version match (issue #12615)

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 53d60c: Remove (unused) browser specific style

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 53d60c023566202e9b414c95c06477586604500c
  
https://github.com/phpmyadmin/phpmyadmin/commit/53d60c023566202e9b414c95c06477586604500c
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php

  Log Message:
  ---
  Remove (unused) browser specific style

Signed-off-by: Michal Čihař 


  Commit: ae6eb57652fea2d2126586603a81e320b81ee410
  
https://github.com/phpmyadmin/phpmyadmin/commit/ae6eb57652fea2d2126586603a81e320b81ee410
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M libraries/Header.php

  Log Message:
  ---
  Remove browser specific class from root element

Signed-off-by: Michal Čihař 


  Commit: f006408ffad3962c2d977305359ebf830cccda44
  
https://github.com/phpmyadmin/phpmyadmin/commit/f006408ffad3962c2d977305359ebf830cccda44
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M libraries/navigation/NavigationTree.php

  Log Message:
  ---
  Remove code for MSIE < 8

It's not supported anyway by jQuery.

Signed-off-by: Michal Čihař 


  Commit: 1a23eccd2bb19fc74cd575c2ecf5fa163833df9d
  
https://github.com/phpmyadmin/phpmyadmin/commit/1a23eccd2bb19fc74cd575c2ecf5fa163833df9d
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M libraries/Config.php
M test/classes/ConfigTest.php

  Log Message:
  ---
  Remove code for MSIE 6

Signed-off-by: Michal Čihař 


  Commit: ddf580c51b5f7c4b6f295469b327c308863c2509
  
https://github.com/phpmyadmin/phpmyadmin/commit/ddf580c51b5f7c4b6f295469b327c308863c2509
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M libraries/Config.php

  Log Message:
  ---
  Fix OmniWeb version match (issue #12615)

Signed-off-by: Michal Čihař 


  Commit: 82158f4c482cc2a46689dc4ccbcf29da45430c92
  
https://github.com/phpmyadmin/phpmyadmin/commit/82158f4c482cc2a46689dc4ccbcf29da45430c92
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M libraries/Config.php

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/7f35b62c06b9...82158f4c482c___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c5ee14: Translated using Weblate (Indonesian)

2016-10-12 Thread Arie Kurniawan
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c5ee14716bc8f16b328e2599ea7463e135502ad1
  
https://github.com/phpmyadmin/phpmyadmin/commit/c5ee14716bc8f16b328e2599ea7463e135502ad1
  Author: Arie Kurniawan 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/id.po

  Log Message:
  ---
  Translated using Weblate (Indonesian)

Currently translated at 69.2% (2228 of 3219 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 5ed544: Translated using Weblate (Arabic)

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5ed544a45e094f422c2ffd40e6e4b836e5d9cff4
  
https://github.com/phpmyadmin/phpmyadmin/commit/5ed544a45e094f422c2ffd40e6e4b836e5d9cff4
  Author: Ihab Mardoud 
  Date:   2016-10-08 (Sat, 08 Oct 2016)

  Changed paths:
M po/ar.po

  Log Message:
  ---
  Translated using Weblate (Arabic)

Currently translated at 34.0% (1093 of 3206 strings)

[CI skip]


  Commit: 68bebc00ea9dc766372c3616883211960821bf5b
  
https://github.com/phpmyadmin/phpmyadmin/commit/68bebc00ea9dc766372c3616883211960821bf5b
  Author: SDSkyKlouD 
  Date:   2016-10-08 (Sat, 08 Oct 2016)

  Changed paths:
M po/ko.po

  Log Message:
  ---
  Translated using Weblate (Korean)

Currently translated at 78.6% (2521 of 3206 strings)

[CI skip]


  Commit: 08b496f1d9d1d5e2f30f8072c0a68b9c6d203082
  
https://github.com/phpmyadmin/phpmyadmin/commit/08b496f1d9d1d5e2f30f8072c0a68b9c6d203082
  Author: Weblate 
  Date:   2016-10-08 (Sat, 08 Oct 2016)

  Changed paths:
M libraries/Table.php
M test/classes/TableTest.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6


  Commit: fd31ed27e073fefe870f1c6793aefe38bacd18fc
  
https://github.com/phpmyadmin/phpmyadmin/commit/fd31ed27e073fefe870f1c6793aefe38bacd18fc
  Author: Ranja Hseen 
  Date:   2016-10-09 (Sun, 09 Oct 2016)

  Changed paths:
M po/ckb.po

  Log Message:
  ---
  Translated using Weblate (Kurdish Sorani)

Currently translated at 18.0% (580 of 3206 strings)

[CI skip]


  Commit: afa6e3b85eb2d83e8ff0c71fca635f0624b3b46b
  
https://github.com/phpmyadmin/phpmyadmin/commit/afa6e3b85eb2d83e8ff0c71fca635f0624b3b46b
  Author: Deven Bansod 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M js/tbl_change.js

  Log Message:
  ---
  Initialize newly added Textareas with default values

Actually default values for textareas are blanks.

Fix #12624

Signed-off-by: Deven Bansod 


  Commit: c455a5cf8f48b1ce351969d5d6204500fd7d482e
  
https://github.com/phpmyadmin/phpmyadmin/commit/c455a5cf8f48b1ce351969d5d6204500fd7d482e
  Author: Deven Bansod 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/ar.po
M po/ckb.po
M po/ko.po

  Log Message:
  ---
  Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6


  Commit: 85b904cec4d0afc308fa241de42e1fab5845d757
  
https://github.com/phpmyadmin/phpmyadmin/commit/85b904cec4d0afc308fa241de42e1fab5845d757
  Author: Deven Bansod 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M js/tbl_change.js

  Log Message:
  ---
  Merge branch 'QA_4_6'

Conflicts:
po/ar.po
po/ckb.po
po/ko.po


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/c9251735f3a8...85b904cec4d0___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] afa6e3: Initialize newly added Textareas with default valu...

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: afa6e3b85eb2d83e8ff0c71fca635f0624b3b46b
  
https://github.com/phpmyadmin/phpmyadmin/commit/afa6e3b85eb2d83e8ff0c71fca635f0624b3b46b
  Author: Deven Bansod 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M js/tbl_change.js

  Log Message:
  ---
  Initialize newly added Textareas with default values

Actually default values for textareas are blanks.

Fix #12624

Signed-off-by: Deven Bansod 


  Commit: c455a5cf8f48b1ce351969d5d6204500fd7d482e
  
https://github.com/phpmyadmin/phpmyadmin/commit/c455a5cf8f48b1ce351969d5d6204500fd7d482e
  Author: Deven Bansod 
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
M po/ar.po
M po/ckb.po
M po/ko.po

  Log Message:
  ---
  Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/fd31ed27e073...c455a5cf8f48___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 7d2760: ChangeLog entry for #12362

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 7d2760cec55410762ef6689a4aa314492b305fed
  
https://github.com/phpmyadmin/phpmyadmin/commit/7d2760cec55410762ef6689a4aa314492b305fed
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry for #12362

Signed-off-by: Deven Bansod 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 4f023a: Allow for precision specification in TIMESTAMP dat...

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 4f023ac86a7272ce7d31ae28d35bd152629f7878
  
https://github.com/phpmyadmin/phpmyadmin/commit/4f023ac86a7272ce7d31ae28d35bd152629f7878
  Author: Deven Bansod 
  Date:   2016-10-08 (Sat, 08 Oct 2016)

  Changed paths:
M libraries/Table.php

  Log Message:
  ---
  Allow for precision specification in TIMESTAMP datatype while editing/adding 
a column

Signed-off-by: Deven Bansod 


  Commit: 0b355b744627ef7d271ae35e3d3537d78a1cbb53
  
https://github.com/phpmyadmin/phpmyadmin/commit/0b355b744627ef7d271ae35e3d3537d78a1cbb53
  Author: Deven Bansod 
  Date:   2016-10-08 (Sat, 08 Oct 2016)

  Changed paths:
M test/classes/TableTest.php

  Log Message:
  ---
  Add tests for generation of Field spec with TIMESTAMP with precision

Signed-off-by: Deven Bansod 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/0de5f6099f60...0b355b744627___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 4f023a: Allow for precision specification in TIMESTAMP dat...

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 4f023ac86a7272ce7d31ae28d35bd152629f7878
  
https://github.com/phpmyadmin/phpmyadmin/commit/4f023ac86a7272ce7d31ae28d35bd152629f7878
  Author: Deven Bansod 
  Date:   2016-10-08 (Sat, 08 Oct 2016)

  Changed paths:
M libraries/Table.php

  Log Message:
  ---
  Allow for precision specification in TIMESTAMP datatype while editing/adding 
a column

Signed-off-by: Deven Bansod 


  Commit: 0b355b744627ef7d271ae35e3d3537d78a1cbb53
  
https://github.com/phpmyadmin/phpmyadmin/commit/0b355b744627ef7d271ae35e3d3537d78a1cbb53
  Author: Deven Bansod 
  Date:   2016-10-08 (Sat, 08 Oct 2016)

  Changed paths:
M test/classes/TableTest.php

  Log Message:
  ---
  Add tests for generation of Field spec with TIMESTAMP with precision

Signed-off-by: Deven Bansod 


  Commit: bd87fc09743078f0b5a7ae8047fd63b04bd8a8d4
  
https://github.com/phpmyadmin/phpmyadmin/commit/bd87fc09743078f0b5a7ae8047fd63b04bd8a8d4
  Author: Deven Bansod 
  Date:   2016-10-08 (Sat, 08 Oct 2016)

  Changed paths:
M libraries/Table.php
M test/classes/TableTest.php

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/ff91dc93f4ad...bd87fc097430___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 9ceb23: Don't append FROM clause for replacing in UNION st...

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 9ceb237dd6779e58047d112d051ab28b1002eb92
  
https://github.com/phpmyadmin/phpmyadmin/commit/9ceb237dd6779e58047d112d051ab28b1002eb92
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M tbl_export.php

  Log Message:
  ---
  Don't append FROM clause for replacing in UNION statements

If global statement has atleast one union, it should not have a FROM.

Fix #12619

Signed-off-by: Deven Bansod 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] f30512: Translated using Weblate (Arabic)

2016-10-12 Thread Weblate
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: f305125a14ce74a9ca022a81683e55bea44d3de6
  
https://github.com/phpmyadmin/phpmyadmin/commit/f305125a14ce74a9ca022a81683e55bea44d3de6
  Author: Ihab Mardoud 
  Date:   2016-10-08 (Sat, 08 Oct 2016)

  Changed paths:
M po/ar.po

  Log Message:
  ---
  Translated using Weblate (Arabic)

Currently translated at 33.8% (1090 of 3219 strings)

[CI skip]


  Commit: 043872a9da49198d2ea5a075f8a2565fc711b04d
  
https://github.com/phpmyadmin/phpmyadmin/commit/043872a9da49198d2ea5a075f8a2565fc711b04d
  Author: SDSkyKlouD 
  Date:   2016-10-08 (Sat, 08 Oct 2016)

  Changed paths:
M po/ko.po

  Log Message:
  ---
  Translated using Weblate (Korean)

Currently translated at 78.0% (2514 of 3219 strings)

[CI skip]


  Commit: e376794ababed7c22765dc4284b3443275a4b382
  
https://github.com/phpmyadmin/phpmyadmin/commit/e376794ababed7c22765dc4284b3443275a4b382
  Author: Weblate 
  Date:   2016-10-08 (Sat, 08 Oct 2016)

  Changed paths:
M libraries/Table.php
M test/classes/TableTest.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/master'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/bd87fc097430...e376794ababe___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 5ed544: Translated using Weblate (Arabic)

2016-10-12 Thread Weblate
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5ed544a45e094f422c2ffd40e6e4b836e5d9cff4
  
https://github.com/phpmyadmin/phpmyadmin/commit/5ed544a45e094f422c2ffd40e6e4b836e5d9cff4
  Author: Ihab Mardoud 
  Date:   2016-10-08 (Sat, 08 Oct 2016)

  Changed paths:
M po/ar.po

  Log Message:
  ---
  Translated using Weblate (Arabic)

Currently translated at 34.0% (1093 of 3206 strings)

[CI skip]


  Commit: 68bebc00ea9dc766372c3616883211960821bf5b
  
https://github.com/phpmyadmin/phpmyadmin/commit/68bebc00ea9dc766372c3616883211960821bf5b
  Author: SDSkyKlouD 
  Date:   2016-10-08 (Sat, 08 Oct 2016)

  Changed paths:
M po/ko.po

  Log Message:
  ---
  Translated using Weblate (Korean)

Currently translated at 78.6% (2521 of 3206 strings)

[CI skip]


  Commit: 08b496f1d9d1d5e2f30f8072c0a68b9c6d203082
  
https://github.com/phpmyadmin/phpmyadmin/commit/08b496f1d9d1d5e2f30f8072c0a68b9c6d203082
  Author: Weblate 
  Date:   2016-10-08 (Sat, 08 Oct 2016)

  Changed paths:
M libraries/Table.php
M test/classes/TableTest.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/0b355b744627...08b496f1d9d1___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 9ceb23: Don't append FROM clause for replacing in UNION st...

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 9ceb237dd6779e58047d112d051ab28b1002eb92
  
https://github.com/phpmyadmin/phpmyadmin/commit/9ceb237dd6779e58047d112d051ab28b1002eb92
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M tbl_export.php

  Log Message:
  ---
  Don't append FROM clause for replacing in UNION statements

If global statement has atleast one union, it should not have a FROM.

Fix #12619

Signed-off-by: Deven Bansod 


  Commit: 0de5f6099f60544bbd3e5d385f2b3e8072f0ccec
  
https://github.com/phpmyadmin/phpmyadmin/commit/0de5f6099f60544bbd3e5d385f2b3e8072f0ccec
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry for #12619

Signed-off-by: Deven Bansod 


  Commit: ff91dc93f4ad76d25a0bcc7628eeb9ce1f0757aa
  
https://github.com/phpmyadmin/phpmyadmin/commit/ff91dc93f4ad76d25a0bcc7628eeb9ce1f0757aa
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M ChangeLog
M tbl_export.php

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/48d599e99b28...ff91dc93f4ad___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 0de5f6: ChangeLog entry for #12619

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 0de5f6099f60544bbd3e5d385f2b3e8072f0ccec
  
https://github.com/phpmyadmin/phpmyadmin/commit/0de5f6099f60544bbd3e5d385f2b3e8072f0ccec
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry for #12619

Signed-off-by: Deven Bansod 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] a7786d: Changelog for #12582

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a7786dd93a5ce1ee6a6026864275bb5b753b87ae
  
https://github.com/phpmyadmin/phpmyadmin/commit/a7786dd93a5ce1ee6a6026864275bb5b753b87ae
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Changelog for #12582

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] db4a2e: Add suggestion for AllowRoot as well

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: db4a2e11f473d169b41d00a6668dfd2742e8bd71
  
https://github.com/phpmyadmin/phpmyadmin/commit/db4a2e11f473d169b41d00a6668dfd2742e8bd71
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M doc/setup.rst

  Log Message:
  ---
  Add suggestion for AllowRoot as well

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 30c52d: Translated using Weblate (Russian)

2016-10-12 Thread Weblate
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 30c52d57c2764542a79e0d239bb95e90394dcf56
  
https://github.com/phpmyadmin/phpmyadmin/commit/30c52d57c2764542a79e0d239bb95e90394dcf56
  Author: Val Bancer 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M po/ru.po

  Log Message:
  ---
  Translated using Weblate (Russian)

Currently translated at 97.3% (3135 of 3219 strings)

[CI skip]


  Commit: 262eb1acf7280fbbd2d48697ce2e2731639f07ec
  
https://github.com/phpmyadmin/phpmyadmin/commit/262eb1acf7280fbbd2d48697ce2e2731639f07ec
  Author: Weblate 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M doc/setup.rst

  Log Message:
  ---
  Merge remote-tracking branch 'origin/master'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/db4a2e11f473...262eb1acf728___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/docker] 07afa3: Adding PMA_VERBOSE and PMA_VERBOSES environment va...

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/docker
  Commit: 07afa363d789ce2e71b6b84c784587e9003c8c02
  
https://github.com/phpmyadmin/docker/commit/07afa363d789ce2e71b6b84c784587e9003c8c02
  Author: Andrea Sosso 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M config.inc.php

  Log Message:
  ---
  Adding PMA_VERBOSE and PMA_VERBOSES environment variables


  Commit: 465ecb08b36a88692288050c56e856ff8c5d577f
  
https://github.com/phpmyadmin/docker/commit/465ecb08b36a88692288050c56e856ff8c5d577f
  Author: Michal Čihař 
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
M config.inc.php

  Log Message:
  ---
  Merge pull request #72 from asosso/master

Adding PMA_VERBOSE and PMA_VERBOSES environment variables


Compare: 
https://github.com/phpmyadmin/docker/compare/8a3544a20a39...465ecb08b36a___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/localized_docs] 06691a: Translated using Weblate (Indonesian)

2016-10-12 Thread Dadan Setia
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: 06691a6936046e0982e627518ec142c9bdc7588a
  
https://github.com/phpmyadmin/localized_docs/commit/06691a6936046e0982e627518ec142c9bdc7588a
  Author: Dadan Setia 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M po/id.mo
M po/id.po

  Log Message:
  ---
  Translated using Weblate (Indonesian)

Currently translated at 1.2% (28 of 2291 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 889cd3: Prevent leaving an orphaned file while importing p...

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 889cd31618c86f7f30fcfe5f8e501f94e5e41a3c
  
https://github.com/phpmyadmin/phpmyadmin/commit/889cd31618c86f7f30fcfe5f8e501f94e5e41a3c
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M prefs_manage.php

  Log Message:
  ---
  Prevent leaving an orphaned file while importing preferences

Fix #12362

Signed-off-by: Deven Bansod 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 39f4a5: Translated using Weblate (Russian)

2016-10-12 Thread Weblate
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 39f4a595b2c3c14d07cca2bcde5d2432d2aa86a0
  
https://github.com/phpmyadmin/phpmyadmin/commit/39f4a595b2c3c14d07cca2bcde5d2432d2aa86a0
  Author: Val Bancer 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M po/ru.po

  Log Message:
  ---
  Translated using Weblate (Russian)

Currently translated at 98.2% (3156 of 3213 strings)

[CI skip]


  Commit: c4a2e1b6f2f8ab87b08858196e50b1043bdc6600
  
https://github.com/phpmyadmin/phpmyadmin/commit/c4a2e1b6f2f8ab87b08858196e50b1043bdc6600
  Author: Weblate 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M prefs_manage.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/889cd31618c8...c4a2e1b6f2f8___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 39f4a5: Translated using Weblate (Russian)

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 39f4a595b2c3c14d07cca2bcde5d2432d2aa86a0
  
https://github.com/phpmyadmin/phpmyadmin/commit/39f4a595b2c3c14d07cca2bcde5d2432d2aa86a0
  Author: Val Bancer 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M po/ru.po

  Log Message:
  ---
  Translated using Weblate (Russian)

Currently translated at 98.2% (3156 of 3213 strings)

[CI skip]


  Commit: c4a2e1b6f2f8ab87b08858196e50b1043bdc6600
  
https://github.com/phpmyadmin/phpmyadmin/commit/c4a2e1b6f2f8ab87b08858196e50b1043bdc6600
  Author: Weblate 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M prefs_manage.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6


  Commit: 7d2760cec55410762ef6689a4aa314492b305fed
  
https://github.com/phpmyadmin/phpmyadmin/commit/7d2760cec55410762ef6689a4aa314492b305fed
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry for #12362

Signed-off-by: Deven Bansod 


  Commit: 48d599e99b2829a0d294d3ec5a4ac863bef19c92
  
https://github.com/phpmyadmin/phpmyadmin/commit/48d599e99b2829a0d294d3ec5a4ac863bef19c92
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Merge branch 'QA_4_6'

Conflicts:
po/ru.po


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/f6d2804aba1d...48d599e99b28___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 889cd3: Prevent leaving an orphaned file while importing p...

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 889cd31618c86f7f30fcfe5f8e501f94e5e41a3c
  
https://github.com/phpmyadmin/phpmyadmin/commit/889cd31618c86f7f30fcfe5f8e501f94e5e41a3c
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M prefs_manage.php

  Log Message:
  ---
  Prevent leaving an orphaned file while importing preferences

Fix #12362

Signed-off-by: Deven Bansod 


  Commit: f6d2804aba1d1dbbb0dd8cfac031bc16f30bc936
  
https://github.com/phpmyadmin/phpmyadmin/commit/f6d2804aba1d1dbbb0dd8cfac031bc16f30bc936
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M prefs_manage.php

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/262eb1acf728...f6d2804aba1d___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 2fdb15: Replace call to an old and unavailable function

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 2fdb15c36ef8a9a6d0622c4f1435104d56cc2dc8
  
https://github.com/phpmyadmin/phpmyadmin/commit/2fdb15c36ef8a9a6d0622c4f1435104d56cc2dc8
  Author: Deven Bansod 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M libraries/replication.inc.php

  Log Message:
  ---
  Replace call to an old and unavailable function

Signed-off-by: Deven Bansod 


  Commit: 593cbd271f3e5f78b3bc6e9cf11fbff067032fbe
  
https://github.com/phpmyadmin/phpmyadmin/commit/593cbd271f3e5f78b3bc6e9cf11fbff067032fbe
  Author: Deven Bansod 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M po/ckb.po
M po/da.po
M po/id.po
M po/pt.po
M po/ro.po
M po/ta.po
M po/vi.po

  Log Message:
  ---
  Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/5ded636281d5...593cbd271f3e___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 6f2de0: Translated using Weblate (Interlingua)

2016-10-12 Thread Weblate
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 6f2de06884cc0bf9970a067c3659ab668ea4f53f
  
https://github.com/phpmyadmin/phpmyadmin/commit/6f2de06884cc0bf9970a067c3659ab668ea4f53f
  Author: Giovanni Sora 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M po/ia.po

  Log Message:
  ---
  Translated using Weblate (Interlingua)

Currently translated at 74.0% (2385 of 3219 strings)

[CI skip]


  Commit: 1bd6d13847059867db359a49b934a86929ae1c1f
  
https://github.com/phpmyadmin/phpmyadmin/commit/1bd6d13847059867db359a49b934a86929ae1c1f
  Author: Weblate 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Log Message:
  ---
  Merge remote-tracking branch 'origin/master'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/31221e666c79...1bd6d1384705___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 2fdb15: Replace call to an old and unavailable function

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 2fdb15c36ef8a9a6d0622c4f1435104d56cc2dc8
  
https://github.com/phpmyadmin/phpmyadmin/commit/2fdb15c36ef8a9a6d0622c4f1435104d56cc2dc8
  Author: Deven Bansod 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M libraries/replication.inc.php

  Log Message:
  ---
  Replace call to an old and unavailable function

Signed-off-by: Deven Bansod 


  Commit: 593cbd271f3e5f78b3bc6e9cf11fbff067032fbe
  
https://github.com/phpmyadmin/phpmyadmin/commit/593cbd271f3e5f78b3bc6e9cf11fbff067032fbe
  Author: Deven Bansod 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M po/ckb.po
M po/da.po
M po/id.po
M po/pt.po
M po/ro.po
M po/ta.po
M po/vi.po

  Log Message:
  ---
  Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6


  Commit: 31221e666c79cddd3e8bf62172e1fa1e7d4dc8fc
  
https://github.com/phpmyadmin/phpmyadmin/commit/31221e666c79cddd3e8bf62172e1fa1e7d4dc8fc
  Author: Deven Bansod 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Log Message:
  ---
  Merge branch 'QA_4_6'

Conflicts:
libraries/replication.inc.php


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/8ee14c065ab5...31221e666c79___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/website] 701909: Use https URL for git

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/website
  Commit: 701909829ea0119340f8c618a15a7efbfa1b2f89
  
https://github.com/phpmyadmin/website/commit/701909829ea0119340f8c618a15a7efbfa1b2f89
  Author: Michal Čihař 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M pmaweb/templates/_gitdl.html

  Log Message:
  ---
  Use https URL for git

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 88f0b6: Translated using Weblate (Interlingua)

2016-10-12 Thread Weblate
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 88f0b6c99dfa4ada5a231e3299e8fac8c894fe0a
  
https://github.com/phpmyadmin/phpmyadmin/commit/88f0b6c99dfa4ada5a231e3299e8fac8c894fe0a
  Author: Giovanni Sora 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M po/ia.po

  Log Message:
  ---
  Translated using Weblate (Interlingua)

Currently translated at 73.9% (2371 of 3206 strings)

[CI skip]


  Commit: 5fa394b12b166c4eae9fb09195bf8c61e6eb40f9
  
https://github.com/phpmyadmin/phpmyadmin/commit/5fa394b12b166c4eae9fb09195bf8c61e6eb40f9
  Author: Weblate 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M libraries/replication.inc.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/593cbd271f3e...5fa394b12b16___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 0e0fdf: Translated using Weblate (Chinese (China))

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 0e0fdf985a29d2f20f3c115e748a6d8becc19eaa
  
https://github.com/phpmyadmin/phpmyadmin/commit/0e0fdf985a29d2f20f3c115e748a6d8becc19eaa
  Author: an wei 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M po/zh_CN.po

  Log Message:
  ---
  Translated using Weblate (Chinese (China))

Currently translated at 88.0% (2824 of 3206 strings)

[CI skip]


  Commit: cc161ba3107b935808c9550728c337ce3de32090
  
https://github.com/phpmyadmin/phpmyadmin/commit/cc161ba3107b935808c9550728c337ce3de32090
  Author: Dadan Setia 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M po/id.po

  Log Message:
  ---
  Translated using Weblate (Indonesian)

Currently translated at 68.8% (2207 of 3206 strings)

[CI skip]


  Commit: b9adbff762a3fcf3f20e5a2fb0caad9f9ca001e0
  
https://github.com/phpmyadmin/phpmyadmin/commit/b9adbff762a3fcf3f20e5a2fb0caad9f9ca001e0
  Author: Weblate 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M libraries/sql.lib.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6


  Commit: 6a53b89cb7fa9e74ec05e04654242e3368122d00
  
https://github.com/phpmyadmin/phpmyadmin/commit/6a53b89cb7fa9e74ec05e04654242e3368122d00
  Author: Deven Bansod 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M libraries/server_privileges.lib.php

  Log Message:
  ---
  Escape database name properly to be used in MySQL wildcard statements

Fix #12602

Signed-off-by: Deven Bansod 


  Commit: c202b7a87ce0318e848faa6e5d8a24f3f1e9313f
  
https://github.com/phpmyadmin/phpmyadmin/commit/c202b7a87ce0318e848faa6e5d8a24f3f1e9313f
  Author: Deven Bansod 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M po/id.po
M po/zh_CN.po

  Log Message:
  ---
  Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6


  Commit: 9419526304ddda1c9387bea924ad52561076b485
  
https://github.com/phpmyadmin/phpmyadmin/commit/9419526304ddda1c9387bea924ad52561076b485
  Author: Deven Bansod 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M libraries/server_privileges.lib.php

  Log Message:
  ---
  Merge branch 'QA_4_6'

Conflicts:
po/id.po
po/zh_CN.po


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/be1adf18e456...9419526304dd___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/website] 1dbfff: Move sponsor to Bronze level

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/website
  Commit: 1dbfff799e16f4b805e524a7c27b84595496279d
  
https://github.com/phpmyadmin/website/commit/1dbfff799e16f4b805e524a7c27b84595496279d
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
R pmaweb/static/images/dailyfantasycafe_250x23.png
M pmaweb/templates/sponsors.html

  Log Message:
  ---
  Move sponsor to Bronze level

New conditions apply, $1000 yearly is now Bronze level.

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/sql-parser] 7f4702: Add parsing of CASE Expressions

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/sql-parser
  Commit: 7f4702adeab4a852ffc724971a601e28668fa6fe
  
https://github.com/phpmyadmin/sql-parser/commit/7f4702adeab4a852ffc724971a601e28668fa6fe
  Author: Deven Bansod 
  Date:   2016-09-25 (Sun, 25 Sep 2016)

  Changed paths:
A src/Components/CaseExpression.php
M src/Components/ExpressionArray.php

  Log Message:
  ---
  Add parsing of CASE Expressions

Fix phpmyadmin/phpmyadmin#12100

Signed-off-by: Deven Bansod 


  Commit: 9da859827b973babb6c856d91d36a3dd5f101c05
  
https://github.com/phpmyadmin/sql-parser/commit/9da859827b973babb6c856d91d36a3dd5f101c05
  Author: Deven Bansod 
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
M src/Components/CaseExpression.php
A tests/Components/CaseExpressionTest.php
M tests/Parser/SelectStatementTest.php
A tests/data/parser/parseSelectCase1.in
A tests/data/parser/parseSelectCase1.out
A tests/data/parser/parseSelectCase2.in
A tests/data/parser/parseSelectCase2.out
A tests/data/parser/parseSelectCaseErr1.in
A tests/data/parser/parseSelectCaseErr1.out
A tests/data/parser/parseSelectCaseErr2.in
A tests/data/parser/parseSelectCaseErr2.out
A tests/data/parser/parseSelectCaseErr3.in
A tests/data/parser/parseSelectCaseErr3.out
A tests/data/parser/parseSelectCaseErr4.in
A tests/data/parser/parseSelectCaseErr4.out

  Log Message:
  ---
  Fix some issue with error reports and added testcases

Signed-off-by: Deven Bansod 


  Commit: f601f88fdb9df129a05d144d8df8cd3102449a17
  
https://github.com/phpmyadmin/sql-parser/commit/f601f88fdb9df129a05d144d8df8cd3102449a17
  Author: Deven Bansod 
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
M src/Components/CaseExpression.php

  Log Message:
  ---
  Fix declaration to be same as parentClass

Signed-off-by: Deven Bansod 


  Commit: 30d17101c898361c958815e0233754e182f6b5b7
  
https://github.com/phpmyadmin/sql-parser/commit/30d17101c898361c958815e0233754e182f6b5b7
  Author: Deven Bansod 
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
M src/Components/CaseExpression.php

  Log Message:
  ---
  Remove author tag as per master

Signed-off-by: Deven Bansod 


  Commit: f15156756cdbb8c00c4f1d22fb198e6e4403986d
  
https://github.com/phpmyadmin/sql-parser/commit/f15156756cdbb8c00c4f1d22fb198e6e4403986d
  Author: Deven Bansod 
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
M src/Components/CaseExpression.php
M tests/Components/CaseExpressionTest.php
M tests/Parser/SelectStatementTest.php
M tests/data/parser/parseSelectCase2.in
M tests/data/parser/parseSelectCase2.out
A tests/data/parser/parseSelectCase3.in
A tests/data/parser/parseSelectCase3.out
A tests/data/parser/parseSelectCase4.in
A tests/data/parser/parseSelectCase4.out
M tests/data/parser/parseSelectCaseErr3.in
M tests/data/parser/parseSelectCaseErr3.out
A tests/data/parser/parseSelectCaseErr5.in
A tests/data/parser/parseSelectCaseErr5.out

  Log Message:
  ---
  Add more tests

Signed-off-by: Deven Bansod 


  Commit: 26087604100d9ce14bf441982180adc8ddbd8a47
  
https://github.com/phpmyadmin/sql-parser/commit/26087604100d9ce14bf441982180adc8ddbd8a47
  Author: Michal Čihař 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
A src/Components/CaseExpression.php
M src/Components/ExpressionArray.php
A tests/Components/CaseExpressionTest.php
M tests/Parser/SelectStatementTest.php
A tests/data/parser/parseSelectCase1.in
A tests/data/parser/parseSelectCase1.out
A tests/data/parser/parseSelectCase2.in
A tests/data/parser/parseSelectCase2.out
A tests/data/parser/parseSelectCase3.in
A tests/data/parser/parseSelectCase3.out
A tests/data/parser/parseSelectCase4.in
A tests/data/parser/parseSelectCase4.out
A tests/data/parser/parseSelectCaseErr1.in
A tests/data/parser/parseSelectCaseErr1.out
A tests/data/parser/parseSelectCaseErr2.in
A tests/data/parser/parseSelectCaseErr2.out
A tests/data/parser/parseSelectCaseErr3.in
A tests/data/parser/parseSelectCaseErr3.out
A tests/data/parser/parseSelectCaseErr4.in
A tests/data/parser/parseSelectCaseErr4.out
A tests/data/parser/parseSelectCaseErr5.in
A tests/data/parser/parseSelectCaseErr5.out

  Log Message:
  ---
  Merge pull request #88 from devenbansod/fix_pma_12100

Add parsing of CASE Expressions


Compare: 
https://github.com/phpmyadmin/sql-parser/compare/c66456f7dcc9...26087604100d___
Git mailing list

[phpMyAdmin Git] [phpmyadmin/localized_docs] 97b091: Translated using Weblate (Indonesian)

2016-10-12 Thread Yogi Erka Julyansa Putra
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: 97b091f02aa0ecb18f3a2600deedc825344f5fe2
  
https://github.com/phpmyadmin/localized_docs/commit/97b091f02aa0ecb18f3a2600deedc825344f5fe2
  Author: Yogi Erka Julyansa Putra 
  Date:   2016-10-02 (Sun, 02 Oct 2016)

  Changed paths:
M po/id.mo
M po/id.po

  Log Message:
  ---
  Translated using Weblate (Indonesian)

Currently translated at 1.1% (27 of 2291 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] a16d1c: Translated using Weblate (Indonesian)

2016-10-12 Thread Deven Bansod
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a16d1c9a6a41336ab751830f3c408613978628a8
  
https://github.com/phpmyadmin/phpmyadmin/commit/a16d1c9a6a41336ab751830f3c408613978628a8
  Author: Yogi Erka Julyansa Putra 
  Date:   2016-10-02 (Sun, 02 Oct 2016)

  Changed paths:
M po/id.po

  Log Message:
  ---
  Translated using Weblate (Indonesian)

Currently translated at 68.8% (2208 of 3206 strings)

[CI skip]


  Commit: ada82985082c0a4be0cb3df06b667345d7202973
  
https://github.com/phpmyadmin/phpmyadmin/commit/ada82985082c0a4be0cb3df06b667345d7202973
  Author: Dragan Zlatkovski 
  Date:   2016-10-02 (Sun, 02 Oct 2016)

  Changed paths:
M po/mk.po

  Log Message:
  ---
  Translated using Weblate (Macedonian)

Currently translated at 17.2% (554 of 3206 strings)

[CI skip]


  Commit: 4fb7d734016c90f49299ce9724f486058b81cdad
  
https://github.com/phpmyadmin/phpmyadmin/commit/4fb7d734016c90f49299ce9724f486058b81cdad
  Author: Deven Bansod 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M libraries/sql.lib.php

  Log Message:
  ---
  Don't assume justBrowsing if there is a Join in the query

Fix #12189

Signed-off-by: Deven Bansod 


  Commit: b2d337814a5f99fda19d0bea392a40c0f1b8e154
  
https://github.com/phpmyadmin/phpmyadmin/commit/b2d337814a5f99fda19d0bea392a40c0f1b8e154
  Author: Deven Bansod 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M po/id.po
M po/mk.po

  Log Message:
  ---
  Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6


  Commit: 77d1adcc473fc8b8fb94afefd8bc6ffbac338f2d
  
https://github.com/phpmyadmin/phpmyadmin/commit/77d1adcc473fc8b8fb94afefd8bc6ffbac338f2d
  Author: Deven Bansod 
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
M libraries/sql.lib.php

  Log Message:
  ---
  Merge branch 'QA_4_6'

Conflicts:
po/id.po
po/mk.po


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/128c0607effc...77d1adcc473f___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] a16d1c: Translated using Weblate (Indonesian)

2016-10-12 Thread Yogi Erka Julyansa Putra
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a16d1c9a6a41336ab751830f3c408613978628a8
  
https://github.com/phpmyadmin/phpmyadmin/commit/a16d1c9a6a41336ab751830f3c408613978628a8
  Author: Yogi Erka Julyansa Putra 
  Date:   2016-10-02 (Sun, 02 Oct 2016)

  Changed paths:
M po/id.po

  Log Message:
  ---
  Translated using Weblate (Indonesian)

Currently translated at 68.8% (2208 of 3206 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/localized_docs] 6b4540: Translated using Weblate (Turkish)

2016-10-12 Thread Burak Yavuz
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: 6b45403033ea013c434148dbea9db82a95d23f48
  
https://github.com/phpmyadmin/localized_docs/commit/6b45403033ea013c434148dbea9db82a95d23f48
  Author: Burak Yavuz 
  Date:   2016-10-02 (Sun, 02 Oct 2016)

  Changed paths:
M po/tr.mo
M po/tr.po

  Log Message:
  ---
  Translated using Weblate (Turkish)

Currently translated at 100.0% (2291 of 2291 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] fd31ed: Translated using Weblate (Kurdish Sorani)

2016-10-12 Thread Ranja Hseen
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: fd31ed27e073fefe870f1c6793aefe38bacd18fc
  
https://github.com/phpmyadmin/phpmyadmin/commit/fd31ed27e073fefe870f1c6793aefe38bacd18fc
  Author: Ranja Hseen 
  Date:   2016-10-09 (Sun, 09 Oct 2016)

  Changed paths:
M po/ckb.po

  Log Message:
  ---
  Translated using Weblate (Kurdish Sorani)

Currently translated at 18.0% (580 of 3206 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/localized_docs] 877c28: Translated using Weblate (Indonesian)

2016-10-12 Thread John Vandenberg
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: 877c28f9f859a4806b1556764be697d0aab0501c
  
https://github.com/phpmyadmin/localized_docs/commit/877c28f9f859a4806b1556764be697d0aab0501c
  Author: John Vandenberg 
  Date:   2016-10-09 (Sun, 09 Oct 2016)

  Changed paths:
M po/id.mo
M po/id.po

  Log Message:
  ---
  Translated using Weblate (Indonesian)

Currently translated at 1.2% (28 of 2291 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/website] edd22b: Move template settings to be compatible with Djang...

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/website
  Commit: edd22b09ed9d776d3bc442248986e00d7bb5aecc
  
https://github.com/phpmyadmin/website/commit/edd22b09ed9d776d3bc442248986e00d7bb5aecc
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M pmaweb/settings.py

  Log Message:
  ---
  Move template settings to be compatible with Django 1.10

Signed-off-by: Michal Čihař 


  Commit: ade8e7f6b36fc9080297aeb6c4d9ea3fa8ea1602
  
https://github.com/phpmyadmin/website/commit/ade8e7f6b36fc9080297aeb6c4d9ea3fa8ea1602
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
A pmaweb/templates/_sponsorship_conditions.html
M pmaweb/templates/donate.html
M pmaweb/templates/sponsors.html

  Log Message:
  ---
  Include sponsorship conditions on donate page as well

It really fits there and people expect to find it there.

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/website/compare/c0e52df35f63...ade8e7f6b36f___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/localized_docs] c07db4: Translated using Weblate (Indonesian)

2016-10-12 Thread Yazied Dhiyauddien
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: c07db4c1a713eaf145e35964066d9038e291f84c
  
https://github.com/phpmyadmin/localized_docs/commit/c07db4c1a713eaf145e35964066d9038e291f84c
  Author: Yazied Dhiyauddien 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M po/id.mo
M po/id.po

  Log Message:
  ---
  Translated using Weblate (Indonesian)

Currently translated at 4.9% (113 of 2291 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/localized_docs] 037d98: Translated using Weblate (Indonesian)

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: 037d980ced999e9381df954377df550d9e485913
  
https://github.com/phpmyadmin/localized_docs/commit/037d980ced999e9381df954377df550d9e485913
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M po/id.mo
M po/id.po

  Log Message:
  ---
  Translated using Weblate (Indonesian)

Currently translated at 4.8% (112 of 2291 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/localized_docs] 942819: Translated using Weblate (Portuguese (Brazil))

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: 9428193e309117a2b723c952e5736b20f4e2ff48
  
https://github.com/phpmyadmin/localized_docs/commit/9428193e309117a2b723c952e5736b20f4e2ff48
  Author: Michal Čihař 
  Date:   2016-10-11 (Tue, 11 Oct 2016)

  Changed paths:
M po/pt_BR.mo
M po/pt_BR.po

  Log Message:
  ---
  Translated using Weblate (Portuguese (Brazil))

Currently translated at 61.5% (1410 of 2291 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/website] c0e52d: Fix super call

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/website
  Commit: c0e52df35f63e54084a04217f0a2dfcc73ac0186
  
https://github.com/phpmyadmin/website/commit/c0e52df35f63e54084a04217f0a2dfcc73ac0186
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M demo/management/commands/fetch_versions.py

  Log Message:
  ---
  Fix super call

We really do not want to use super here. While fixing that also add
missing param from OrderedDict.__setitem__.

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/motranslator] 5316b2: Use better name for variable

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/motranslator
  Commit: 5316b2bdff34d2231b722a5f18b7afc893c0b9b2
  
https://github.com/phpmyadmin/motranslator/commit/5316b2bdff34d2231b722a5f18b7afc893c0b9b2
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M src/Translator.php

  Log Message:
  ---
  Use better name for variable

Signed-off-by: Michal Čihař 


  Commit: 86b6de33a39699d9aacd2daf9eb0b2ad668ba7ed
  
https://github.com/phpmyadmin/motranslator/commit/86b6de33a39699d9aacd2daf9eb0b2ad668ba7ed
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M src/Translator.php

  Log Message:
  ---
  Call plural in camelCase

Signed-off-by: Michal Čihař 


  Commit: 78d9cd2ce0dbad6f8a400bc0faa39714ede47624
  
https://github.com/phpmyadmin/motranslator/commit/78d9cd2ce0dbad6f8a400bc0faa39714ede47624
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M tests/PluralFormulaTest.php

  Log Message:
  ---
  Use camelCase in tests

Signed-off-by: Michal Čihař 


  Commit: 673a19f31b96ce04e14d45b2a39701e7c5b6e9f7
  
https://github.com/phpmyadmin/motranslator/commit/673a19f31b96ce04e14d45b2a39701e7c5b6e9f7
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M tests/PluralTest.php

  Log Message:
  ---
  Use camelCase in tests

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/motranslator/compare/88e3a1c8c646...673a19f31b96___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/simple-math] 8aff47: Clarify examples in README

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/simple-math
  Commit: 8aff47fb7c8706add9816e2208116b23092bc9ea
  
https://github.com/phpmyadmin/simple-math/commit/8aff47fb7c8706add9816e2208116b23092bc9ea
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M README.md

  Log Message:
  ---
  Clarify examples in README

Signed-off-by: Michal Čihař 


  Commit: 7ae59f3129b7a25dc3e7ca5a132bc274e8834b34
  
https://github.com/phpmyadmin/simple-math/commit/7ae59f3129b7a25dc3e7ca5a132bc274e8834b34
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M src/Addition.php
M src/Comparison.php
M src/ComparisonEQ.php
M src/ComparisonGT.php
M src/ComparisonGTE.php
M src/ComparisonLT.php
M src/ComparisonLTE.php
M src/ComparisonNE.php
M src/Division.php
M src/Math.php
M src/Modulo.php
M src/Multiplication.php
M src/Number.php
M src/Operator.php
M src/OperatorAnd.php
M src/OperatorOr.php
M src/Parenthesis.php
M src/Stack.php
M src/Subtraction.php
M src/TerminalExpression.php
M src/Ternary.php
M src/TernaryIntermediate.php
M src/Variable.php
M tests/CalculateTest.php
M tests/bootstrap.php

  Log Message:
  ---
  Add copyright header to the PHP files

Signed-off-by: Michal Čihař 


  Commit: 35051735212aaf885a384d0c7b31ea69a06c508e
  
https://github.com/phpmyadmin/simple-math/commit/35051735212aaf885a384d0c7b31ea69a06c508e
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M src/Math.php

  Log Message:
  ---
  Document most important public API

Signed-off-by: Michal Čihař 


  Commit: a65034696c10bd7148ac48987cba6be564cf799f
  
https://github.com/phpmyadmin/simple-math/commit/a65034696c10bd7148ac48987cba6be564cf799f
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M src/Math.php

  Log Message:
  ---
  Wrap long line

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/simple-math/compare/a11be9ab3838...a65034696c10___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/scripts] 862e4c: Add simple-math to devel docs

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/scripts
  Commit: 862e4ca33dacd3242889e3e32e675370298e788d
  
https://github.com/phpmyadmin/scripts/commit/862e4ca33dacd3242889e3e32e675370298e788d
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M develdocs/build.sh
M develdocs/output/index.html

  Log Message:
  ---
  Add simple-math to devel docs

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/simple-math] 9f0c8a:

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/simple-math
  Commit: 9f0c8a9ecca7b2c6f43fcd16920911071556ab36
  
https://github.com/phpmyadmin/simple-math/commit/9f0c8a9ecca7b2c6f43fcd16920911071556ab36
  Author: ircmaxell 
  Date:   2011-09-21 (Wed, 21 Sep 2011)

  Changed paths:
A Expressions.php
A Math.php
A Stack.php
A TerminalExpression.php
A test.php

  Log Message:
  ---
  


  Commit: 372b4046326eae181c98818cdea6fca5601dec2a
  
https://github.com/phpmyadmin/simple-math/commit/372b4046326eae181c98818cdea6fca5601dec2a
  Author: ircmaxell 
  Date:   2011-09-21 (Wed, 21 Sep 2011)

  Changed paths:
M test.php

  Log Message:
  ---
  


  Commit: cc11fee197c7f30e0bebe54dd4648fe61a8f70b3
  
https://github.com/phpmyadmin/simple-math/commit/cc11fee197c7f30e0bebe54dd4648fe61a8f70b3
  Author: ircmaxell 
  Date:   2011-09-21 (Wed, 21 Sep 2011)

  Changed paths:
M Math.php
M TerminalExpression.php
M test.php

  Log Message:
  ---
  


  Commit: f2743e0689db1af920a51fab74b00f3dad00fb2a
  
https://github.com/phpmyadmin/simple-math/commit/f2743e0689db1af920a51fab74b00f3dad00fb2a
  Author: Anthony Ferrara 
  Date:   2012-10-02 (Tue, 02 Oct 2012)

  Changed paths:
M Math.php

  Log Message:
  ---
  


  Commit: e41bf7a54836e3708feb1e15bfc1d326b8760b96
  
https://github.com/phpmyadmin/simple-math/commit/e41bf7a54836e3708feb1e15bfc1d326b8760b96
  Author: David Remie 
  Date:   2016-07-29 (Fri, 29 Jul 2016)

  Changed paths:
M Expressions.php
M Math.php

  Log Message:
  ---
  


  Commit: 38d6465b9c8b978d5fe2cab4c2a93604a2598b7c
  
https://github.com/phpmyadmin/simple-math/commit/38d6465b9c8b978d5fe2cab4c2a93604a2598b7c
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
A .gitignore
A .travis.yml
R Expressions.php
A LICENSE
R Math.php
A README.md
R Stack.php
R TerminalExpression.php
A codecov.yml
A composer.json
A phpunit.xml
A src/Addition.php
A src/Division.php
A src/Math.php
A src/Multiplication.php
A src/Number.php
A src/Operator.php
A src/Parenthesis.php
A src/Stack.php
A src/Subtraction.php
A src/TerminalExpression.php
R test.php
A tests/CalculateTest.php
A tests/bootstrap.php

  Log Message:
  ---
  Adjusted to use PSR loader

Signed-off-by: Michal Čihař 


  Commit: 08ace392554524a5191efc44392a4b298e4d0d6f
  
https://github.com/phpmyadmin/simple-math/commit/08ace392554524a5191efc44392a4b298e4d0d6f
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M tests/CalculateTest.php

  Log Message:
  ---
  Add more complex test

Signed-off-by: Michal Čihař 


  Commit: e69887b14370a8bed4807ae4ad210897654377e2
  
https://github.com/phpmyadmin/simple-math/commit/e69887b14370a8bed4807ae4ad210897654377e2
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M tests/CalculateTest.php

  Log Message:
  ---
  Add tests for all basic operations

Signed-off-by: Michal Čihař 


  Commit: af84fa59c99f7df6987642c5232cce34de5fec83
  
https://github.com/phpmyadmin/simple-math/commit/af84fa59c99f7df6987642c5232cce34de5fec83
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M README.md
M src/Addition.php
M src/Division.php
M src/Math.php
M src/Multiplication.php
M src/Number.php
M src/Parenthesis.php
M src/Subtraction.php
M src/TerminalExpression.php
A src/Variable.php
M tests/CalculateTest.php

  Log Message:
  ---
  Evaluate variable at exection phase

Doing that at parse time does not allow us to use same parsed expression
for different values.

Signed-off-by: Michal Čihař 


  Commit: fb7f3aa881dd374c324222a6678d9936ceb8904e
  
https://github.com/phpmyadmin/simple-math/commit/fb7f3aa881dd374c324222a6678d9936ceb8904e
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M README.md
M src/TerminalExpression.php
M tests/CalculateTest.php

  Log Message:
  ---
  Allow variables without $ prefix

Signed-off-by: Michal Čihař 


  Commit: 4d7ee596c57052a4ef3f765f6b10db02d3101d94
  
https://github.com/phpmyadmin/simple-math/commit/4d7ee596c57052a4ef3f765f6b10db02d3101d94
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M src/Math.php

  Log Message:
  ---
  Fix exception throwing

Signed-off-by: Michal Čihař 


  Commit: 95a563e2282293a90380b590ff2058caa187687a
  

[phpMyAdmin Git] [phpmyadmin/simple-math] 85b1d1: Define visibility for a method

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/simple-math
  Commit: 85b1d14dbd5a69f4ca6c0177f6f279cef2bd0f97
  
https://github.com/phpmyadmin/simple-math/commit/85b1d14dbd5a69f4ca6c0177f6f279cef2bd0f97
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M src/Comparison.php
M src/ComparisonEQ.php
M src/ComparisonGT.php
M src/ComparisonGTE.php
M src/ComparisonLT.php
M src/ComparisonLTE.php
M src/ComparisonNE.php
M src/OperatorAnd.php
M src/OperatorOr.php

  Log Message:
  ---
  Define visibility for a method

Signed-off-by: Michal Čihař 


  Commit: d385dfb1dc3c108e713a8eb1e3dbe77b6b2d8366
  
https://github.com/phpmyadmin/simple-math/commit/d385dfb1dc3c108e713a8eb1e3dbe77b6b2d8366
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M README.md

  Log Message:
  ---
  Describe motivation for library

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/simple-math/compare/0b7cb504418f...d385dfb1dc3c___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/simple-math] 771f1a: Better variable name

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/simple-math
  Commit: 771f1a6e49bf7e9035e92fd2628b712b6b74a3d9
  
https://github.com/phpmyadmin/simple-math/commit/771f1a6e49bf7e9035e92fd2628b712b6b74a3d9
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M src/Math.php

  Log Message:
  ---
  Better variable name

Signed-off-by: Michal Čihař 


  Commit: 6a8856187957c6e277df1cf43f4a78a7de5a7ccf
  
https://github.com/phpmyadmin/simple-math/commit/6a8856187957c6e277df1cf43f4a78a7de5a7ccf
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M src/TerminalExpression.php

  Log Message:
  ---
  Use case instead of many ifelse statements

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/simple-math/compare/d385dfb1dc3c...6a8856187957___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/simple-math]

2016-10-12 Thread nijel
  Branch: refs/tags/0.1
  Home:   https://github.com/phpmyadmin/simple-math
___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/localized_docs] 01f6e6: Added Indonesian translation

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: 01f6e67e87306ddf64cd4a4ff842ac35f6c9a5e8
  
https://github.com/phpmyadmin/localized_docs/commit/01f6e67e87306ddf64cd4a4ff842ac35f6c9a5e8
  Author: Andika D Riyandi 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M po/id.po

  Log Message:
  ---
  Added Indonesian translation


  Commit: 0e24e174133bf89ce805587ac2f05b5ddb740098
  
https://github.com/phpmyadmin/localized_docs/commit/0e24e174133bf89ce805587ac2f05b5ddb740098
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M po/id.po

  Log Message:
  ---
  Merge pull request #3 from Rizary/rizy

Added Indonesian translation


Compare: 
https://github.com/phpmyadmin/localized_docs/compare/44148594943e...0e24e174133b___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/motranslator] dec371: Document another major change

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/motranslator
  Commit: dec371c7ebf52e617bc99a2332ae0807a78f86ab
  
https://github.com/phpmyadmin/motranslator/commit/dec371c7ebf52e617bc99a2332ae0807a78f86ab
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M CHANGES.md

  Log Message:
  ---
  Document another major change

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c365e7: Do cleanup of simple-math for release as well

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c365e794706d1cb51099c7ae88fd4d15a43380a5
  
https://github.com/phpmyadmin/phpmyadmin/commit/c365e794706d1cb51099c7ae88fd4d15a43380a5
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M scripts/create-release.sh

  Log Message:
  ---
  Do cleanup of simple-math for release as well

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/simple-math] a11be9: Define type methods at TerminalExpression class

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/simple-math
  Commit: a11be9ab3838596991651005fde6e1b6a62a36a4
  
https://github.com/phpmyadmin/simple-math/commit/a11be9ab3838596991651005fde6e1b6a62a36a4
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M src/Operator.php
M src/Parenthesis.php
M src/TerminalExpression.php

  Log Message:
  ---
  Define type methods at TerminalExpression class

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/motranslator] 9172bf: Fix documentation for attribute

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/motranslator
  Commit: 9172bf4d5afae8cc6a9402d622fb1e53189e5e47
  
https://github.com/phpmyadmin/motranslator/commit/9172bf4d5afae8cc6a9402d622fb1e53189e5e47
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M src/Translator.php

  Log Message:
  ---
  Fix documentation for attribute

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/simple-math] 08e597: Simplify class naming

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/simple-math
  Commit: 08e597782891eca158736ff3815e1446d38bd4a0
  
https://github.com/phpmyadmin/simple-math/commit/08e597782891eca158736ff3815e1446d38bd4a0
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
A src/Expression.php
M src/Math.php
M src/Number.php
M src/Operator.php
M src/Parenthesis.php
R src/TerminalExpression.php
M src/TernaryIntermediate.php
M src/Variable.php

  Log Message:
  ---
  Simplify class naming

Signed-off-by: Michal Čihař 


  Commit: 5a35490ecddfc6e22b7a1c38d24d76a3f9ca1033
  
https://github.com/phpmyadmin/simple-math/commit/5a35490ecddfc6e22b7a1c38d24d76a3f9ca1033
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
R src/Addition.php
R src/Comparison.php
R src/ComparisonEQ.php
R src/ComparisonGT.php
R src/ComparisonGTE.php
R src/ComparisonLT.php
R src/ComparisonLTE.php
R src/ComparisonNE.php
R src/Division.php
M src/Expression.php
A src/Expressions/Addition.php
A src/Expressions/Comparison.php
A src/Expressions/ComparisonEQ.php
A src/Expressions/ComparisonGT.php
A src/Expressions/ComparisonGTE.php
A src/Expressions/ComparisonLT.php
A src/Expressions/ComparisonLTE.php
A src/Expressions/ComparisonNE.php
A src/Expressions/Division.php
A src/Expressions/Modulo.php
A src/Expressions/Multiplication.php
A src/Expressions/Number.php
A src/Expressions/Operator.php
A src/Expressions/OperatorAnd.php
A src/Expressions/OperatorOr.php
A src/Expressions/Parenthesis.php
A src/Expressions/Subtraction.php
A src/Expressions/Ternary.php
A src/Expressions/TernaryIntermediate.php
A src/Expressions/Variable.php
R src/Modulo.php
R src/Multiplication.php
R src/Number.php
R src/Operator.php
R src/OperatorAnd.php
R src/OperatorOr.php
R src/Parenthesis.php
R src/Subtraction.php
R src/Ternary.php
R src/TernaryIntermediate.php
R src/Variable.php

  Log Message:
  ---
  Move all expressions to separate namespace

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/simple-math/compare/a65034696c10...5a35490ecddf___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/simple-math] 453b1c: Remove intermediate ternary value

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/simple-math
  Commit: 453b1cf941b88c9b09da3167036f5223a66f724e
  
https://github.com/phpmyadmin/simple-math/commit/453b1cf941b88c9b09da3167036f5223a66f724e
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M src/Expressions/Ternary.php
R src/Expressions/TernaryIntermediate.php

  Log Message:
  ---
  Remove intermediate ternary value

It was causing more problems than benefits.

Signed-off-by: Michal Čihař 


  Commit: 48f8293eb3f26e3cb271b028288ce4eb62d38f50
  
https://github.com/phpmyadmin/simple-math/commit/48f8293eb3f26e3cb271b028288ce4eb62d38f50
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M tests/CalculateTest.php

  Log Message:
  ---
  Test error conditions

Signed-off-by: Michal Čihař 


  Commit: 00e3654865d1b6a63547c117f33f79db6b7fdd0d
  
https://github.com/phpmyadmin/simple-math/commit/00e3654865d1b6a63547c117f33f79db6b7fdd0d
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M src/Expression.php

  Log Message:
  ---
  Remove unused code path

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/simple-math/compare/e0e6feafabcc...00e3654865d1___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/motranslator] a3ceb8: Avoid using eval()

2016-10-12 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/motranslator
  Commit: a3ceb85ad2902994400f702e1f88d76d3d7892b1
  
https://github.com/phpmyadmin/motranslator/commit/a3ceb85ad2902994400f702e1f88d76d3d7892b1
  Author: Michal Čihař 
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
M composer.json
M src/Translator.php
M tests/PluralFormulaTest.php

  Log Message:
  ---
  Avoid using eval()

Use phpmyadin/simple-math for the expression calcualtion instead.

Fixes #5

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


  1   2   >