gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,467 Commits 12 Branches 481 Tags 2.4 GiB
8edc20b023
Commit Graph

108467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
8edc20b023 Merge branch 'QA_4_6' 2017-01-02 17:06:36 +01:00
Michal Čihař
0376e599f0 Merge pull request #12853 from ibennetch/commatypo 
Fix incorrect comma in message string
 2017-01-02 17:05:58 +01:00
Michal Čihař
a1e7922c62 Merge pull request #12855 from devenbansod/fix_selenium 
Fix some Selenium tests
 2017-01-02 17:05:15 +01:00
Michal Čihař
607833c4df Clarify Docker link configuration 
Fixes https://github.com/phpmyadmin/docker/issues/103

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-02 16:46:56 +01:00
Michal Čihař
f54f2d3acf Ignore new theme 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-02 16:25:00 +01:00
Michal Čihař
599b09bdd1 Revert "Add PHP 7.2 to test matrix" 
This reverts commit eeac5850db.
 2017-01-02 16:24:45 +01:00
Michal Čihař
eeac5850db Add PHP 7.2 to test matrix 
And expect it to fail for now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-02 16:22:41 +01:00
Michal Čihař
9a9955a410 Document changes for #12799 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-02 16:17:09 +01:00
Michal Čihař
10416615cd Merge remote-tracking branch 'origin/pull/12799' 2017-01-02 16:15:58 +01:00
Michal Čihař
3d65f0ac78 Merge branch 'QA_4_6' 2017-01-02 16:15:37 +01:00
Michal Čihař
5f36fa56c4 Merge remote-tracking branch 'origin/MAINT_4_6_5' into QA_4_6 2017-01-02 16:15:29 +01:00
Michal Čihař
aabf306510 Merge branch 'QA_4_6' 2017-01-02 16:07:59 +01:00
Michal Čihař
78c5072729 Merge remote-tracking branch 'origin/QA_4_6' 2017-01-02 16:07:14 +01:00
Michal Čihař
d018add94b Set MySQL SSL parameters even if key is not set 
User might want to set any of the SSL parameters without needing to set
the key.

Fixes #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-02 16:06:09 +01:00
Rodrigo Felix
6a0d330718 Translated using Weblate (Portuguese) 
Currently translated at 53.6% (1728 of 3222 strings)

[CI skip]
 2016-12-31 21:46:10 +01:00
Rodrigo Felix
f6891e8d8d Translated using Weblate (Portuguese) 
Currently translated at 53.1% (1723 of 3239 strings)

[CI skip]
 2016-12-31 21:46:01 +01:00
Marek Skiba
6316a71595 Translated using Weblate (Polish) 
Currently translated at 81.8% (2638 of 3222 strings)

[CI skip]
 2016-12-31 12:45:50 +01:00
Marek Skiba
86dc33517a Translated using Weblate (Polish) 
Currently translated at 81.1% (2629 of 3239 strings)

[CI skip]
 2016-12-31 12:45:44 +01:00
Ashus
10e93cea0c CRLF fix 
Signed-off-by: Ashus <github.com@ashus.net>
 2016-12-29 19:22:45 +01:00
Ashus
32f3203ed0 Documentation added, default configuration values altered to match default PHP values. 
Signed-off-by: Ashus <github.com@ashus.net>
 2016-12-29 19:17:19 +01:00
Fujiwara Software
ef1473a081 Translated using Weblate (Japanese) 
Currently translated at 71.9% (2319 of 3222 strings)

[CI skip]
 2016-12-29 18:45:55 +01:00
Fujiwara Software
4718a692cf Translated using Weblate (Japanese) 
Currently translated at 71.4% (2313 of 3239 strings)

[CI skip]
 2016-12-29 18:45:49 +01:00
Marc Delisle
ead6de8a2a Translated using Weblate (French) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-29 18:45:04 +01:00
Marc Delisle
9988d39dbc Translated using Weblate (French) 
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
 2016-12-29 18:44:53 +01:00
Deven Bansod
d2fd27c041 Fix few more errors in hover on 'More' 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-29 17:39:22 +05:30
Deven Bansod
6bd1fe4055 Wait for notification to be not present, so that page loads completely 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-29 15:19:56 +05:30
Elias Kosunen
b923c07c1a Translated using Weblate (Finnish) 
Currently translated at 69.1% (2228 of 3222 strings)

