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

108172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michal Čihař
a11a6858d1 Merge remote-tracking branch 'origin/pull/12768' into QA_4_6 2016-12-01 11:49:31 +01:00
Michal Čihař
f4d8f6c151 Merge branch 'QA_4_6' 2016-12-01 11:36:22 +01:00
Michal Čihař
89dd577d2f Show no local storage warning only on settings tab 
It really makes no sense to show it on every page when we're checking
whether there are settings to import.

Fixes #12699

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 11:35:44 +01:00
Michal Čihař
e61b2135da Fixed SQL export with newlines 
Remove manual escaping where we do proper escaping through MySQL
extension.

Fixes #12765

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 11:02:04 +01:00
Michal Čihař
988c8bf89a Merge branch 'QA_4_6' 2016-12-01 10:56:07 +01:00
Michal Čihař
bb9a762a96 Remove wrong changelog entry 
This was not yet fixed.

Issue #12481

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 10:55:49 +01:00
Deven Bansod
996790c34f Merge branch 'QA_4_6' 2016-11-30 18:45:04 +05:30
Deven Bansod
27bddd66f7 Add ChangeLog entries under appropriate future release 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-30 18:44:01 +05:30
Michal Čihař
3bd6d4c645 Merge branch 'QA_4_6' 2016-11-30 13:38:38 +01:00
Michal Čihař
05a258778f ReCaptcha now works without allow_url_fopen 
Fixes #12588

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 13:37:46 +01:00
Michal Čihař
e3a3f35db3 Merge branch 'QA_4_6' 2016-11-30 13:09:16 +01:00
Michal Čihař
2346b8495a Update tracekit 
This should fix occasional permission problems as this is better handled
in newer version.

Not tested though as I can not reproduce the original issue.

Fixes #12739

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 13:08:40 +01:00
Michal Čihař
d822783f1c Merge branch 'QA_4_6' 2016-11-30 12:48:24 +01:00
Michal Čihař
00f29c7460 Escape URL chars in version as well 
Not that this happens, but just to be sure.

Fixes #12761

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 12:47:53 +01:00
Michal Čihař
bb9b46b149 Remove unused function flipstring 
Fixes #12754

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 12:45:35 +01:00
Michal Čihař
22bedf1893 Clarify comment 
Fixes #12755

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 12:44:31 +01:00
Michal Čihař
21b8b7d0e7 Honor false return value 
Issue #12755

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 12:43:14 +01:00