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

105112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
5563f3e137 Revert "Remove sql data parameter" 
This reverts commit 84c12c2fdd.
 2016-02-17 10:59:40 +01:00
Michal Čihař
855145988c Revert "Always use local static storage of executed queries" 
This reverts commit ee8f9b0dba.
 2016-02-17 10:59:37 +01:00
Michal Čihař
18f9231d74 Fixed CSV import 
Fixes #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:52:34 +01:00
Michal Čihař
6895a1fc6e Revert "fix_11907" 
This reverts commit bfe30d1261.

It removes the message in many cases where it should be shown.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:49:01 +01:00
Michal Čihař
ee8f9b0dba Always use local static storage of executed queries 
Issue #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:46:23 +01:00
Michal Čihař
84c12c2fdd Remove sql data parameter 
This just makes the SQL import different from others leading to subtle
breakages.

Issue #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:42:14 +01:00
Michal Čihař
06b9a8b6e1 Changelog entry for issue #11907 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:04:56 +01:00
Michal Čihař
9810eab993 Merge remote-tracking branch 'origin/pull/11958' into QA_4_6 2016-02-17 10:01:26 +01:00
Deven Bansod
4962eecfe0 Store analysed privileges in the cache 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-02-17 14:00:36 +05:30
Madhura Jayaratne
ac4143a8c9 Fix #11972 Missing documentation for $cfg['Servers'][$i]['favorite'] and $cfg['NumFavoriteTables'] 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-17 11:22:21 +11:00
Atul Pratap Singh
a7d67642a1 Merge branch 'QA_4_5' into QA_4_6 2016-02-17 00:01:08 +05:30
Atul Pratap Singh
2fdd232873 navigation.js registeronload getting fired on all node clicks, causing reload on all clicks 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-02-16 23:58:21 +05:30
Weblate
50f160363b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-16 10:21:35 +01:00
Michal Čihař
f6572e0fa5 Translated using Weblate (Czech) 
Currently translated at 94.4% (3036 of 3214 strings)

[CI skip]
 2016-02-16 10:21:33 +01:00
Michal Čihař
67b681d63e Merge branch 'QA_4_5' into QA_4_6 2016-02-16 10:21:07 +01:00
Michal Čihař
50af85cf34 Fix export of index comments in SQL 
Fixes #11968

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-16 10:20:09 +01:00
Madhura Jayaratne
25f7f1a6f9 Update to match the namespace usage 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-16 20:03:13 +11:00
Madhura Jayaratne
b050df847e Merge branch 'QA_4_5' into QA_4_6 2016-02-16 19:52:39 +11:00
Madhura Jayaratne
36e3b337de ChangeLog entry for #11969 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-16 19:51:46 +11:00
Madhura Jayaratne
49bfc5b744 Merge branch 'QA_4_5' into QA_4_6 2016-02-16 19:48:38 +11:00
Madhura Jayaratne
7881a461a3 Fix #11969 Missing confirmation while dropping a view in view_operations.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-16 19:47:12 +11: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
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ř
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
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
Piyush
bfe30d1261 fix_11907 
Signed-off-by: Piyush <poush12@gmail.com>
 2016-02-12 22:01:08 +05:30
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ř
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ř
971e40d839 Optimize PNG images 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 14:47:24 +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ř
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ř
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
Michal Čihař
aebd3e11d9 Use PATH_SEPARATOR instead of own one 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 13:55:43 +01:00
Michal Čihař
0c34cb60a0 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 13:47:04 +01:00
Michal Čihař
53b1f9adcc Silent errors on checking for files and folders 
Fixes #11951
Fixes #11952

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 13:45:04 +01:00
Michal Čihař
1894e33753 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 12:44:06 +01:00
Michal Čihař
e50a445d17 Define is_ajax_request earlier 
This fixes PHP warning on configuration errors.

Fixes #11950

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 12:43:30 +01:00
Michal Čihař
8fcc943b7e Avoid javascript errors on invalid location hash 
Fixes #11948

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 12:19:26 +01:00
Michal Čihař
5636189d56 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 11:52:49 +01:00