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

108948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Siddhesh Rane
78ee00494b Translated using Weblate (Hindi) 
Currently translated at 38.1% (1221 of 3199 strings)

[CI skip]
 2017-02-14 17:43:11 +01:00
Michal Čihař
22351b100c Clear interval before reload 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 17:29:55 +01:00
Weblate
187f2b11a6 Merge remote-tracking branch 'origin/master' 2017-02-14 17:29:19 +01:00
Siddhesh Rane
2d59b1591a Translated using Weblate (Hindi) 
Currently translated at 38.1% (1220 of 3199 strings)

[CI skip]
 2017-02-14 17:29:17 +01:00
Michal Čihař
858d2306c9 Merge remote-tracking branch 'origin/QA_4_7' 2017-02-14 17:28:49 +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
7b7484c8f5 Merge remote-tracking branch 'origin/master' 2017-02-14 17:01:37 +01:00
Siddhesh Rane
b1ebe8800c Translated using Weblate (Hindi) 
Currently translated at 37.7% (1209 of 3199 strings)

[CI skip]
 2017-02-14 17:01:35 +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ř
813e0dbae2 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-02-14 17:01:22 +01:00
Michal Čihař
26d7d4269d Merge branch 'QA_4_7' 2017-02-14 17:01:07 +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
Michal Čihař
3508fa9ee2 Merge branch 'QA_4_7' 2017-02-14 15:26:13 +01:00
Weblate
ee46603530 Merge remote-tracking branch 'origin/master' 2017-02-14 15:26:02 +01:00
Siddhesh Rane
4fecf16851 Translated using Weblate (Hindi) 
Currently translated at 37.4% (1199 of 3199 strings)

[CI skip]
 2017-02-14 15:25:59 +01:00
Michal Čihař
563036022c Merge branch 'QA_4_7' 2017-02-14 15:25:47 +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ř
fb25d6262b Merge branch 'QA_4_7' 2017-02-14 15:04:42 +01:00
Michal Čihař
5de41552c9 Merge commit 'debc40d9d723981b8897aeb3ef05a2cdf4504f95' 2017-02-14 15:04:36 +01:00
Michal Čihař
c4f8b8f400 Merge commit 'fa051ff3e862c03d14918c43f4c865bc549904f7' 2017-02-14 15:04:30 +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ř
a7950faf52 Make tcpdf really optional in composer.json 
- remove it from require
- add it to require-dev as testsuite does not work without it
- add conflict to avoid installing old version

Fixes #12975

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 13:42:17 +01:00
Weblate
7c25ca7967 Merge remote-tracking branch 'origin/master' 2017-02-14 13:20:28 +01:00
Siddhesh Rane
f475ebf27f Translated using Weblate (Hindi) 
Currently translated at 37.3% (1196 of 3199 strings)

[CI skip]
 2017-02-14 13:20:26 +01:00
Shreyas Sinha
1dfce55965 Incorrect protocol number at 401/303 headers (#12920) 
Shared code for handling HTTP response codes and correctly
set it based on PHP SAPI.

Signed-off-by: Shreyas Sinha <shreyas.sinha14@gmail.com>
 2017-02-14 13:20:13 +01:00
Michal Čihař
161f0d6418 Merge branch 'QA_4_7' 2017-02-14 11:54:08 +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ř
26ff0c7b5a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-02-13 16:00:10 +01:00
Michal Čihař
28339ec22d Merge branch 'QA_4_7' 2017-02-13 15:59:54 +01:00
Michal Čihař
28cf3578e1 Merge remote-tracking branch 'origin/QA_4_7' 2017-02-13 15:59:50 +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
b36fbd243e Merge remote-tracking branch 'origin/master' 2017-02-13 15:32:25 +01:00