gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,939 Commits 12 Branches 481 Tags 2.4 GiB
92bf0385f2
Commit Graph

107939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
92bf0385f2 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2016-11-24 08:22:31 +05:30
Deven Bansod
1768fb5da3 Fix wrong text in label 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-24 08:21:58 +05:30
Weblate
0c1d485f9d Merge remote-tracking branch 'origin/master' 2016-11-24 03:17:23 +01:00
Marc Delisle
82b85e650c Translated using Weblate (French) 
Currently translated at 99.4% (3215 of 3232 strings)

[CI skip]
 2016-11-24 03:17:21 +01:00
Deven Bansod
8eec21b21b Add tests 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-24 00:20:47 +05:30
Deven Bansod
f9ee9d1ddf Refactor SSL requires div to use template 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-24 00:20:09 +05:30
Deven Bansod
8b7171c969 Adjust tests 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-23 08:41:44 +05:30
Deven Bansod
440efade9b Refactor getHtmlForResourceLimits to use template 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-23 08:41:10 +05:30
Deven Bansod
5688cd4bea Refactor getHtmlForColumnPrivileges to use template 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-22 13:34:36 +05:30
Deven Bansod
a15c22a8d9 Modify test to cover important elements 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-22 10:47:56 +05:30
Deven Bansod
6f1ab31356 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2016-11-22 10:40:20 +05:30
Deven Bansod
ce777aa25c Add test case assertion for getHtmlForUserGroupDialog 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-22 10:40:03 +05:30
Deven Bansod
0f411d04ca Refactor html for choosing user group to use template 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-22 10:18:14 +05:30
Michal Čihař
d04ac775ca Merge remote-tracking branch 'origin/QA_4_6' 2016-11-21 15:18:46 +01:00
Michal Čihař
5ae4fdfcff Update composer dependencies 
Especially switch from 0.x in our own libs to stable versions.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-21 15:18:39 +01:00
Marc Delisle
43134b79f5 Translated using Weblate (French) 
Currently translated at 99.3% (3210 of 3232 strings)

[CI skip]
 2016-11-21 15:18:30 +01:00
Weblate
e95b54a407 Merge remote-tracking branch 'origin/master' 2016-11-18 13:58:04 +01:00
Deven Bansod
7d80129b15 Merge branch 'QA_4_6' 
Conflicts:
	po/ar.po
	po/cs.po
	po/mk.po
 2016-11-18 18:29:20 +05:30
Michal Čihař
da109627a0 Translated using Weblate (Swedish) 
Currently translated at 97.0% (3136 of 3232 strings)

[CI skip]
 2016-11-18 13:58:03 +01:00
Michal Čihař
2f768f3f1c Translated using Weblate (Spanish) 
Currently translated at 98.1% (3173 of 3232 strings)

[CI skip]
 2016-11-18 13:58:03 +01:00
Michal Čihař
ec0196f4e6 Translated using Weblate (Slovak) 
Currently translated at 82.5% (2667 of 3232 strings)

[CI skip]
 2016-11-18 13:58:03 +01:00
Michal Čihař
c91bab4f02 Translated using Weblate (Russian) 
Currently translated at 96.7% (3128 of 3232 strings)

[CI skip]
 2016-11-18 13:58:03 +01:00
Michal Čihař
7bc489e743 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.5% (2990 of 3232 strings)

[CI skip]
 2016-11-18 13:58:02 +01:00
Michal Čihař
fcbd697092 Translated using Weblate (Hungarian) 
Currently translated at 99.3% (3211 of 3232 strings)

[CI skip]
 2016-11-18 13:58:01 +01:00
Michal Čihař
c60ce817ab Translated using Weblate (German) 
Currently translated at 99.4% (3213 of 3232 strings)

[CI skip]
 2016-11-18 13:58:01 +01:00
Michal Čihař
1096743182 Translated using Weblate (Estonian) 
Currently translated at 99.3% (3211 of 3232 strings)

