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

105044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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ř
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
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ř
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ř
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ř
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
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ř
29edefae02 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_6 2016-02-08 16:42:51 +01:00
Atul Pratap Singh
5a00545bf8 Add missing teardown 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-02-08 21:06:53 +05:30
Atul Pratap Singh
9b3a037ff4 changelog entry 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-02-08 20:58:37 +05:30
Atul Pratap Singh
aeb69d3fed Merge pull request #11926 from 007durgesh219/Issue#11906 
Fix Loading... banner shows on login screen, Issue #11906
 2016-02-08 20:48:35 +05:30
Kristjan Räts
9a22f5af69 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 14:54:57 +01:00
Domen
f940258e64 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 14:35:36 +01:00
Burak Yavuz
97a9a8bbd8 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 12:25:19 +01:00
Durgesh
59fd4e0efc Fix Loading... banner shows on login screen, Issue #11906 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-08 16:37:30 +05:30
Weblate
65bfc602df Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-08 11:08:30 +01:00
Kristjan Räts
b1174f0b08 Translated using Weblate (Estonian) 
Currently translated at 99.9% (3212 of 3214 strings)

[CI skip]
 2016-02-08 11:08:29 +01:00
Michal Čihař
5b928b9138 Adjust Docker documentation to match current code 
The port has been changed from 8080 to 80 in
https://github.com/phpmyadmin/docker/pull/19

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-08 11:07:41 +01:00
Michal Čihař
de7181653f Correctly handle paths to exact files when setting cookie 
We need to set path to folder not a given file.

Fixes #11916

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-08 09:54:57 +01:00
Michal Čihař
4f6fe19c30 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-08 09:38:28 +01:00
Michal Čihař
bf9bc710c2 Merge branch 'QA_4_5' into QA_4_6 2016-02-08 09:38:01 +01:00
Atul Pratap Singh
9e8bb3bef1 Merge pull request #11925 from zalog/master 
Search and replace with nothing
 2016-02-07 08:20:21 +05:30
Catalin Zalog
271e6d59d9 Search and replace with nothing 
Signed-off-by: Catalin Zalog <catalinzalog@yahoo.com>
 2016-02-07 04:15:32 +02:00
Stefano Martinelli
0a47d2a529 Translated using Weblate (Italian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-02-06 12:44:44 +01:00