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

108147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michal Čihař
eb0dc51800 Use https link 
Issue #12758

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 12:19:12 +01:00
Michal Čihař
8c9f34eb8a Use https for links to dev.mysql.com 
Issue #12758

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 12:18:43 +01:00
Michal Čihař
e41c21c176 Merge branch 'QA_4_6' 2016-11-30 11:54:14 +01:00
Michal Čihař
c0003324c8 Merge remote-tracking branch 'origin/QA_4_6' 2016-11-30 11:54:00 +01:00
Michal Čihař
08b176dc58 Update SQL parser to 3.4.14 
- issue #12762 Fixed parsing of SQL with BINARY function

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 11:53:23 +01:00
Michal Čihař
c1b5687331 Merge pull request #12723 from devenbansod/refactor_plugins_dropdown 
Refactor getHTML for auth plugins dropdown
 2016-11-30 11:38:39 +01:00
pralin
3152c1e4c2 Translated using Weblate (Japanese) 
Currently translated at 70.7% (2280 of 3222 strings)

[CI skip]
 2016-11-29 09:27:34 +01:00
Weblate
6d7bfe2e31 Merge remote-tracking branch 'origin/master' 2016-11-29 04:50:05 +01:00
Deven Bansod
6473f6910a Merge branch 'QA_4_6' 
Conflicts:
	po/ja.po
 2016-11-29 09:21:14 +05:30
pralin
e050cdb8ad Translated using Weblate (Japanese) 
Currently translated at 70.3% (2275 of 3232 strings)

[CI skip]
 2016-11-29 04:50:02 +01:00
Deven Bansod
9fdc05ce38 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-11-29 09:06:57 +05:30
Deven Bansod
1ee52c8e4c ChangeLog for #12760 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-29 09:06:14 +05:30
Weblate
3990a6c311 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-29 04:36:00 +01:00
pralin
996f5a591d Translated using Weblate (Japanese) 
Currently translated at 70.7% (2280 of 3222 strings)

[CI skip]
 2016-11-29 04:35:59 +01:00
Deven Bansod
6baa646c74 Check if the cfgrelation tables are actually set before using them 
Fix #12760

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-29 09:04:32 +05:30
Deven Bansod
17e4e9e5c0 ChangeLog for #12759 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-29 08:54:44 +05:30
Weblate
2d4c88ab15 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-29 04:23:34 +01:00
pralin
b1e14110de Translated using Weblate (Japanese) 
Currently translated at 70.7% (2280 of 3222 strings)

[CI skip]
 2016-11-29 04:23:32 +01:00
Deven Bansod
1b1d68293b Use proper check to verify if index is set in the Request 
Fix #12759

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-29 08:53:00 +05:30
Weblate
d879ecaaa8 Merge remote-tracking branch 'origin/master' 2016-11-29 04:09:13 +01:00
Deven Bansod
a530503c22 Replace call to undefined function by correct call 
Fix #12756

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-29 08:39:32 +05:30
pralin
19d2632f95 Translated using Weblate (Japanese) 
Currently translated at 70.3% (2275 of 3232 strings)

[CI skip]
 2016-11-29 04:09:11 +01:00
Michal Čihař
2d2bc08d6c Remove obsolete comment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 14:25:47 +01:00
Michal Čihař
2a2b52bbec Merge remote-tracking branch 'origin/pull/12721' 2016-11-28 14:25:00 +01:00
Michal Čihař
d3b6d1e7fd Merge branch 'QA_4_6' 2016-11-28 14:24:55 +01:00