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

105172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
5ee4695bbc Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-02-16 19:30:52 +11:00
Madhura Jayaratne
b783d818b5 Use back quotes around table names in confirmation messages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-16 19:29:40 +11:00
Michal Čihař
7c249478dc Remove check for libxml_disable_entity_loader 
It's there since PHP 5.2.11 and we require 5.5.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-16 09:16:55 +01:00
Michal Čihař
d8482d1644 Merge branch 'QA_4_6' 2016-02-16 09:00:56 +01:00
Michal Čihař
9a590a0b76 Merge branch 'QA_4_5' into QA_4_6 2016-02-16 09:00:41 +01:00
Michal Čihař
310fd4b2c1 Fix PHP error on loading invalid XML or ODS file 
Fixes #11967

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-16 09:00:32 +01:00
Madhura Jayaratne
566caa5143 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-02-16 15:28:48 +11:00
Madhura Jayaratne
eb7b999293 Merge branch 'QA_4_6' 2016-02-16 15:28:13 +11:00
Madhura Jayaratne
39559ddca5 Merge branch 'QA_4_5' into QA_4_6 2016-02-16 15:27:46 +11:00
Madhura Jayaratne
a80124d6fd Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 
Conflicts:
	ChangeLog
 2016-02-16 15:26:05 +11:00
Madhura Jayaratne
6e6e40a775 Fix #11964 Undefined index: TABLE_COMMENT in database structure page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-16 15:24:12 +11:00
Michal Čihař
004598527a Document new docker settings 
See https://github.com/phpmyadmin/docker/pull/22

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-15 17:30:26 +01:00
Isaac Bennetch
c856ad73f4 Archive 2015 ChangeLog to history repository 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-15 09:07:21 -05:00
Michal Čihař
c2bfb7449c Merge branch 'QA_4_6' 2016-02-15 08:51:50 +01:00
Michal Čihař
729abb0f3c Merge branch 'QA_4_5' into QA_4_6 2016-02-15 08:51:40 +01:00
Michal Čihař
9204b85fa5 Move isStorageSupported to config.js 
This way it's included in the setup as well where it's used.

Fixes #11959

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-15 08:50:53 +01:00
Dan Ungureanu
f980812f57 Merge branch 'QA_4_6' 2016-02-12 23:47:22 +02:00
Dan Ungureanu
e21fbe665d Merge branch 'QA_4_5' into QA_4_6 2016-02-12 23:46:57 +02:00
Dan Ungureanu
85dd699364 Updated sql-parser to phpmyadmin/sql-parser@66b528dc0f (v3.3.1). 
Fixes #11956. unrecognized keyword interval
Fixes issues regarding field names and aliases.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2016-02-12 23:45:41 +02:00
Michal Čihař
6d73ee1e4d Merge pull request #11957 from ibennetch/release 
Improve release instructions
 2016-02-12 18:20:57 +01:00
Michal Čihař
edd264c91f Remove compatibility code with MySQL < 5.0 
It doesn't seem to be needed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 17:20:44 +01:00
Michal Čihař
fd5dd9ea8f Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 17:09:04 +01:00
Isaac Bennetch
696556b34b Improve release instructions 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-12 11:03:19 -05:00
Michal Čihař
5417dd57dc Merge branch 'QA_4_6' 2016-02-12 15:54:13 +01:00
Michal Čihař
bc2990d5bd Merge branch 'QA_4_5' into QA_4_6 2016-02-12 15:53:59 +01:00
Michal Čihař
3bacb68305 Make sure format is always defined 
Fixes #11955

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 15:53:50 +01:00
Michal Čihař
84ef9083b4 Merge branch 'QA_4_6' 2016-02-12 15:44:50 +01:00
Michal Čihař
c90e01f4ce Merge branch 'QA_4_5' into QA_4_6 2016-02-12 15:44:39 +01:00
Michal Čihař
073b85e1ee Avoid matching of date 
This causes random failures as time can be one second further when
generating output.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 15:43:43 +01:00
Michal Čihař
910813de08 Avoid naming provider as test*, it isn't test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 15:40:41 +01:00
Michal Čihař
c7824a9be3 Remove unused variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 15:39:08 +01:00
Michal Čihař
74174ed6eb Test dynamic javascripts 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 15:38:35 +01:00
Michal Čihař
b5b869419f Avoid nested output buffer problems in test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 15:28:22 +01:00
Michal Čihař
2d47e41084 Remove no longer needed variables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 15:18:21 +01:00
Michal Čihař
86d3d0bc04 Define theme for all tests 
This allows to unify environment.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 15:14:39 +01:00
Michal Čihař
7efc9ea896 Share code for loading sprite data 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 15:08:03 +01:00
Michal Čihař
e304c23d82 Merge branch 'QA_4_6' 2016-02-12 14:49:05 +01:00
Michal Čihař
971e40d839 Optimize PNG images 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 14:47:24 +01:00
Michal Čihař
b805b1d0c2 Let the sprites.lib.php define array instead of function 
This allows us to test this code path without having duplicate function
names.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 14:40:37 +01:00
Michal Čihař
c3d15bcfbe Do not rely on session variable, use passed one 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 14:34:50 +01:00
Michal Čihař
a38e451cc8 Merge branch 'QA_4_6' 2016-02-12 14:29:02 +01:00
Michal Čihař
5fefcdd998 Fix test expectations to match current filename 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 14:28:57 +01:00
Michal Čihař
4d00b58fa2 Merge branch 'QA_4_6' 2016-02-12 14:25:32 +01:00
Michal Čihař
b73855842b Merge branch 'QA_4_5' into QA_4_6 2016-02-12 14:25:24 +01:00
Michal Čihař
2b3ef7ad99 Improve test coverage for getting relative path 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 14:24:49 +01:00
Michal Čihař
9d1a5997cb Correctly handle failing case 
Issue #11953

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 14:24:42 +01:00
Michal Čihař
38aba0406f Use DIRECTORY_SEPARATOR 
The PATH_SEPARATOR is not the right variable...

Issue #11944

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 14:24:36 +01:00
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