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

108189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michal Čihař
b875cf13c5 Merge pull request #12770 from devenbansod/fix_12769 
Fix #12769 : Current user might vary from the actual defined user
 2016-12-02 11:10:05 +01:00
Deven Bansod
7d4f188c72 Current user might vary from the actual defined user 
Use CURRENT_USER instead, which would give the actual user defined in User accounts table

Fix #12769

ChangeLog entry for #12769

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-02 01:07:48 +05:30
Marc Delisle
2a066d9d55 Translated using Weblate (French) 
Currently translated at 100.0% (3232 of 3232 strings)

[CI skip]
 2016-12-01 16:37:21 +01:00
Michal Čihař
0b956b5fc0 Avoid html escaping values used only for comparing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 14:30:40 +01:00
Michal Čihař
e4fa7a0ba5 Clarify that it expects uppercase 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 13:56:07 +01:00
Michal Čihař
abfdb72259 Share code for isMerge method 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 13:55:15 +01:00
Michal Čihař
f5b274c8f0 Fix call to isEngine with multiple parameters 
Issue #12703, #12719

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 13:54:30 +01:00
Michal Čihař
6c939147b9 Rewrite PMA_getTableOptionDiv to use Table for engine flags 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 13:50:35 +01:00
Michal Čihař
58f6e843d0 Make PMA_getTableAltersArray accept table instead of flags 
Issue #12703, #12719

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 13:16:54 +01:00
Michal Čihař
1a99e008b0 Document todo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 13:16:44 +01:00
Michal Čihař
2f97016501 Simplified parameters for PMA_getHtmlForTableMaintenance 
Issue #12703, #12719

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 13:01:42 +01:00
Michal Čihař
ffda016966 Actually make isEngine work 
It did not have the current engine information...

Issue #12703, #12719

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 13:01:12 +01:00
Michal Čihař
1c337f488d Remove no longer used function 
Issue #12703, #12719

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 12:37:11 +01:00
arimourao
791a338946 Implement generic logic for checking table engine 
Fixes #12703

Signed-off-by: arimourao <amlima@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 12:33:45 +01:00
Michal Čihař
6e35113914 Add option to delete settings from browser storage 
Fixes #12247
Issue #12583

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 12:08:05 +01:00
Michal Čihař
46bea42238 Fix indentation 
Issue #12247

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 12:06:49 +01:00
Michal Čihař
9e1b8dc89d Improve spelling 
Issue #12247

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 12:05:46 +01:00
Michal Čihař
e76af4db99 Merge remote-tracking branch 'origin/pull/12583' 2016-12-01 12:03:48 +01:00
Michal Čihař
9772df3518 Merge branch 'QA_4_6' 2016-12-01 11:49:37 +01:00