Commit Graph

113126 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
86adefd460 Remove homebrew/php from Travis CI
homebrew/php was migrated to homebrew/core

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-11 19:15:22 -03:00
Maurício Meneghini Fauth
88022c62e3 Update master to 5.0.0-dev
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-11 16:24:01 -03:00
Weblate
6afb0f6587 Merge remote-tracking branch 'origin/master' 2018-04-11 11:15:42 +02:00
Allan Nordhøy
b579b5c431 Translated using Weblate (Norwegian Bokmål)
Currently translated at 55.6% (1831 of 3288 strings)

[CI skip]
2018-04-11 11:15:40 +02:00
Maurício Meneghini Fauth
f6bf0dba3c Refactor PhpMyAdmin\Rte\General methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-11 06:15:07 -03:00
Maurício Meneghini Fauth
f078ed6b9f Refactor PhpMyAdmin\Rte\Words methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-11 06:15:07 -03:00
Maurício Meneghini Fauth
604441575a Refactor PhpMyAdmin\Rte\RteList methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-11 06:15:07 -03:00
Maurício Meneghini Fauth
67313b5e9d Refactor PhpMyAdmin\Rte\Footer static methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-11 06:15:07 -03:00
Maurício Meneghini Fauth
9775d43b35 Refactor PhpMyAdmin\Rte\Export static methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-11 06:15:07 -03:00
Maurício Meneghini Fauth
c0ed262b11 Refactor PhpMyAdmin\Rte\Triggers static methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-11 06:15:07 -03:00
Maurício Meneghini Fauth
7adffc0bc6 Refactor PhpMyAdmin\Rte\Events static methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-11 06:15:07 -03:00
Master3395
ca906c6b78 Translated using Weblate (Norwegian Bokmål)
Currently translated at 55.6% (1831 of 3288 strings)

[CI skip]
2018-04-11 00:49:03 +02:00
Master3395
27b02fe68b Translated using Weblate (Norwegian Bokmål)
Currently translated at 55.6% (1831 of 3288 strings)

[CI skip]
2018-04-11 00:48:56 +02:00
Yaron Shahrabani
9917c28bad Translated using Weblate (Hebrew)
Currently translated at 24.1% (793 of 3288 strings)

[CI skip]
2018-04-09 14:37:46 +02:00
Yaron Shahrabani
b88d5036f9 Translated using Weblate (Hebrew)
Currently translated at 24.1% (793 of 3288 strings)

[CI skip]
2018-04-09 14:37:38 +02:00
Yaron Shahrabani
b3e070970a Translated using Weblate (Hebrew)
Currently translated at 23.8% (783 of 3288 strings)

[CI skip]
2018-04-08 08:30:36 +02:00
Yaron Shahrabani
82a2bb54a9 Translated using Weblate (Hebrew)
Currently translated at 23.8% (783 of 3288 strings)

[CI skip]
2018-04-08 08:30:29 +02:00
Yaron Shahrabani
8371ab1dae Translated using Weblate (Hebrew)
Currently translated at 23.5% (773 of 3288 strings)

[CI skip]
2018-04-08 08:28:14 +02:00
Yaron Shahrabani
620b36de7d Translated using Weblate (Hebrew)
Currently translated at 23.5% (773 of 3288 strings)

[CI skip]
2018-04-08 08:28:08 +02:00
Weblate
e787b06025 Merge remote-tracking branch 'origin/QA_4_8' into QA_4_8 2018-04-08 06:11:57 +02:00
Vladimir Travkin
1707052e61 Translated using Weblate (Russian)
Currently translated at 98.1% (3228 of 3288 strings)

[CI skip]
2018-04-08 06:11:54 +02:00
Isaac Bennetch
c5e6cfed59 Fix merge conflicts from the release of 4.8.0
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-04-08 00:10:34 -04:00
Isaac Bennetch
22233f72a5 Prepare for 4.8.1-dev
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-04-08 00:07:53 -04:00
Vladimir Travkin
2aaad5b092 Translated using Weblate (Russian)
Currently translated at 98.1% (3228 of 3288 strings)

