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

108827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Bennetch
e00b03a24e Add hint about updating Docker at release time 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-02-06 09:20:33 -05:00
Michal Čihař
a338d6e7f0 Merge branch 'QA_4_7' 2017-02-06 15:05:08 +01:00
Michal Čihař
a927c52322 Extend lost password FAQ 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-06 15:04:58 +01:00
Michal Čihař
52db42edfc Merge branch 'QA_4_7' 2017-02-06 14:10:25 +01:00
Michal Čihař
f26d74544b Add Docker sample for haproxy and subpath 
Fixes https://github.com/phpmyadmin/docker/issues/101

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-06 14:09:15 +01:00
Michal Čihař
9859461733 Merge branch 'QA_4_7' 2017-02-06 13:37:40 +01:00
Michal Čihař
0d9c1101ac Fixed export of tracking data 
Fixes #12954

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-06 13:37:21 +01:00
Michal Čihař
ebfc86934b Merge branch 'QA_4_7' 2017-02-06 13:32:27 +01:00
Michal Čihař
f73a98e421 Fixed database renaming 
Fixes #12955

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-06 13:31:39 +01:00
Michal Čihař
3cfe34985d Merge branch 'QA_4_7' 2017-02-06 13:26:24 +01:00
Michal Čihař
80de044517 Changelog entry for #12904 and #12939 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-06 13:26:04 +01:00
Piyush Agrawal
b575f7ef1b db_central_columns: new column collapsing issue 
Signed-off-by: Piyush Agrawal <poush12@gmail.com>
 2017-02-06 13:25:05 +01:00
Michal Čihař
5d3a6fbc25 Merge branch 'QA_4_7' 2017-02-06 13:23:09 +01:00
Michal Čihař
569fcc1ef3 Merge commit '3d29350b0a6145e07632e6bcc95f1e44bd6d06e6' 2017-02-06 13:22:59 +01:00
Michal Čihař
9b534e55ca Merge pull request #12950 from nijel/connect_type 
Remove connect_type setting
 2017-02-06 13:22:11 +01:00
Michal Čihař
162d135662 Clarify socket connection docs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-06 12:55:46 +01:00
Weblate
3d29350b0a Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-06 11:30:32 +01:00
Franco
33717e7268 Translated using Weblate (Spanish) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-02-06 11:30:31 +01:00
Weblate
754b9dc98e Merge remote-tracking branch 'origin/master' 2017-02-06 11:30:29 +01:00
Capita-Finnish
7201940bcc Translated using Weblate (Finnish) 
Currently translated at 69.4% (2222 of 3199 strings)

[CI skip]
 2017-02-06 11:30:29 +01:00
Franco
b734097a5c Translated using Weblate (Spanish) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-02-06 11:30:29 +01:00
Capita-Finnish
a3377670ed Translated using Weblate (Finnish) 
Currently translated at 69.4% (2222 of 3199 strings)

[CI skip]
 2017-02-06 11:30:26 +01:00
Michal Čihař
474cda3c90 Merge branch 'QA_4_7' 2017-02-06 11:30:09 +01:00
Michal Čihař
7a2222ae76 Merge commit '2559d3e448cddd8da4d536b453b10cec7f0d3349' 2017-02-06 11:30:01 +01:00
Michal Čihař
87ebf137c1 Add example for customizing configuration file using docker-compose 
Fixes https://github.com/phpmyadmin/docker/issues/82

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-06 11:29:15 +01:00
Isaac Bennetch
34946a285b Improve documentation on socket or tcp/ip setup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-04 17:32:04 +01:00
Franco
2559d3e448 Translated using Weblate (Spanish) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-02-04 02:28:32 +01:00
anonymous
8a6d7dec23 Translated using Weblate (Spanish) 
Currently translated at 99.4% (3181 of 3199 strings)

[CI skip]
 2017-02-04 02:19:12 +01:00
Franco
246b68ac00 Translated using Weblate (Spanish) 
Currently translated at 99.3% (3178 of 3199 strings)

[CI skip]
 2017-02-04 02:16:40 +01:00
anonymous
e4a6de9950 Translated using Weblate (Spanish) 
Currently translated at 99.3% (3178 of 3199 strings)

[CI skip]
 2017-02-04 02:15:34 +01:00
Franco
f058f0a9f2 Translated using Weblate (Spanish) 
Currently translated at 99.3% (3177 of 3199 strings)

[CI skip]
 2017-02-04 02:15:00 +01:00
anonymous
da5908f34e Translated using Weblate (Spanish) 
Currently translated at 99.2% (3174 of 3199 strings)

[CI skip]
 2017-02-04 02:10:44 +01:00
Michal Čihař
1b7914a4e5 Remove connect_type setting 
It is really not necessary as MySQL decides connection type rather based
on hostname than on anything else.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-02 16:08:44 +01:00
Michal Čihař
0455817f29 Merge branch 'QA_4_7' 2017-02-02 15:24:32 +01:00
Michal Čihař
736e2061b8 Add missing parameter (issue #12941) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-02 15:24:25 +01:00
Michal Čihař
018fa75156 Merge branch 'QA_4_7' 2017-02-02 15:13:13 +01:00
Michal Čihař
f67ac81675 Use getTables instead of contructing the list again 
We do not need any condition here as in native relations.

Issue #12941

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-02 15:12:57 +01:00
Michal Čihař
4f151204d2 Fix more tables where table sorting is not honored 
Issue #12941

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-02 15:11:22 +01:00
Michal Čihař
b2afc36572 Merge branch 'QA_4_7' 2017-02-02 14:57:47 +01:00
Michal Čihař
98fafeec79 Properly pass token on navigation paginating 
Fixes #12936

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-02 14:57:41 +01:00
Michal Čihař
7c8ae87cd0 Merge branch 'QA_4_7' 2017-02-02 14:43:31 +01:00
Michal Čihař
5a3410ca86 Fixed sorting of tables in relation view 
Fixes #12941

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-02 14:43:18 +01:00
Michal Čihař
a67c153884 Merge branch 'QA_4_7' 2017-02-02 14:07:04 +01:00
Michal Čihař
eeb0771245 Fixed hint rendering on adding new user 
Fixes #12945

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-02 14:06:48 +01:00
Michal Čihař
d9a2fe5d36 Use .uniqueSort isntead of deprecated .unique 
This changes jQuery UI, hopefully it will be fixed in next version.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-02 13:56:43 +01:00
Michal Čihař
ca03659f5e Provide tracback on error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-02 13:52:49 +01:00
Michal Čihař
2423aac692 Merge branch 'QA_4_7' 2017-02-02 13:43:55 +01:00
Michal Čihař
5022ff9560 Do not show errors from OpenSSL cookie encryption/decryption 
This can happen from corrupted cookies, by invalid encryption parameters
used in older phpMyAdmin versions or by wrong openSSL configuration.

In neither case the error is useful to user, but we need to clear the
error buffer as otherwise the errors would pop up later, for example
during MySQL SSL setup.

Fixes #12924

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-02 13:43:51 +01:00
Michal Čihař
b55ff27f16 Pass correct parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-02 13:25:26 +01:00
Michal Čihař
648f5beb7b Merge branch 'QA_4_7' 2017-02-02 13:21:56 +01:00