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

108983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
a280edc69f Merge remote-tracking branch 'origin/pull/13011' 2017-02-20 16:29:36 +01:00
Michal Čihař
5ad0c08868 Merge branch 'QA_4_7' 2017-02-20 10:08:18 +01:00
Michal Čihař
ab6e961c34 Show user errors even if normal errors are suppressed 
I'm not sure we're hitting this case somewhere, but it makes sense to
get this fixed.

Issue #13021

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-20 10:07:41 +01:00
Michal Čihař
a9ddb39aac Show phpMyAdmin errors even with error_reporting set to 0 
Fixes #13021

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-20 10:04:38 +01:00
Michal Čihař
7e1be7bd36 Merge branch 'QA_4_7' 2017-02-20 09:08:12 +01:00
Joshua Atkins
53eff5d47b Align NULL values according to column alignment 
Fixes #13000.

Signed-off-by: Joshua Atkins <support@jublo.net>
 2017-02-20 09:06:36 +01:00
Mike Lewis
dcaeb652b0 Also submit inline SQL form when pressing the command key on macOS 
Allows for the natural macOS key combination to submit a form (command
+ enter) to be used in addition to the Windows combination (control +
enter)

Signed-off-by: Mike Lewis <mike@mplew.is>
 2017-02-20 09:03:40 +01:00
Michal Čihař
72572cb6c2 Merge branch 'QA_4_7' 2017-02-20 08:58:35 +01:00
Michal Čihař
b42ef4f631 Correctly generate URL when there were not parameters 
Fixes #13014
Fixes #13013

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-20 08:58:00 +01:00
Michal Čihař
59e9856200 Fixed OpenDocument exports 
Fixes #13002

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-20 08:44:03 +01:00
Michal Čihař
4591c24b45 Merge pull request #13019 from jublonet/hotfix/13010-pmadb-relation-replaceinto 
Copy database: Fix SQL error for copying PMADB metadata
 2017-02-20 08:38:54 +01:00
Michal Čihař
8a08c90cb1 Merge branch 'QA_4_7' into hotfix/13010-pmadb-relation-replaceinto 2017-02-20 08:38:39 +01:00
Michal Čihař
c1d392deb9 Merge branch 'QA_4_7' 2017-02-20 08:26:06 +01:00
Michal Čihař
454620dcf8 Require SQL parser > 4.1.2 
This brings additional fixes like for #12345

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-20 08:25:34 +01:00
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
Shreyas Sinha
c433b571b4
Pass Google reCAPTCHA with the submit button 
Signed-off-by: Shreyas Sinha <shreyas.sinha14@gmail.com>
 2017-02-20 11:12:34 +05:30
Joshua Atkins
c4654d24df Copy db: Fix SQL error for copying PMADB metadata 
Fixes #13010.

Signed-off-by: Joshua Atkins <support@jublo.net>
 2017-02-19 22:35:21 +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