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

108208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
28f4ebcc0e Merge branch 'QA_4_6' 2016-12-07 15:54:00 +01:00
Michal Čihař
4df65209a1 Add information about required and suggested extensions to composer.json 
Fixes #12785

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 15:52:55 +01:00
Michal Čihař
0be67f6a73 Merge branch 'QA_4_6' 2016-12-07 10:44:56 +01:00
Michal Čihař
14a1a69a78 Fixed javascript error on new version link 
Fixes #12792

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 10:44:42 +01:00
Michal Čihař
026271f14e Merge branch 'QA_4_6' 2016-12-07 10:17:32 +01:00
Michal Čihař
5d4d8b0fa3 Remove javascript code for manipulating with odd/even classes 
Fixes #12070

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 10:17:15 +01:00
Michal Čihař
f36f61314f Remove odd/even markup 
Issue #12070

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 10:17:15 +01:00
Michal Čihař
2c00f5e8ac Remove odd/even markup from templates 
Issue #12070

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 10:17:15 +01:00
Michal Čihař
7ee88c3f51 Do not use odd/even for test class 
Issue #12070

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 10:17:15 +01:00
Michal Čihař
34c2a373eb Change odd/even styling for print 
Issue #12070

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 10:17:15 +01:00
Weblate
799e8b1697 Merge remote-tracking branch 'origin/master' 2016-12-07 09:43:51 +01:00
Jörn Gorres
c0004f8129 Translated using Weblate (German) 
Currently translated at 99.4% (3215 of 3232 strings)

[CI skip]
 2016-12-07 09:43:49 +01:00
Weblate
108b52f599 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-12-07 09:43:46 +01:00
Jörn Gorres
afb5051fc4 Translated using Weblate (German) 
Currently translated at 99.4% (3205 of 3222 strings)

[CI skip]
 2016-12-07 09:43:44 +01:00
Michal Čihař
168c20909b Merge branch 'QA_4_6' 2016-12-07 09:43:31 +01:00
Michal Čihař
1ae6275be7 Fix wrong parameter to escapeString 
These come from f14cffd

Fixes #12786

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 09:38:57 +01:00
Michal Čihař
7d7ab37aad Avoid duplicate labels 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 11:57:39 +01:00
Michal Čihař
a221ae90c3 Merge branch 'QA_4_6' 2016-12-06 11:17:40 +01:00
Michal Čihař
5273729cf5 Fix path to example configuration 
Fixes #12787

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 11:16:42 +01:00
Michal Čihař
00dd06c0e1 Add composer label to docs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 11:07:18 +01:00
Michal Čihař
d720dbc992 Merge branch 'QA_4_6' 2016-12-06 11:03:01 +01:00
Michal Čihař
9b1e8fb074 Add docker label 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 11:02:55 +01:00
Michal Čihař
f86aca5b80 Merge branch 'QA_4_6' 2016-12-06 10:48:16 +01:00
Michal Čihař
ec9139edef Do not try to run gd based tests if gd extension is not there 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 10:44:06 +01:00
Michal Čihař
18a96f0178 Fix path to tcpdf include 
Otherwise we do not honor vendor configuration.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 10:32:56 +01:00
Michal Čihař
e3641a386b Avoid using hardcoded tcpdf path 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 10:31:50 +01:00
Michal Čihař
e182ba9907 Revert to auto for further tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 10:31:50 +01:00
Michal Čihař
15bac5f512 Flag tests needing network access 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 10:31:50 +01:00
Michal Čihař
79d33084f3 Add validation prior to using object 
Otherwise the test failure is really not obvious.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 10:04:44 +01:00
Michal Čihař
a370a69252 Merge branch 'QA_4_6' 2016-12-06 09:56:01 +01:00
Michal Čihař
e627cf197c Remove not needed includes 
We already include this on bootstrap.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 09:54:54 +01:00
Michal Čihař
b6747d0ad2 Merge branch 'QA_4_6' 2016-12-06 09:48:30 +01:00
Michal Čihař
ce714410ec Use vendor specific path when loading gettext in tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 09:48:02 +01:00
Isaac Bennetch
cf6129df64 ChangeLog updated for 4.6.5.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-12-05 18:47:59 -05:00
Madhura Jayaratne
64b4017a85 Merge branch 'QA_4_6' 2016-12-05 21:51:06 +11:00
Madhura Jayaratne
fe802e1d6a Fix #12780 Format button replaces all text with blank spaces 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-12-05 21:49:23 +11:00
Madhura Jayaratne
93e9ef04f7 Fix #12783 Remove unused PMA_addJSCode function 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-12-05 20:35:13 +11:00
Madhura Jayaratne
23ac9e3e83 Merge branch 'QA_4_6' 2016-12-05 20:31:43 +11:00
Madhura Jayaratne
028998f829 Fix #12784 Remove ctype installation suggestion 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-12-05 20:16:55 +11:00
Michal Čihař
8b9a00d80f Merge branch 'QA_4_6' 2016-12-03 13:45:11 +01:00
Michal Čihař
4f29bbd76a Changelog entry for #12757 and #12777 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-03 13:44:37 +01:00
Michael Zarubin
eeb016bf4d Fix #12757 SQL syntax errror on MariaDB < 10.0.2 in check for mysql password check plugin 
Signed-off-by: Michael Zarubin <mzarubin@gmail.com>
 2016-12-03 13:43:58 +01:00
Deven Bansod
c1e073bd1c Merge branch 'QA_4_6' 2016-12-03 09:39:13 +05:30
Deven Bansod
82c369334d Use user-link instead of control-link to query INFORMATION_SCHEMA.* 
This virtual database is automatically populated based on the privileges of the user.

Issue #12769

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-03 09:37:45 +05:30
Deven Bansod
dabc2394c0 Merge branch 'QA_4_6' 2016-12-03 09:00:43 +05:30
Deven Bansod
43d1b53d76 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 
Conflicts:
	ChangeLog
 2016-12-03 08:59:55 +05:30
Deven Bansod
8b4b64050a ChangeLog for #12778 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-03 08:58:06 +05:30
Deven Bansod
fd231056ac $length can be blank, also precision in DEFAULT NULL is not required 
Fix #12778

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-03 08:54:19 +05:30
Michal Čihař
a34e314952 Reuse getCurrentUser method 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-02 11:12:07 +01:00
Michal Čihař
0fc20266a4 Merge branch 'QA_4_6' 2016-12-02 11:10:55 +01:00