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

105125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
ebc8e28226 Merge branch 'QA_4_6' 2016-02-12 13:59:59 +01:00
Michal Čihař
4b493988e4 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 13:59:46 +01:00
Michal Čihař
387331ff34 Do not fail getting filename with open_basedir limitations 
The realpath() can also return FALSE, handle it gracefully.

Fixes #11953

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 13:58:44 +01:00
Michal Čihař
aebd3e11d9 Use PATH_SEPARATOR instead of own one 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 13:55:43 +01:00
Michal Čihař
5391fead30 Merge branch 'QA_4_6' 2016-02-12 13:47:12 +01:00
Michal Čihař
0c34cb60a0 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 13:47:04 +01:00
Michal Čihař
53b1f9adcc Silent errors on checking for files and folders 
Fixes #11951
Fixes #11952

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 13:45:04 +01:00
Michal Čihař
add9fdffc9 Merge branch 'QA_4_6' 2016-02-12 12:44:13 +01:00
Michal Čihař
1894e33753 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 12:44:06 +01:00
Michal Čihař
e50a445d17 Define is_ajax_request earlier 
This fixes PHP warning on configuration errors.

Fixes #11950

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 12:43:30 +01:00
Michal Čihař
8fcc943b7e Avoid javascript errors on invalid location hash 
Fixes #11948

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 12:19:26 +01:00
Michal Čihař
bee427991b Merge branch 'QA_4_6' 2016-02-12 11:52:57 +01:00
Michal Čihař
5636189d56 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 11:52:49 +01:00
Michal Čihař
40edb83b3c Correctly store and report file upload errors 
Fixes #11946

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 11:52:37 +01:00
Michal Čihař
8d5e94d1bd Merge branch 'QA_4_6' 2016-02-12 11:19:44 +01:00
Michal Čihař
02bbb57ddb Merge branch 'QA_4_5' into QA_4_6 2016-02-12 11:19:36 +01:00
Michal Čihař
c4fedf7b19 Merge pull request #11938 from ibennetch/known-issues 
Document some known issues
 2016-02-12 11:19:02 +01:00
Michal Čihař
20063dec22 Merge branch 'QA_4_6' 2016-02-12 11:14:04 +01:00
Michal Čihař
f1c9b50a9c Merge branch 'QA_4_5' into QA_4_6 2016-02-12 11:13:57 +01:00
Michal Čihař
b3a1a0c1f0 Use PATH_SEPARATOR for determining path separator 
Fixes error on servers with disabled php_uname

Fixes #11944

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 11:13:07 +01:00
Michal Čihař
055d2be691 Merge branch 'QA_4_6' 2016-02-12 10:45:51 +01:00
Michal Čihař
5042b65398 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 10:45:43 +01:00
Michal Čihař
4534a90b80 Silent warnings when checking for file existance 
Another occurences of file_exists which can be limited by open_basedir.

Issue #11940

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 10:38:47 +01:00
Michal Čihař
641cd2b2ee Merge branch 'QA_4_6' 2016-02-12 10:08:26 +01:00
Michal Čihař
bfe0e8814e Merge branch 'QA_4_5' into QA_4_6 2016-02-12 10:08:07 +01:00
Michal Čihař
5f0aa04560 Silent errors from checking local documentation 
The file_exists can issue error in case of open_basedir restrictions.

Fixes #11940

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 10:06:54 +01:00
Michal Čihař
6566e94914 Correct content type for uploaded error reports 
Fixes #11939

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 10:06:54 +01:00
Madhura Jayaratne
bab1c32687 Merge branch 'QA_4_6' 2016-02-12 19:45:28 +11:00
Madhura Jayaratne
f1dbd56798 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 19:43:25 +11:00
Madhura Jayaratne
04181fb2b9 Fix #11911 Inserts via tbl_change.php in VARBINARY columns does not allow using HEX() and MD5() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-12 19:32:52 +11:00
Weblate
9999a1f6b7 Merge remote-tracking branch 'origin/master' 2016-02-12 08:41:25 +01:00
Jouni Kähkönen
a660a66d4b Translated using Weblate (Finnish) 
Currently translated at 67.6% (2174 of 3214 strings)

[CI skip]
 2016-02-12 08:41:22 +01:00
Weblate
d1451b8bba Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-12 08:41:21 +01:00
Xavier Navarro
a9e8408386 Translated using Weblate (Catalan) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-12 08:41:21 +01:00
Jouni Kähkönen
ab965e320d Translated using Weblate (Finnish) 
Currently translated at 67.6% (2174 of 3214 strings)

[CI skip]
 2016-02-12 08:41:20 +01:00
Xavier Navarro
dc55ba16a8 Translated using Weblate (Catalan) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-12 08:41:19 +01:00
Dan Ungureanu
57e7b6ae27 Merge branch 'QA_4_6' 2016-02-12 09:39:27 +02:00
Dan Ungureanu
c6b3292fe5 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 09:39:01 +02:00
Dan Ungureanu
490325c89d Fixes #11920. Can't disable backquotes in export 
Updated sql-parser to phpmyadmin/sql-parser@de8b3efbbc (v3.2.0).

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2016-02-12 09:37:03 +02:00
Xavier Navarro
9245ac96d0 Translated using Weblate (Catalan) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-11 23:09:55 +01:00
Isaac Bennetch
e2bc11c4ff Document some known issues 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-11 12:00:36 -05:00
Dan Ungureanu
ace5e8960b Merge branch 'QA_4_6' 2016-02-11 16:16:29 +02:00
Dan Ungureanu
1960ab70b0 Merge branch 'QA_4_5' into QA_4_6 2016-02-11 16:14:53 +02:00
Dan Ungureanu
3d196ef57f Fixes #11677. sql-parser and php-gettext collide. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2016-02-11 16:12:28 +02:00
Madhura Jayaratne
8aea0eef0a Merge branch 'QA_4_6' 2016-02-11 21:13:32 +11:00
Madhura Jayaratne
c0f58c0674 Merge branch 'QA_4_5' into QA_4_6 2016-02-11 21:12:29 +11:00
Madhura Jayaratne
59342451ab Fix #11909 Can't insert row into table that contains generated column 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>

Conflicts:
	ChangeLog
 2016-02-11 21:11:16 +11:00
Madhura Jayaratne
3a054c82d0 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 
Conflicts:
	ChangeLog
 2016-02-11 21:05:43 +11:00
Madhura Jayaratne
cab738cbed Fix #11909 Can't insert row into table that contains generated column 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-11 21:02:33 +11:00
Michal Čihař
7cea850fd7 Merge branch 'QA_4_6' 2016-02-11 08:23:42 +01:00