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

108967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
cc1b2a1b0e Merge branch 'QA_4_7' 2017-02-20 08:22:01 +01:00
Michal Čihař
f441c8a16f Merge remote-tracking branch 'origin/QA_4_7' 2017-02-20 08:21:57 +01:00
Michal Čihař
a5703b4750 Update PHP versions FAQ 
It could probably use more adjusting, but this way it is at least talking
about current versions.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-20 08:21:40 +01:00
Weblate
ff3817920a Merge remote-tracking branch 'origin/master' 2017-02-19 15:22:48 +01:00
hd hd
c8b2831968 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 99.1% (3172 of 3199 strings)

[CI skip]
 2017-02-19 15:22:44 +01:00
Isaac Bennetch
8eab9941da Merge branch 'QA_4_7' 2017-02-19 09:21:50 -05:00
Isaac Bennetch
f09f53e852 Merge commit '7c2a495' 2017-02-19 09:21:41 -05:00
Weblate
bde1c40e71 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-19 15:18:50 +01:00
hd hd
02cdf7b1fa Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 99.1% (3172 of 3199 strings)

[CI skip]
 2017-02-19 15:18:48 +01:00
Isaac Bennetch
2f7dd1e149 Slight improvements to the UI for Relation view; Fixes to table structure. 
Fixes #13016 and #13017

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-02-19 09:17:13 -05:00
Microgamer
7c2a4954d6 Translated using Weblate (German) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-02-16 21:46:00 +01:00
Microgamer
3c5eaaf2f8 Translated using Weblate (German) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-02-16 21:45:53 +01:00
Lukas Grimm
f26fff8b1e Translated using Weblate (German) 
Currently translated at 99.4% (3183 of 3199 strings)

[CI skip]
 2017-02-14 19:44:19 +01:00
Microgamer
9d80ef7535 Translated using Weblate (German) 
Currently translated at 99.4% (3183 of 3199 strings)

[CI skip]
 2017-02-14 19:43:17 +01:00
Weblate
019fc9ee24 Merge remote-tracking branch 'origin/master' 2017-02-14 17:43:13 +01:00
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
Weblate
abedcc1152 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-14 17:42:55 +01:00
Michal Čihař
8322acb641 Merge branch 'QA_4_7' 2017-02-14 17:42:53 +01:00
Siddhesh Rane
4fed4b2b8b Translated using Weblate (Hindi) 
Currently translated at 38.1% (1221 of 3199 strings)

[CI skip]
 2017-02-14 17:42:53 +01:00
Michal Čihař
7f9e346a87 Install tcpdf when building release 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 17:42:34 +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