gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,904 Commits 12 Branches 481 Tags 2.4 GiB
82a2bb54a9
Commit Graph

112904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
620b36de7d Translated using Weblate (Hebrew) 
Currently translated at 23.5% (773 of 3288 strings)

[CI skip]
 2018-04-08 08:28:08 +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
ssantos
d1d4242561 Translated using Weblate (German) 
Currently translated at 97.5% (3209 of 3288 strings)

[CI skip]
 2018-04-03 12:42:31 +02:00
ssantos
8b9cba600c Translated using Weblate (German) 
Currently translated at 97.5% (3207 of 3288 strings)

[CI skip]
 2018-04-03 12:41:19 +02:00
ssantos
369abe94fe Translated using Weblate (German) 
Currently translated at 97.5% (3207 of 3288 strings)

[CI skip]
 2018-04-03 12:41:12 +02:00
Yaron Shahrabani
fad48cb5c8 Translated using Weblate (Hebrew) 
Currently translated at 22.9% (756 of 3288 strings)

[CI skip]
 2018-04-02 16:39:48 +02:00
Yaron Shahrabani
5b4750ba26 Translated using Weblate (Hebrew) 
Currently translated at 22.9% (756 of 3288 strings)

[CI skip]
 2018-04-02 16:39:40 +02:00
Allan Nordhøy
d3824f2953 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 55.2% (1818 of 3288 strings)

[CI skip]
 2018-04-01 18:39:39 +02:00
Maurício Meneghini Fauth
c73e72e7ca Refactor PhpMyAdmin\Transformations static methods 
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-01 01:34:17 -03:00
Weblate
541924c120 Merge remote-tracking branch 'origin/master' 2018-04-01 02:35:02 +02:00
Allan Nordhøy
165e7aacdb Translated using Weblate (Norwegian Bokmål) 
Currently translated at 55.2% (1818 of 3288 strings)

[CI skip]
 2018-04-01 02:34:57 +02:00
Maurício Meneghini Fauth
1a82d6f0d2 Refactor PhpMyAdmin\Import static methods 
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-31 21:32:18 -03:00
Maurício Meneghini Fauth
2638eb9207 Refactor PhpMyAdmin\Export static methods 
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-31 19:28:25 -03:00
Allan Nordhøy
ba55cfd21e Translated using Weblate (Norwegian Bokmål) 
Currently translated at 55.2% (1818 of 3288 strings)

[CI skip]
 2018-03-31 17:15:29 +02:00
Allan Nordhøy
aade3546b2 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 55.2% (1818 of 3288 strings)

[CI skip]
 2018-03-31 17:15:22 +02:00
Maurício Meneghini Fauth
5f0a7908cb Replace static methods with instance methods 
Replaces PhpMyAdmin\Tracking static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-31 03:35:56 -03:00
Maurício Meneghini Fauth
b6767f4bf8 Replace static methods with instance methods 
Replaces PhpMyAdmin\Server\Privileges static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-31 03:09:45 -03:00
Maurício Meneghini Fauth
4c2511b8c4 Merge branch 'QA_4_8' 2018-03-30 18:48:56 -03:00
Piyush Vijay
d093c66f1f Designer: "Add options" dialog doesn't reset when canceling: #14110 issue fixed (#14117) 
* Designer: "Add options" dialog doesn't reset when canceling: Fix #14110
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* Designer: Add option dialogue error handling needs to be modified Fix #14126
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>
(cherry picked from commit 6700b2d56f)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-30 18:48:02 -03:00
Piyush Vijay
6700b2d56f Designer: "Add options" dialog doesn't reset when canceling: #14110 issue fixed (#14117) 
* Designer: "Add options" dialog doesn't reset when canceling: Fix #14110
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* Designer: Add option dialogue error handling needs to be modified Fix #14126
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>
 2018-03-30 18:45:19 -03:00
Maurício Meneghini Fauth
b2d488b102 Merge branch 'QA_4_8' 2018-03-30 17:52:36 -03:00