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

105101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Michal Čihař
5a5406ca99 Merge branch 'QA_4_5' into QA_4_6 2016-02-11 08:23:24 +01:00
Michal Čihař
7b80d2cb3d Merge pull request #11935 from udan11/QA_4_5 
Updated sql-parser
 2016-02-11 08:22:55 +01:00
Michal Čihař
823489908e Document --signoff usage 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-11 08:18:18 +01:00
Weblate
6536e9adce Merge remote-tracking branch 'origin/master' 2016-02-11 00:56:57 +01:00
Rodrigo Moreira
393c237f5f Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.0% (2957 of 3214 strings)

[CI skip]
 2016-02-11 00:56:56 +01:00
Madhura Jayaratne
81b30ac6c6 Merge branch 'QA_4_6' 
Conflicts:
	README
	doc/conf.py
	libraries/Config.php
	po/pt_BR.po
 2016-02-11 10:56:23 +11:00
Madhura Jayaratne
33718de82f Fix #11923 Errors on Structure tab when user only has select access on certain columns 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-11 10:54:36 +11:00
Dan Ungureanu
9389db2916 Added changelog entries for 7e12feba54. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2016-02-10 18:42:11 +02:00
Dan Ungureanu
7e12feba54 Updated sql-parser library to phpmyadmin/sql-parser@38b10f585a (v3.1.0). 
The update includes multiple fixes:

- Fixes #11885. Call to undefined function SqlParser\ctype_alnum()
- Fixes #11879. 4.5.3.1 - NOW() function not recognized by parser
- Fixes #11867. Gracefully handle the DESC statement
- Fixes #11843. Fractional timestamp causes corrupted SQL export
- Fixes #11836. Static analysis error for valid WHERE condition with IF keyword
- Fixes #11800. Syntax Verifier error using REGEXP in SQL statement
- Fixes #11799. Backslashes in comments are being interpreted as escape characters

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2016-02-10 18:35:32 +02:00
Weblate
a6ecc52b3d Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-10 17:15:00 +01:00
Rodrigo Moreira
c06ebed2f8 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.0% (2957 of 3214 strings)

[CI skip]
 2016-02-10 17:15:00 +01:00
Isaac Bennetch
c90d5a7485 Merge remote-tracking branch 'upstream/QA_4_6' into QA_4_6 2016-02-10 11:14:35 -05:00
Isaac Bennetch
d96dc09e99 Correction for 4.6.0-alpha1 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-10 11:13:13 -05:00
Weblate
57c66d1a5e Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-10 16:52:02 +01:00
Rodrigo Moreira
a1316ede8f Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.5% (2944 of 3214 strings)

[CI skip]
 2016-02-10 16:52:02 +01:00
Isaac Bennetch
74ae9ab6d1 4.6.0-alpha release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-10 10:51:15 -05:00
Michal Čihař
b09826ffa3 Clarify contributing instructions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-09 20:39:34 +01:00
Michal Čihař
4a8d77cc69 Merge branch 'QA_4_6' 2016-02-09 16:54:16 +01:00
Michal Čihař
84ed3ae6ca Correctly document what this function expects 
Issue #11930, #11931

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-09 16:53:37 +01:00
Michal Čihař
ef7114d850 Merge branch 'QA_4_5' into QA_4_6 2016-02-09 16:53:06 +01:00
Michal Čihař
afe00d7c10 The storage engine needs to be upper case all the time 
So far the current was uppercase, but the possibly new was lower case
leading to many weird effects.

Fixes #11930

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-09 16:51:20 +01:00
Michal Čihař
46c3f0dc22 Merge branch 'QA_4_6' 2016-02-09 16:44:44 +01:00
Michal Čihař
9016fd6a72 Changelog entry for #11880 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-09 16:44:35 +01:00
Michal Čihař
a6eb9468b1 Merge remote-tracking branch 'origin/pull/11880' into QA_4_6 2016-02-09 16:44:08 +01:00