Commit Graph

112697 Commits

Author SHA1 Message Date
Isaac Bennetch
733a3f1c0b Merge remote-tracking branch 'origin/master' 2018-02-27 23:14:10 -05:00
Isaac Bennetch
6e22171fa6 Revert version to 4.8.0-dev for ongoing development and error reporting server details
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-02-27 23:04:54 -05:00
Isaac Bennetch
7d1883077b Minor typos in ChangeLog
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-02-27 23:04:53 -05:00
Isaac Bennetch
9787c9c762 Removing composer.lock
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-02-27 23:04:53 -05:00
Isaac Bennetch
31e9a31695 Adding composer lock for 4.8.0-alpha1
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-02-27 23:04:53 -05:00
Isaac Bennetch
032f13bbac Update version number for 4.8.0-alpha1
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-02-27 23:04:53 -05:00
Isaac Bennetch
0664827c3c Fix typo in create-release.sh help
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-02-27 23:04:53 -05:00
Michal Čihař
089dce9af3 Merge branch 'QA_4_7' 2018-02-27 22:35:51 +01:00
Michal Čihař
aac6405016 Translated using Weblate (Polish)
Currently translated at 94.3% (3102 of 3288 strings)

[CI skip]
2018-02-27 22:31:59 +01:00
Michal Čihař
62fc8e24f4 Translated using Weblate (Polish)
Currently translated at 98.6% (3166 of 3208 strings)

[CI skip]
2018-02-27 22:31:30 +01:00
Maurício Meneghini Fauth
056edba397 Merge branch 'QA_4_7' 2018-02-27 18:14:01 -03:00
Maurício Meneghini Fauth
276a569431 Fix double escaping in enum dropdown
Fix #14044

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-27 18:03:24 -03:00
Maurício Meneghini Fauth
0889b52c36 Replace static methods with instance methods
Replace PhpMyAdmin\Sql static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-27 17:39:16 -03:00
Stanisław Krukowski
c77e549339 Translated using Weblate (Polish)
Currently translated at 94.3% (3102 of 3288 strings)

[CI skip]
2018-02-27 16:38:56 +01:00
Stanisław Krukowski
13e7973c4f Translated using Weblate (Polish)
Currently translated at 98.6% (3166 of 3208 strings)

[CI skip]
2018-02-27 16:38:47 +01:00
Aki Kettunen
37e1d9b3cd Translated using Weblate (Finnish)
Currently translated at 66.5% (2189 of 3288 strings)

[CI skip]
2018-02-27 10:37:10 +01:00
Aki Kettunen
b34301220d Translated using Weblate (Finnish)
Currently translated at 69.0% (2216 of 3208 strings)

