gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,493 Commits 12 Branches 481 Tags 2.4 GiB
6089849fcc
Commit Graph

104493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
6089849fcc Merge commit '66d7c50bee6986c5ff308bca288c01b673a2f69f' 2016-01-10 07:30:26 -05:00
Weblate
4c482a64d9 Merge remote-tracking branch 'origin/master' 2016-01-10 12:42:55 +01:00
Martin Lacina
77ac017cc9 Translated using Weblate (Slovak) 
Currently translated at 82.9% (2667 of 3217 strings)

[CI skip]
 2016-01-10 12:42:54 +01:00
Kyeong Su Shin
ce228d1eb4 Translated using Weblate (Korean) 
Currently translated at 78.1% (2514 of 3217 strings)

[CI skip]
 2016-01-10 12:42:54 +01:00
Atul Pratap Singh
af7f2aa54b Merge branch 'QA_4_5' 2016-01-10 17:12:24 +05:30
Atul Pratap Singh
5f22b1ed03 Merge commit '3b5ca40' 2016-01-10 17:12:13 +05:30
Atul Pratap Singh
36a63a2498 Revert onload changes due to side effects 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-10 17:05:29 +05:30
Achilles-96
66d7c50bee Fixes #11796 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2016-01-10 14:48:39 +05:30
Marc Delisle
c9b0a2ce4c Translated using Weblate (French) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-01-09 15:57:30 +01:00
Marc Delisle
6fd7fc443d Improve message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-09 07:50:24 -05:00
Marc Delisle
3aeebfa9b0 Merge branch 'QA_4_5' 2016-01-09 07:48:49 -05:00
Weblate
3b5ca40cc4 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-09 13:48:39 +01:00
Giovanni Sora
feb8ef4a19 Translated using Weblate (Interlingua) 
Currently translated at 72.5% (2330 of 3210 strings)

[CI skip]
 2016-01-09 13:48:37 +01:00
Kelvin Lee
36bcb2f64e Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-09 13:48:36 +01:00
Marc Delisle
9e6ba127b0 Improve message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-09 07:48:07 -05:00
Weblate
5e81261119 Merge remote-tracking branch 'origin/master' 2016-01-09 11:10:26 +01:00
Giovanni Sora
4e0ba4c44e Translated using Weblate (Interlingua) 
Currently translated at 72.7% (2340 of 3217 strings)

[CI skip]
 2016-01-09 11:10:24 +01:00
Nijraj Gelani
77c136f043 Translated using Weblate (Gujarati) 
Currently translated at 0.0% (2 of 3217 strings)

[CI skip]
 2016-01-09 11:10:23 +01:00
Παναγιώτης Παπάζογλου
a7d5b6b23b Translated using Weblate (Greek) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-01-09 11:10:23 +01:00
Kelvin Lee
8ff87559ac Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 98.3% (3164 of 3217 strings)

[CI skip]
 2016-01-09 11:10:22 +01:00
Michal Čihař
7ac8c8e8e3 Document PMA_ABSOLUTE_URI 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-09 11:10:14 +01:00
Domen
e5456306ab Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-01-09 02:38:04 +01:00
Burak Yavuz
bd7f28f8f7 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-01-08 18:28:23 +01:00
dingo thirteen
7a2c067528 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-01-08 17:57:32 +01:00
Michal Čihař
6a319c5721 Translated using Weblate (Gujarati) 
Currently translated at 0.0% (1 of 3217 strings)

[CI skip]
 2016-01-08 17:35:53 +01:00
Kristjan Räts
b221090d2f Translated using Weblate (Estonian) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-01-08 17:02:50 +01:00
Michal Čihař
d673feab2e Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-08 16:52:36 +01:00
Michal Čihař
3ecb7605cd Add Gujarati language 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-08 16:50:24 +01:00
Marc Delisle
8ef3213f09 Merge branch 'QA_4_5' 2016-01-08 10:13:26 -05:00
Marc Delisle
b8b58486cc Fixes #11804 Misleading message for configuration storage 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-08 10:13:01 -05:00
Michal Čihař
c6939e9e50 Update jQuery UI to 1.11.4 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-08 13:06:11 +01:00
Michal Čihař
c35d640c3e Document change in browser support 
Fixes #11833

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-08 12:34:23 +01:00
Michal Čihař
5f3875f0c1 Upgrade jQuery to 2.1.4 
Issue #11833

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-08 12:33:22 +01:00
Michal Čihař
aeb8cb62e8 Merge branch 'QA_4_5' 2016-01-08 12:27:12 +01:00
Michal Čihař
72a631bb28 Clarify browser requirements 
We need something which is supported by jQuery.

Issue #11833

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-08 12:11:17 +01:00
Michal Čihař
d03d4eaa19 Remove iecanvas script 
It just provides support for older MSIE versions.

Issue #11833

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-08 12:10:22 +01:00
Weblate
d1325a7dec Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-08 11:37:27 +01:00
Kyeong Su Shin
7e997e3df5 Translated using Weblate (Korean) 
Currently translated at 79.2% (2545 of 3210 strings)

[CI skip]
 2016-01-08 11:37:25 +01:00
Xavier Navarro
eb23fb5862 Translated using Weblate (Catalan) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-08 11:37:24 +01:00
Weblate
175d718c52 Merge remote-tracking branch 'origin/master' 2016-01-08 11:37:23 +01:00
Kyeong Su Shin
d86f9c9eea Translated using Weblate (Korean) 
Currently translated at 78.1% (2514 of 3217 strings)

[CI skip]
 2016-01-08 11:37:21 +01:00
Michal Čihař
135e73b878 Merge branch 'QA_4_5' 2016-01-08 11:36:31 +01:00
Michal Čihař
41758d66c4 Merge commit 'be9236b08828be7ee9bd0f40d6ec1f074b01c706' 2016-01-08 11:35:13 +01:00
Michal Čihař
8ad474dda0 Do not invoke FLUSH PRIVILEGES when server in --skip-grant-tables 
In this case we know the user has all privileges, so there is no need to
check it.

Also FLUSH PRIVILEGES causes --skip-grant-tables to end, making all
previous checks invalid.

Fixes #11828

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-08 11:33:57 +01:00
Xavier Navarro
395bbd6089 Translated using Weblate (Catalan) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-01-08 10:34:37 +01:00
Marc Delisle
4f42679f0d Clarify variables 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-07 09:04:50 -05:00
Weblate
be9236b088 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-07 11:33:44 +01:00
Weblate
2ebb2c9e70 Merge remote-tracking branch 'origin/master' 2016-01-07 11:33:44 +01:00
初音ミク（Siketyan）
d37a477a04 Translated using Weblate (Japanese) 
Currently translated at 66.7% (2146 of 3217 strings)

[CI skip]
 2016-01-07 11:33:43 +01:00
初音ミク（Siketyan）
44046a3d9b Translated using Weblate (Japanese) 
Currently translated at 67.5% (2168 of 3210 strings)

[CI skip]
 2016-01-07 11:33:42 +01:00