[CI skip]
2018-04-07 22:23:48 +02:00
Isaac Bennetch
fd02d1686e Removing composer.lock
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-04-07 11:02:37 -04:00
Isaac Bennetch
9d6ac04ae8 Adding composer lock for 4.8.0
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-04-07 10:55:07 -04:00
Isaac Bennetch
c47d3c82dc Prepare release 4.8.0
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-04-07 09:04:25 -04:00
Maurício Meneghini Fauth
b3795da2c6 Merge branch 'QA_4_8' 2018-04-06 18:26:58 -03:00
Maurício Meneghini Fauth
bec8888e7c Revert "Merge pull request #14046 from shucon/login"
This reverts commit 5a1ceef67d, reversing
changes made to 063f380639.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-06 18:07:17 -03:00
Maurício Meneghini Fauth
7a6b3cbba8 Revert "Cannot read property sql_query of undefined: #14104 issue fix (#14105)"
This reverts commit ad86eab974.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-06 18:06:53 -03:00
Maurício Meneghini Fauth
ece9fe84c9 Revert "Remove redundant else"
This reverts commit 8b04a2b2a7.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-06 18:06:20 -03:00
Maurício Meneghini Fauth
ba00b51ad8 Refactor PhpMyAdmin\Rte\Routines methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-06 03:39:13 -03:00
Maurício Meneghini Fauth
03896a7a0a Refactor PhpMyAdmin\Server\Status\Monitor methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-05 16:40:27 -03:00
Maurício Meneghini Fauth
d0c1876552 Refactor PhpMyAdmin\SqlQueryForm static methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-04 17:34:16 -03:00
Isaac Bennetch
c5f21dadc9 Tell browsers to not remember or autocomplete two-factor input.
Fixes #14131

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-04-04 13:43:31 -04:00
ssantos
c5e89ae106 Translated using Weblate (German)
Currently translated at 97.9% (3221 of 3288 strings)

[CI skip]
2018-04-04 13:37:44 +02:00
Maurício Meneghini Fauth
d15dbea63c Refactor PhpMyAdmin\IpAllowDeny::allowDeny() method
Simplifies the method by separating it into two new methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-03 14:28:37 -03:00
Maurício Meneghini Fauth
d23ed47666 Refactor PhpMyAdmin\IpAllowDeny static methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-03 14:06:13 -03:00
Rijas Ahammed PK
d6ca2d249e Enable columns names by default for CSV in issue #14007 solved (#14076)
* Enable columns names by default for CSV

* Improve formatting

Signed-off-by: “Rijas <“Rijas.Ahammed@icfoss.in”>

* Follow formatting standard

Enclosed body of if statement within braces
Add space between if keyword and paranthesis

Signed-off-by: Rijas Ahammed PK <Rijaspk5195@gmail.com>
2018-04-04 22:28:38 -03:00
Isaac Bennetch
434c13606a Merge branch 'QA_4_8' 2018-04-04 13:49:27 -04:00
Isaac Bennetch
0db8d051be Merge commit 'c5e89ae106' 2018-04-04 13:48:41 -04:00
ssantos
a8f839d1ed Translated using Weblate (German)
Currently translated at 97.9% (3221 of 3288 strings)

[CI skip]
2018-04-04 13:37:51 +02:00
Master3395
f73fa84c88 Translated using Weblate (Norwegian Bokmål)
Currently translated at 55.5% (1828 of 3288 strings)

[CI skip]
2018-04-03 18:38:35 +02:00
Børge Holm-Wennberg
9ee3ed9a38 Translated using Weblate (Norwegian Bokmål)
Currently translated at 55.5% (1828 of 3288 strings)

[CI skip]
2018-04-03 18:38:28 +02:00
Sebastian
8273f28202 Translated using Weblate (Norwegian Bokmål)
Currently translated at 55.5% (1828 of 3288 strings)

[CI skip]
2018-04-03 18:38:21 +02:00
Ronny André Løkken
51eb8b6c11 Translated using Weblate (Norwegian Bokmål)
Currently translated at 55.5% (1828 of 3288 strings)

[CI skip]
2018-04-03 18:38:14 +02:00
Master3395
44dde38223 Translated using Weblate (Norwegian Bokmål)
Currently translated at 55.5% (1828 of 3288 strings)

[CI skip]
2018-04-03 18:38:08 +02:00
Yaron Shahrabani
0bd34d8d38 Translated using Weblate (Hebrew)
Currently translated at 23.1% (760 of 3288 strings)

[CI skip]
2018-04-03 17:37:38 +02:00
Yaron Shahrabani
052df448a8 Translated using Weblate (Hebrew)
Currently translated at 23.1% (760 of 3288 strings)

[CI skip]
2018-04-03 17:37:31 +02:00
ssantos
9b17ee23d9 Translated using Weblate (German)
Currently translated at 97.5% (3209 of 3288 strings)

[CI skip]
2018-04-03 12:42:53 +02:00