[CI skip]
 2016-12-29 00:44:51 +01:00
Lari Oesch
3937abdb55 Translated using Weblate (Finnish) 
Currently translated at 68.6% (2225 of 3239 strings)

[CI skip]
 2016-12-29 00:44:45 +01:00
Deven Bansod
65fe1c7ad6 Fix selenium test related to Database events 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-28 23:20:02 +05:30
Kristjan Räts
081ec07c4d Translated using Weblate (Estonian) 
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
 2016-12-28 12:44:59 +01:00
SD SkyKlouD
a1e46e37b4 Translated using Weblate (Korean) 
Currently translated at 80.6% (2600 of 3222 strings)

[CI skip]
 2016-12-28 00:46:11 +01:00
SD SkyKlouD
55b4f3e2b5 Translated using Weblate (Korean) 
Currently translated at 80.2% (2599 of 3239 strings)

[CI skip]
 2016-12-28 00:46:00 +01:00
Marc Delisle
ed3600b126 Translated using Weblate (French) 
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
 2016-12-27 16:51:47 +01:00
Fujiwara Software
b8c26b74ac Translated using Weblate (Japanese) 
Currently translated at 71.7% (2311 of 3222 strings)

[CI skip]
 2016-12-27 15:45:54 +01:00
Fujiwara Software
61caf2e0af Translated using Weblate (Japanese) 
Currently translated at 71.1% (2305 of 3239 strings)

[CI skip]
 2016-12-27 15:45:48 +01:00
Lari Oesch
60061f82ab Translated using Weblate (Finnish) 
Currently translated at 69.1% (2228 of 3222 strings)

[CI skip]
 2016-12-27 00:41:03 +01:00
Elias Kosunen
bdb339d254 Translated using Weblate (Finnish) 
Currently translated at 69.1% (2228 of 3222 strings)

[CI skip]
 2016-12-27 00:40:42 +01:00
Lari Oesch
41a7bad38d Translated using Weblate (Finnish) 
Currently translated at 69.1% (2228 of 3222 strings)

[CI skip]
 2016-12-27 00:39:38 +01:00
Kristjan Räts
95c1ea129f Translated using Weblate (Estonian) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-26 11:22:00 +01:00
Deven Bansod
34bea12605 Fix create and drop user selenium test 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-26 15:46:34 +05:30
Deven Bansod
7fcbb5ea7d Fix Database create and drop selenium test 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-26 15:46:34 +05:30
ctyzxx
c8c317672d Translated using Weblate (Chinese (China)) 
Currently translated at 87.5% (2820 of 3222 strings)

[CI skip]
 2016-12-26 09:44:23 +01:00
ctyzxx
dec384c8d2 Translated using Weblate (Chinese (China)) 
Currently translated at 86.9% (2815 of 3239 strings)

[CI skip]
 2016-12-26 09:44:18 +01:00
Marco Filipe Ferreira Fidalgo
b4dbefc2ff Translated using Weblate (Portuguese) 
Currently translated at 53.5% (1726 of 3222 strings)

[CI skip]
 2016-12-24 18:45:53 +01:00
Michal Čihař
b168fc5f58 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-12-23 11:47:02 +01:00
Michal Čihař
cd3723de5d Merge branch 'QA_4_6' 2016-12-23 11:46:52 +01:00
Weblate
9afde5746e Merge remote-tracking branch 'origin/master' 2016-12-23 11:46:46 +01:00
Marco Filipe Ferreira Fidalgo
bafe60c5e2 Translated using Weblate (Portuguese) 
Currently translated at 53.1% (1721 of 3239 strings)

[CI skip]
 2016-12-23 11:46:45 +01:00
Michal Čihař
9b5547eae0 Do not modify dictionary while iterating 
Needed for Python 3 compatibility

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-23 11:46:16 +01:00
Michal Čihař
b4704c0284 Translated using Weblate (Romanian) 
Currently translated at 53.2% (1724 of 3239 strings)

[CI skip]
 2016-12-22 15:58:47 +01:00