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

105081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Durgesh
de28889a30 Fix HTML rendering in error message, Issue #11872 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-09 16:10:15 +05:30
Michal Čihař
a6b4735aee Merge branch 'QA_4_6' 2016-02-09 11:01:40 +01:00
Michal Čihař
3ebacb0025 Simplify loading of vendor configuration 
Do it just once and very early, so that all scripts can rely on it being
available.

Fixes autoloading of phpseclib.

Fixes #11914

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-09 11:00:54 +01:00
Michal Čihař
b496cec40c Changelog entry for #11924 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-09 10:55:18 +01:00
Michal Čihař
bf2f02180d Merge pull request #11927 from nijel/nocache-version 
Remove MySQL version caching
 2016-02-09 10:53:07 +01:00
Michal Čihař
adea0dddac Merge branch 'QA_4_6' 2016-02-09 10:49:50 +01:00
Michal Čihař
e83b3d264b Merge commit 'e821a2679302a6176a5da79813431756c529923d' 2016-02-09 10:49:46 +01:00
Weblate
07fab97f80 Merge remote-tracking branch 'origin/master' 2016-02-09 10:49:25 +01:00
Παναγιώτης Παπάζογλου
4cf308233c Translated using Weblate (Greek) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-09 10:49:23 +01:00
Michal Čihař
d3adace4b7 Merge pull request #11928 from bamarni/composer-no-dev 
[doc] Installation with Composer - add --no-dev option
 2016-02-09 10:49:17 +01:00
Bilal Amarni
db270f86fb [doc] Installation with Composer - add --no-dev option 
Otherwise it installs multiple dependencies not needed for
running PhpMyAdmin (phpunit, code sniffer, etc.).

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
 2016-02-09 10:49:10 +01:00
Παναγιώτης Παπάζογλου
e821a26793 Translated using Weblate (Greek) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 21:43:24 +01:00
Weblate
5f1a5ac2ca Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-08 16:43:39 +01:00
Domen
e04461b195 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 16:43:39 +01:00
Seongki Shin
1454dc0da9 Translated using Weblate (Korean) 
Currently translated at 78.0% (2508 of 3214 strings)

[CI skip]
 2016-02-08 16:43:38 +01:00
Giovanni Sora
2f9edad6b7 Translated using Weblate (Interlingua) 
Currently translated at 72.6% (2335 of 3214 strings)

[CI skip]
 2016-02-08 16:43:38 +01:00
Marc-Antoine Thevenet
73368e276b Translated using Weblate (French) 
Currently translated at 99.9% (3213 of 3214 strings)

[CI skip]
 2016-02-08 16:43:37 +01:00
dingo thirteen
53b65d88b4 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 16:43:37 +01:00
Michal Čihař
ac25772f3a Merge branch 'QA_4_6' 2016-02-08 16:43:19 +01:00
Michal Čihař
a501b8f012 Merge commit '9a22f5af69635501de745dc3eeae1e5644415d4a' 2016-02-08 16:43:15 +01:00