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

108064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
73f1007c35 Merge remote-tracking branch 'origin/master' 2016-11-28 05:57:38 +01:00
Deven Bansod
420cb4ff7a Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2016-11-28 10:28:19 +05:30
Marc Delisle
89f2305cb5 Translated using Weblate (French) 
Currently translated at 99.9% (3229 of 3232 strings)

[CI skip]
 2016-11-28 05:57:35 +01:00
ncwgf
7d7c5e6897 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 98.7% (3192 of 3232 strings)

[CI skip]
 2016-11-28 05:57:34 +01:00
Deven Bansod
0a56073acd Adjust tests 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-28 10:27:29 +05:30
Deven Bansod
9e27e02688 Refactor intials row to use template 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-28 10:27:25 +05:30
Carlos Ferreira
7a890b884f Translated using Weblate (French) 
Currently translated at 99.7% (3225 of 3232 strings)

[CI skip]
 2016-11-27 15:32:09 +01:00
Deven Bansod
a3c015b7db Merge branch 'QA_4_6' 2016-11-26 09:52:26 +05:30
Deven Bansod
5fb3539cf2 ChangeLog for #12736 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-26 09:50:10 +05:30
Deven Bansod
a2e9a6cbde Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-11-26 09:48:37 +05:30
Deven Bansod
f8db83c630 Using zero value in input's value makes JS block it even if partitions are not being created 
Use blank value in HTML instead

Fix #12736

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-26 09:14:35 +05:30
Michal Čihař
35c45c3b5f Merge branch 'QA_4_6' 2016-11-25 15:46:21 +01:00
Michal Čihař
1ec3150e48 Fix parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-25 15:46:13 +01:00
Michal Čihař
14d6e2048f Merge branch 'QA_4_6' 2016-11-25 15:42:57 +01:00
Michal Čihař
12f596ceb2 Fix PHP error when mbstring is not installed 
It is still dependency for us, but we should be able to tell user nicely
that it is missing.

Fixes #12734

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-25 15:41:40 +01:00
Michal Čihař
584c4e4b42 Fix syntax in documentation markup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-25 15:37:04 +01:00
Deven Bansod
84c977b2a4 Merge branch 'QA_4_6' 
Conflicts:
	ChangeLog
	README
	doc/conf.py
	libraries/Config.php
	po/cs.po
	po/fr.po
 2016-11-25 18:09:26 +05:30
Deven Bansod
b9ee59500f ChangeLog for #12735 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-25 18:05:01 +05:30
Deven Bansod
a600ff34ff Fix some more instances of wrong arguments 
Issue #12735

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-25 18:03:30 +05:30
Deven Bansod
deeb3e62df Avoid use of improper parameters in escapeString 
Fix #12735

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-25 17:56:31 +05:30
Isaac Bennetch
fb161a7beb Merge remote-tracking branch 'upstream/master' 2016-11-25 01:24:13 -05:00
Isaac Bennetch
1f24e5c755 Merge branch 'master-security' 2016-11-25 01:22:59 -05:00
Weblate
6497f5ab77 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-25 07:16:53 +01:00
ratajs
2c4ffca9e2 Translated using Weblate (Czech) 
Currently translated at 93.2% (3006 of 3222 strings)

[CI skip]
 2016-11-25 07:16:51 +01:00
Isaac Bennetch
b1136b88b1 Prepare for 4.6.6-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-11-25 01:16:37 -05:00
Weblate
80c0b4fd66 Merge remote-tracking branch 'origin/master' 2016-11-25 05:32:44 +01:00
Carlos Ferreira
6b55f1b19c Translated using Weblate (French) 
Currently translated at 99.7% (3225 of 3232 strings)

[CI skip]
 2016-11-25 05:32:42 +01:00
ratajs
96f61e4048 Translated using Weblate (Czech) 
Currently translated at 92.6% (2996 of 3232 strings)

[CI skip]
 2016-11-25 05:32:41 +01:00
Deven Bansod
2cd98b5918 Refactor get html for add user and delete user to use template 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-25 09:41:34 +05:30
Isaac Bennetch
253894e299 Resolve merge conflicts with ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-11-24 11:03:58 -05:00
Isaac Bennetch
5daee71272 4.6.5 release and ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-11-24 11:02:33 -05:00
Carlos Ferreira
637d55bb44 Translated using Weblate (French) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-11-24 14:18:05 +01:00
Marc Delisle
1a27a8eeff Translated using Weblate (French) 
Currently translated at 99.6% (3210 of 3222 strings)

[CI skip]
 2016-11-24 14:11:17 +01:00
Michal Čihař
3059c3021a Do not upload md5 checksums 
See https://github.com/phpmyadmin/scripts/issues/4

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-24 10:18:43 +01:00
Michal Čihař
aa48806e45 Do not generate MD5 checksum 
It's not used anywhere in the website and SHA provides better way to
verify content.

See https://github.com/phpmyadmin/scripts/issues/4

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-24 09:28:34 +01:00
Deven Bansod
faf2b038e6 Refactor html for Global Priv table to use template 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-24 09:03:12 +05:30
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
Marc Delisle
80087a0215 Translated using Weblate (French) 
Currently translated at 99.5% (3207 of 3222 strings)

[CI skip]
 2016-11-21 15:44:44 +01:00