[CI skip]
2018-02-27 10:37:01 +01:00
Maurício Meneghini Fauth
9901a61324 Replace static methods with instance methods
Replace PhpMyAdmin\UserPassword static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-25 13:37:14 -03:00
Maurício Meneghini Fauth
a862add418 Replace static methods with instance methods
Replace PhpMyAdmin\Operations static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-25 12:43:49 -03:00
Maurício Meneghini Fauth
628107418b
Merge pull request #14042 from mauriciofauth/pmd
Rename PMD to Designer
2018-02-24 19:54:08 -03:00
Maurício Meneghini Fauth
573f516c11 Add changelog entry
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-24 19:19:53 -03:00
Maurício Meneghini Fauth
aa958b5567 Replace pmd* in CSS classes and IDs with designer*
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-24 18:33:10 -03:00
Maurício Meneghini Fauth
e2e9795206 Rename css/pmd.css.php to css/designer.css.php
Rename themes/pmahomme/css/pmd.css.php to themes/pmahomme/css/designer.css.php.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-24 18:16:32 -03:00
Maurício Meneghini Fauth
cbe0fab819 Rename img/pmd directory to img/designer
Rename themes/pmahomme/img/pmd directory to themes/pmahomme/img/designer.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-24 18:09:58 -03:00
Maurício Meneghini Fauth
c7f3d6e4e6 Rename $GLOBALS['PMD'] to $GLOBALS['designer']
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-24 17:45:48 -03:00
Maurício Meneghini Fauth
fcfa31a51f Rename js/pmd directory to js/designer
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-24 16:58:58 -03:00
Maurício Meneghini Fauth
f21bc9668d Replace static methods with instance methods
Replace PhpMyAdmin\Database\Designer\Common static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-24 16:39:53 -03:00
Maurício Meneghini Fauth
7f62eef8a7 Rename PmdCommon to Database\Designer\Common
Rename PhpMyAdmin\PmdCommon to PhpMyAdmin\Database\Designer\Common.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-24 16:14:44 -03:00
Robert Antoni Buj Gelonch
cf1ad5c59f Translated using Weblate (Catalan)
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
2018-02-24 00:34:57 +01:00
Maurício Meneghini Fauth
17bf8b7309 Replace static methods with instance methods
Replaces PhpMyAdmin\UserPreferences static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-23 15:26:02 -03:00
Weblate
69c7720336 Merge remote-tracking branch 'origin/master' 2018-02-23 16:09:29 +01:00
Robert Antoni Buj Gelonch
7beb09431c Translated using Weblate (Catalan)
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]
2018-02-23 16:09:17 +01:00
Maurício Meneghini Fauth
ce42c68823 Fix some coding styles issues
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-23 12:06:54 -03:00
Maurício Meneghini Fauth
92beb1a4f4 Replace static methods with instance methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-22 23:58:41 -03:00
Weblate
a5e473267b Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2018-02-22 23:39:18 +01:00
Weblate
abf2e115e7 Merge remote-tracking branch 'origin/master' 2018-02-22 23:39:16 +01:00
Robert Antoni Buj Gelonch
9e432241d9 Translated using Weblate (Catalan)
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
2018-02-22 23:39:12 +01:00
Robert Antoni Buj Gelonch
47b6722a37 Translated using Weblate (Catalan)
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]
2018-02-22 23:39:07 +01:00
Michal Čihař
b19db94c22 Merge branch 'QA_4_7' 2018-02-22 23:38:38 +01:00
Michal Čihař
3fe1e5a625 Use python 3.6 to build docs
It fixes SNI issues.

Signed-off-by: Michal Čihař <michal@cihar.com>
2018-02-22 23:38:20 +01:00
Michal Čihař
4c3c8f685b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2018-02-22 23:27:05 +01:00
Michal Čihař
7c392a5ee1 Merge branch 'QA_4_7' 2018-02-22 23:17:54 +01:00
Michal Čihař
e1920f10c2 Update linkcheck ignore list
- remove SNI issues as this seems to be fixed
- add pecl.php.net as that is showing timeouts for last weel

Signed-off-by: Michal Čihař <michal@cihar.com>
2018-02-22 23:17:29 +01:00
Weblate
3186442f2a Merge remote-tracking branch 'origin/master' 2018-02-22 23:16:06 +01:00
Steven WdV
9595a5e918 Translated using Weblate (Dutch)
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]
2018-02-22 23:15:54 +01:00
Robert Antoni Buj Gelonch
d850078fb0 Translated using Weblate (Catalan)
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]
2018-02-22 23:15:47 +01:00
Michal Čihař
adf73f145d Merge branch 'QA_4_7' 2018-02-22 23:15:07 +01:00
Weblate
7f3947dc6c Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2018-02-22 23:14:00 +01:00
Robert Antoni Buj Gelonch
082a17dfd8 Translated using Weblate (Catalan)
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
2018-02-22 23:13:55 +01:00
Michal Čihař
c21a9cf51f
Merge pull request #14036 from mauriciofauth/broken-sort
Fix broken sort
2018-02-22 23:13:32 +01:00