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

103045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Michal Čihař
7b80d2cb3d Merge pull request #11935 from udan11/QA_4_5 
Updated sql-parser
 2016-02-11 08:22:55 +01: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
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
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
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
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
Pedro Moreira
4b096e6214 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.8% (2979 of 3210 strings)

[CI skip]
 2016-02-05 21:44:57 +01:00
Παναγιώτης Παπάζογλου
3205d145d5 Translated using Weblate (Greek) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-02-04 12:44:33 +01:00
Weblate
ae28c3af64 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-02-01 21:46:51 +01:00
Michal Čihař
eb8ee811a4 Translated using Weblate (Czech) 
Currently translated at 95.8% (3078 of 3210 strings)

[CI skip]
 2016-02-01 21:46:50 +01:00
Michal Čihař
d7d01387bb Merge branch 'MAINT_4_5_4' into QA_4_5 2016-02-01 21:44:18 +01:00
Deven Bansod
c01622171f ChangeLog entry for #11834 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-01-29 23:30:24 +05:30
Isaac Bennetch
1cb223f320 Release 4.5.4.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-01-29 07:47:22 -05:00
Michal Čihař
28ffff7496 Merge pull request #11902 from devenbansod/fix_11834 
Fix issue 11834
 2016-01-29 11:10:15 +01:00
Michal Čihař
92f6764177 Merge pull request #11899 from madhuracj/MAINT_4_5_4 
Fixes for #11892 and #11896 for 4.5 branch
 2016-01-29 11:09:51 +01:00
Deven Bansod
95dd397981 Fix issue 11834 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-01-29 14:16:04 +05:30
Madhura Jayaratne
0b3ac5b557 Fix #11896 Remove hard dependency on phpseclib 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-29 08:36:55 +11:00
Madhura Jayaratne
30ac5b6094 Fix #11892 Error with PMA 4.4.15.3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-29 08:33:42 +11:00
Michal Čihař
900315e4a3 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-28 10:11:11 +01:00
Michal Čihař
8b83e0de27 Use changelog from release notes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-28 10:10:41 +01:00
Michal Čihař
48cd56d8bf Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-28 09:31:40 +01:00
Michal Čihař
0fe7438a05 Document last release 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-28 09:31:14 +01:00
Isaac Bennetch
1d6efadaea Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-01-28 00:42:03 -05:00
Isaac Bennetch
2870a797f3 Release 4.5.4 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-01-27 22:52:02 -05:00
Madhura Jayaratne
77922b22e4 fix #11881 Full processlist lost on refresh 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-27 21:40:20 +11:00
Michal Čihař
c9536a88e9 Move security check behind namespace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-27 11:10:13 +01:00
Michal Čihař
5a3de108f2 Avoid execution outside phpMyAdmin 
This is hacky, but avoids path disclossure on direct access to the
scripts.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-27 09:01:29 +01:00
Michal Čihař
d4b9c22c1f Enable localization before redirect 
This is needed in case of IIS which needs full HTML response.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-27 08:56:24 +01:00
Michal Čihař
60530a1df9 Merge branch 'MAINT_4_5_4' into MAINT_4_5_4-security 2016-01-26 18:27:05 +01:00
Weblate
428b74d297 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-26 18:24:36 +01:00
Stefano Martinelli
df61ec1992 Translated using Weblate (Italian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-26 18:24:35 +01:00
Michal Čihař
9ca4b34446 Add back hhvm, it should work 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 18:24:11 +01:00
Michal Čihař
d21ce68c60 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-26 18:23:54 +01:00
Michal Čihař
6e6b922ee8 Do not run tests with allowed failures on maintenance branch 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 18:23:34 +01:00
Michal Čihař
0cade5712a Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 18:19:07 +01:00
Michal Čihař
c57d3cc7b9 Avoid invalid invocation of SQL parser 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 15:10:18 +01:00
Michal Čihař
76b10187c3 Fallback to default collation connection 
If user supplied wrong string we should gracefully fallback.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 15:00:19 +01:00
Michal Čihař
f83b52737e Do not process subforms with PMA_MINIMUM_COMMON 
In such case needed infrastructure is not loaded, so related code won't
work anyway.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 14:35:08 +01:00
Michal Čihař
447c88f488 Can not use PMA_fatalError when including fails 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 14:30:57 +01:00
Michal Čihař
85ccdbb5b9 Include common libraries in setup 
We use PMA_fatalError which in turn needs Response and related objects.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 14:27:38 +01:00
Michal Čihař
7ffd8d69a1 Merge pull request #5 from phpmyadmin/hash_equals 
Use hash_equals for comparing token
 2016-01-26 09:55:05 +01:00
Madhura Jayaratne
1d885f90bc Merge pull request #8 from phpmyadmin/js-password 
Improve JS password generating
 2016-01-26 12:05:25 +11:00
Madhura Jayaratne
c8615de52a Merge pull request #7 from phpmyadmin/iis-escape 
Escape javascript variable content
 2016-01-26 11:53:51 +11:00
Madhura Jayaratne
8aa28962f1 Merge pull request #6 from phpmyadmin/json-header 
Set correct content type for JSON responses
 2016-01-26 10:57:12 +11:00