gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,232 Commits 12 Branches 481 Tags 2.4 GiB
2e71a0781b
Commit Graph

109232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
2e71a0781b Merge remote-tracking branch 'origin/master' 2017-03-13 10:07:37 +01:00
Володимир
02ea2d701a Translated using Weblate (Ukrainian) 
Currently translated at 96.4% (3082 of 3194 strings)

[CI skip]
 2017-03-13 10:07:37 +01:00
Michal Čihař
09e0ed8d0d Merge branch 'QA_4_7' 2017-03-13 10:07:03 +01:00
Michal Čihař
fc777c99a8 Split documentation for ShowChgPassword, ShowCreateDb and ShowPhpInfo 
It really doesn't make much sense to have them all covered by one text.

Fixes #13069

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-13 10:06:25 +01:00
Michal Čihař
aae3f7de71 Merge branch 'QA_4_7' 2017-03-13 09:58:32 +01:00
Michal Čihař
332899b968 Remove unused variable 
Introduced by pr #13053

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-13 09:58:03 +01:00
Michal Čihař
1235be161a Merge branch 'QA_4_7' 2017-03-13 09:56:47 +01:00
Michal Čihař
eccdb30ebb Changelog entry for #13053 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-13 09:56:28 +01:00
Raghuram
e54d5085d9 Fix broken links in setup page 
Signed-off-by: Raghuram Vadapalli<raghuram.vadapalli@research.iiit.ac.in>
 2017-03-13 09:55:31 +01:00
Michal Čihař
bf9223cc8f Merge branch 'QA_4_7' 2017-03-13 09:55:00 +01:00
Michal Čihař
7bd211a165 Merge pull request #13070 from Fenn-CS/master 
Changed button string in optional actions -table structures
 2017-03-13 09:42:36 +01:00
Weblate
15c6e4b429 Merge remote-tracking branch 'origin/master' 2017-03-13 09:19:06 +01:00
Володимир
fcacbb2a74 Translated using Weblate (Ukrainian) 
Currently translated at 96.5% (3083 of 3194 strings)

[CI skip]
 2017-03-13 09:19:06 +01:00
Weblate
a31c41dbcd Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-13 09:19:01 +01:00
Володимир
6fa7bbacd2 Translated using Weblate (Ukrainian) 
Currently translated at 96.5% (3081 of 3192 strings)

[CI skip]
 2017-03-13 09:19:01 +01:00
Michal Čihař
562d37a351 Merge branch 'QA_4_7' 2017-03-13 09:18:42 +01:00
Michal Čihař
5d18e0bbe9 Changelog entry for #13054 and #13029 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-13 09:18:37 +01:00
Raghuram
ebc935a915 Fixes retrieving tables names from nested $table_list array in tracking 
Fixes #13029

Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2017-03-13 09:18:31 +01:00
Michal Čihař
da8c1e56cb Merge branch 'QA_4_7' 2017-03-13 08:57:25 +01:00
Володимир
45d8dd39fa Translated using Weblate (Ukrainian) 
Currently translated at 96.3% (3078 of 3194 strings)

[CI skip]
 2017-03-13 08:57:04 +01:00
Stefano Martinelli
7c803ae898 Translated using Weblate (Italian) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-13 08:57:02 +01:00
mao
77c8fc56dc Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-13 08:57:00 +01:00
Xavier Navarro
0b3195a6f1 Translated using Weblate (Catalan) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-13 08:56:59 +01:00
Володимир
ddb772c95d Translated using Weblate (Ukrainian) 
Currently translated at 96.3% (3076 of 3192 strings)

[CI skip]
 2017-03-13 08:56:38 +01:00
Stefano Martinelli
ec5871b73e Translated using Weblate (Italian) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-03-13 08:36:29 +01:00
Pietro La Porta
aa1e32170a Translated using Weblate (Italian) 
Currently translated at 99.9% (3190 of 3192 strings)

[CI skip]
 2017-03-13 08:35:34 +01:00
Fenn-CS
485804c8f2 Changed button string in optional actions for table structure from "Improve table structure" to "Normalize" 
Signed-off-by: Fenn-CS <fenn25.fn@gmail.com>
 2017-03-12 23:19:10 +01:00
Xavier Navarro
171a58cc8d Translated using Weblate (Catalan) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-03-12 23:03:38 +01:00
mao
59f4d3e92d Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-03-12 21:46:10 +01:00
dingo thirteen
5cc6856625 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-12 21:27:01 +01:00
Isaac Bennetch
b4c2d2988f Merge pull request #13063 from lem9/patch-2 
Update credits about Marc Delisle
 2017-03-12 12:43:34 -04:00
Weblate
2f19c37323 Merge remote-tracking branch 'origin/master' 2017-03-12 14:50:38 +01:00
Володимир
70fcd77ea8 Translated using Weblate (Ukrainian) 
Currently translated at 96.2% (3075 of 3194 strings)

[CI skip]
 2017-03-12 14:50:38 +01:00
Pietro La Porta
3a53db152f Translated using Weblate (Italian) 
Currently translated at 99.7% (3186 of 3194 strings)

[CI skip]
 2017-03-12 14:50:36 +01:00
F. E Noel Nfebe
77b39264b0 Fix #12984 : Show default collation when creating new DB (#13061) 
Added a default value for database collation dropdown

Fix #12984 

Signed-off-by: Fenn-CS <fenn25.fn@gmail.com>
 2017-03-12 19:20:28 +05:30
Marc Delisle
89030732fe Update credits about Marc Delisle 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2017-03-10 09:34:57 -05:00
Michal Čihař
a87108c96f Merge branch 'QA_4_7' 2017-03-10 11:49:44 +01:00
Michal Čihař
7524c85bad Merge remote-tracking branch 'origin/QA_4_7' 2017-03-10 11:49:41 +01:00
mao
b072897462 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.9% (3191 of 3194 strings)

[CI skip]
 2017-03-10 11:49:14 +01:00
Michal Čihař
e6a3b0eee8 Remove documentation for old MySQL server 
We're supporting 5.5 and newer, while this has been changed in 5.1.

Issue #13062

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-10 11:48:50 +01:00
mao
a1e9c87737 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.9% (3190 of 3192 strings)

[CI skip]
 2017-03-10 11:48:12 +01:00
Michal Čihař
4915fa44a1 Merge branch 'QA_4_7' 2017-03-09 17:09:56 +01:00
Michal Čihař
7e82c9c40c Remove debugging code 
Fixes #13059

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-09 17:09:48 +01:00
Michal Čihař
b1521ecadc Merge branch 'QA_4_7' 2017-03-09 16:30:41 +01:00
Michal Čihař
7569134132 Ignore folders only 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-09 16:30:37 +01:00
Michal Čihař
b96d783574 Ignore new themes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-09 16:29:35 +01:00
Michal Čihař
77e3458092 Merge branch 'QA_4_7' 2017-03-09 16:29:10 +01:00
Michal Čihař
efabbbc363 Merge commit '673e6cf56709980b49164eb21e63e6a5d661bf52' 2017-03-09 16:28:29 +01:00
Michal Čihař
89113241e6 Do keepalive calls for all authentication types 
We want to avoid session expiry in all cases, it makes no sense to limit
this to cookie auth only.

Issue #13022

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-09 16:27:41 +01:00
Isaac Bennetch
80eccb0a6b Update copyright years 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-03-08 11:04:44 -05:00