gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,308 Commits 12 Branches 481 Tags 2.4 GiB
82c369334d
Commit Graph

106308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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ř
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
Michal Čihař
a11a6858d1 Merge remote-tracking branch 'origin/pull/12768' into QA_4_6 2016-12-01 11:49:31 +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ř
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
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ř
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ř
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ř
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ř
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
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
3990a6c311 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-29 04:36:00 +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
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
Michal Čihař
09f56abed6 Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 14:24:39 +01:00
Michal Čihař
068eae7e67 Add missing end of tags 
Fixes #12746

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 13:53:34 +01:00
Jees K Denny
48ebdf1852 Add missing end of meta tags in header 
Issue #12746

Signed-off-by: Jees K Denny <jees.jees5@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 13:51:41 +01:00
Michal Čihař
ad55a6eba8 Avoid listing demo.phpmyadmin.net twice 
Fixes #12744

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 11:39:21 +01:00
Michal Čihař
826a885a90 Fix comment for sql-parser vendor config 
Fixes #12745

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 11:37:09 +01:00
Michal Čihař
10caf5bcae Check if variables are set prior to use 
Issue #12713

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 11:30:14 +01:00
Weblate
9c52bd0724 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-28 10:26:20 +01:00
Marc Delisle
09bfa5fa9d Translated using Weblate (French) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-11-28 10:26:18 +01:00
ncwgf
4d0d648728 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 99.0% (3192 of 3222 strings)

[CI skip]
 2016-11-28 10:26:17 +01:00
Michal Čihař
4d26bec55a Adjust docs to latest Docker image changes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 10:25:05 +01:00
Isaac Bennetch
c1acb3a212 Prepare for 4.6.6-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-11-26 08:01:00 -05:00
Isaac Bennetch
88bbbcf27d Merge remote-tracking branch 'upstream/QA_4_6' into QA_4_6 2016-11-25 23:30:07 -05:00
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
Isaac Bennetch
9970d9d32e Release 4.6.5.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-11-25 22:36:14 -05:00
Michal Čihař
1ec3150e48 Fix parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-25 15:46:13 +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
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
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
Isaac Bennetch
253894e299 Resolve merge conflicts with ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-11-24 11:03:58 -05:00