[CI skip]
 2016-11-18 13:58:00 +01:00
Michal Čihař
e1eb8fe799 Translated using Weblate (Danish) 
Currently translated at 95.0% (3073 of 3232 strings)

[CI skip]
 2016-11-18 13:58:00 +01:00
Michal Čihař
e58e52f472 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 98.7% (3191 of 3232 strings)

[CI skip]
 2016-11-18 13:58:00 +01:00
Michal Čihař
e2ba632876 Translated using Weblate (Catalan) 
Currently translated at 99.0% (3201 of 3232 strings)

[CI skip]
 2016-11-18 13:57:59 +01:00
Michal Čihař
b1c8bdf5ff Translated using Weblate (Azerbaijani) 
Currently translated at 52.8% (1707 of 3232 strings)

[CI skip]
 2016-11-18 13:57:59 +01:00
Michal Čihař
eb61848989 Translated using Weblate (Albanian) 
Currently translated at 98.3% (3179 of 3232 strings)

[CI skip]
 2016-11-18 13:57:57 +01:00
Weblate
5008241941 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-18 13:56:35 +01:00
Michal Čihař
e75e67cf34 Translated using Weblate (Swedish) 
Currently translated at 97.6% (3147 of 3222 strings)

[CI skip]
 2016-11-18 13:56:35 +01:00
Deven Bansod
2e3416b2bf Remove unnecessary debug statements 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-18 18:24:19 +05:30
Weblate
002240af4e Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-18 11:01:27 +01:00
Nebojsa Tausanov
32755b40ce Translated using Weblate (Macedonian) 
Currently translated at 17.3% (559 of 3222 strings)

[CI skip]
 2016-11-18 11:01:26 +01:00
Liška
aca19c4396 Translated using Weblate (Czech) 
Currently translated at 93.2% (3003 of 3222 strings)

[CI skip]
 2016-11-18 11:01:25 +01:00
Boussaid Mustafa
a747af078d Translated using Weblate (Arabic) 
Currently translated at 34.0% (1096 of 3222 strings)

[CI skip]
 2016-11-18 11:01:24 +01:00
Michal Čihař
cf7a731ca1 Merge branch 'QA_4_6' 2016-11-18 11:01:10 +01:00
Michal Čihař
53f07e7179 Remove protection against < in HTTP Authorization header 
It really doesn't make sense here as the username can potentionally
contain < anyway and we need to deal with it later (and we do).

Fixes #12710

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-18 11:00:11 +01:00
Michal Čihař
cc961340d9 Remove check for < in Accept-Language header 
It is no longer needed since we do match language against existing ones.

Issue #12710

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-18 10:52:57 +01:00
Weblate
e512a89359 Merge remote-tracking branch 'origin/master' 2016-11-18 10:16:41 +01:00
Nebojsa Tausanov
ef24617811 Translated using Weblate (Macedonian) 
Currently translated at 17.2% (559 of 3232 strings)

[CI skip]
 2016-11-18 10:16:39 +01:00
Boussaid Mustafa
22ceff8a6c Translated using Weblate (Arabic) 
Currently translated at 33.8% (1093 of 3232 strings)

[CI skip]
 2016-11-18 10:16:35 +01:00
Michal Čihař
b74b9214ed Remove no longer needed odd/even classes 
Issue #12070, #12287

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-18 10:14:25 +01:00
Michal Čihař
0349c7c5a3 Merge remote-tracking branch 'origin/pull/12287' 2016-11-18 10:08:02 +01:00
Deven Bansod
6ceaeea125 Merge branch 'QA_4_6' 2016-11-17 09:34:21 +05:30
Deven Bansod
3bced0d02f ChangeLog for #12712 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-17 09:33:43 +05:30
Michal Čihař
483aaa7ee5 Merge branch 'QA_4_6' 2016-11-16 18:15:37 +01:00
Michal Čihař
fab13653a8 Add link to release notes and download on new version notification 
Fixes #12698

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-16 18:15:23 +01:00