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

108866 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
bb762f8bb5 Merge pull request #13020 from nijel/mysql-warning 
Remove ServerLibraryDifference_DisableWarning setting
 2017-02-21 09:12:15 +01:00
Michal Čihař
56297ffecc Remove token from GET request while changing theme 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-20 10:17:52 +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ř
8cc6de4de3 Remove ServerLibraryDifference_DisableWarning setting 
This is getting more and more problematic these days as most of Linux
distributions ship MariaDB libraries, while many people run MySQL
servers. As MariaDB claims the protocol compatibility should stay, we
should not warn in this case.

Of course there is option to add this exception to the warning (so far
the exception is there only other way - when using MySQL libraries to
connect to MariaDB server), but we would be ignoring most cases already
and I think complete removal is better than adding exceptions.

Overall I don't think this warning is doing any good these days.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-20 09:19:22 +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ř
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ř
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ř
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
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
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
Weblate
abedcc1152 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-14 17:42:55 +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
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