gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,846 Commits 12 Branches 481 Tags 2.4 GiB
7f9e346a87
Commit Graph

108846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
7f9e346a87 Install tcpdf when building release 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 17:42:34 +01:00
Weblate
a1e4b09049 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-14 17:11:49 +01:00
Siddhesh Rane
7969d60ec7 Translated using Weblate (Hindi) 
Currently translated at 37.8% (1212 of 3199 strings)

[CI skip]
 2017-02-14 17:11:47 +01:00
Michal Čihař
df2571e9a3 Clear interval before reload 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 17:11:36 +01:00
Weblate
268ae1c526 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-14 17:01:25 +01:00
Siddhesh Rane
107da72af5 Translated using Weblate (Hindi) 
Currently translated at 37.7% (1209 of 3199 strings)

[CI skip]
 2017-02-14 17:01:23 +01:00
Michal Čihař
82f13e34d0 Better handle multiple open browser windows 
Calculate session expiry per browser (tracking is based on
sessionStorage which is unique per tab). With this we're able to detect
that there is another window open and actively used and avoid logging it
out by inactive one.

Issue #11231

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 17:00:44 +01:00
Michal Čihař
dc3ef3ce7f Try harder to honor LoginCookieValidity setting 
Even when it is lower than session.gc_maxlifetime we try to keepalive
the session by AJAX.

Fixes #11231

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 16:29:55 +01:00
Michal Čihař
7667689d65 Use more reasonable timeouts for keepalive 
- always update before session expiry
- shorter interval in the end

Fixes #11231

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 15:56:22 +01:00
Weblate
c603141bdd Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-14 15:24:56 +01:00
Siddhesh Rane
bdb29a04d6 Translated using Weblate (Hindi) 
Currently translated at 37.4% (1199 of 3199 strings)

[CI skip]
 2017-02-14 15:24:55 +01:00
Michal Čihař
0b1c182703 Fix nested hidden inputs 
We do not want to inject token there.

Fixes #12999

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 15:24:25 +01:00
Michal Čihař
33a7586f20 Fix typo in TokuDB check 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 14:02:32 +01:00
Kyle Tse
2b6e5f8929 Allow to specify USING for TokuDB index 
Issue #12693

Signed-off-by: Kyle Tse <shtse8@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 14:02:32 +01:00
Weblate
debc40d9d7 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-14 13:55:45 +01:00
Siddhesh Rane
357309f3ea Translated using Weblate (Hindi) 
Currently translated at 37.3% (1196 of 3199 strings)

[CI skip]
 2017-02-14 13:55:44 +01:00
Michal Čihař
fa051ff3e8 Add basic support for TokuDB 
This applies most of https://github.com/phpmyadmin/phpmyadmin/pull/12693
on top of current code base.

- offer correct operations on operations tab
- properly handle counting same as with InnoDB

Fixes #12693

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 13:55:17 +01:00
Michal Čihař
92f59bce77 Check if whole path is set 
Fixes #12953

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 11:53:41 +01:00
Michal Čihař
c86aa9b275 Always show error reporting dialog on top 
Fixes #12958

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 11:51:23 +01:00
Michal Čihař
8f8943abf4 Improved foreign key editor 
- sort numerically with NaturalOrder
- do not add extra empty value on not set foreign keys

Fixes #12976

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 11:27:42 +01:00
Michal Čihař
889ccb6555 Better defaults when creating multi fields foreign key 
It does not make sense to set all fields to one key.

Fixes #12980

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 11:09:57 +01:00
Michal Čihař
e7951f733d List all databses in navigation panel database dropdown 
Fixes #12996

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 11:02:02 +01:00
Michal Čihař
8767499594 Avoid using ARRAY_FILTER_USE_KEY 
As these are not supported on PHP 5.5 and HHVM.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 10:50:03 +01:00
Michal Čihař
600373e9ba Avoid messing up with configuration values having / in keys 
This confuses user configuration as it does use these values while rest
of the code does not. So the setting appears to be active while it does
not actually work.

Fixes #12832

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 10:19:45 +01:00
Michal Čihař
87a2953b78 Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:59:36 +01:00
Michal Čihař
3d8e4b74d0 Fix GIS tests 
- correct order of parameters for assertEquals
- fix expectations for zero values

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:58:58 +01:00
Weblate
0738c2f7e5 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-13 15:31:55 +01:00
Yungu Kim
45c6fb1ab7 Translated using Weblate (Korean) 
Currently translated at 81.9% (2622 of 3199 strings)

[CI skip]
 2017-02-13 15:31:53 +01:00
Michal Čihař
58472a97d2 Fixed javascript error on 3NF normalization 
Fixes #12927

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:30:51 +01:00
Michal Čihař
7da83511ec Do not use deprecated jQuery functionality 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:24:25 +01:00
Weblate
8cc1232063 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-13 15:07:38 +01:00
Yungu Kim
55ca7bb3a3 Translated using Weblate (Korean) 
Currently translated at 81.0% (2592 of 3199 strings)

[CI skip]
 2017-02-13 15:07:37 +01:00
Michal Čihař
dda0d8b69d Load server stats queries scripts in order 
We can not load first script which uses later one.

Fixes #12934

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:06:13 +01:00
Weblate
6eede38ac1 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-13 15:01:24 +01:00
Yungu Kim
6f9b505b1a Translated using Weblate (Korean) 
Currently translated at 80.9% (2588 of 3199 strings)

[CI skip]
 2017-02-13 15:01:22 +01:00
Michal Čihař
bca2e1c588 Use standard way for getting token value in designer 
This way we share code with rest of phpMyAdmin, not building it again.

Fixes #12804

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:00:11 +01:00
Michal Čihař
a083a4c839 Fixed manipulation with GIS data having zero coordinates 
Another example when using PHP's empty() leads to problems.

Fixes #12957

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 14:44:47 +01:00
Michal Čihař
522c0598fa Sort column names as well 
Fixes #12941

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 14:17:20 +01:00
Michal Čihař
8f611f05cf Fixed rendering of foreign key browsing 
Fixes #12985

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 13:51:13 +01:00
Weblate
287e384cf2 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-13 12:54:00 +01:00
Fujiwara Software
0f8ee2a630 Translated using Weblate (Japanese) 
Currently translated at 71.2% (2278 of 3199 strings)

[CI skip]
 2017-02-13 12:53:59 +01:00
Michal Čihař
d54061d1f8 Include token in hidden fields 
This will fix few broken users:

- error reporting
- table search in navigation
- user preferences

Fixes #12964

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 12:53:36 +01:00
Michal Čihař
fc1c784a43 Changelog entry for #12922 and #12933 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 12:24:20 +01:00
Michal Čihař
0cba123659 Specify sorting order 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 12:23:46 +01:00
Piyush Agrawal
82429cd01c ascending order of bookmarks list 
Signed-off-by: Piyush Agrawal <poush12@gmail.com>
 2017-02-13 12:22:11 +01:00
Michal Čihař
0038245ec8 Improved rendering of new version information 
- remove extra space in from of new version information
- add space between sentence and new version

Fixes #12981

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 11:56:36 +01:00
Michal Čihař
baa390df89 Fixed error when loading favorite tables to console 
The token was missing in POST request.

Fixes #12990

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 11:34:57 +01:00
Michal Čihař
bcc7c7af35 Allow secure.php.net in url redirector 
Fixes #12993

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 11:30:42 +01:00
Michal Čihař
a2fbafaa38 Merge branch 'QA_4_6' into QA_4_7 2017-02-13 11:24:08 +01:00
Weblate
4ac48de1c8 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-13 11:23:37 +01:00