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

108366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
00b718397c Unbind event on page unload 
Issue #12838, #12069

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 10:16:57 +01:00
Michal Čihař
03a1fe3e1a Merge remote-tracking branch 'origin/pull/12838' 2016-12-21 10:14:48 +01:00
Yunus Çağrı
041cd61820 Tab spaces are removed. 
Signed-off-by: Yunus Çağrı <ycagriyurdakul@gmail.com>
 2016-12-21 00:15:24 +03:00
Yunus Çağrı
9aaf3126b8 Update db_structure.js 2016-12-20 22:57:19 +02:00
Yunus Çağrı
f256391545 Inline javascript codes are removed. Each is used for table search 
Signed-off-by: Yunus Çağrı <ycagriyurdakul@gmail.com>
 2016-12-20 23:53:00 +03:00
Michal Čihař
b1ad3826b5 Merge branch 'QA_4_6' 2016-12-20 16:44:58 +01:00
Michal Čihař
c8a15f2212 Merge remote-tracking branch 'origin/pull/12815' into QA_4_6 2016-12-20 16:44:44 +01:00
Osaid Rehman Nasir
73c6a7eb9f Use Header class for headers manipulation 
* Added mocking of response object
* Rectified mistake of calling method once
* implemented mock properly
* replaced header with response header 

Issue #12079

Signed-off-by: Osaid osaid.nasir@gmail.com
 2016-12-20 16:37:11 +01:00
Michal Čihař
92aa487c54 Merge branch 'QA_4_6' 2016-12-20 14:44:03 +01:00
Michal Čihař
09da5eb49f Test both with and without phpseclib 
This ensures we generate compatible data in both cases.

Issue #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-20 14:40:31 +01:00
Michal Čihař
30cd5fc358 Use same encryption key with openssl and phpseclib 
Issue #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-20 14:38:34 +01:00
Michal Čihař
03bc52f6dc Correctly report OpenSSL errors from cookie encryption 
Without calling openssl_error_string() we pollute openssl global state
and some other library might report this as failure (eg. mysqlnd driver
when connecting to SSL enabled server).

Fixes #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-20 14:38:03 +01:00
Michal Čihař
b866371b9a Determine whether to use openssl just once 
Issue #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-20 14:30:51 +01:00
Yunus Çağrı
b19085b37b Feature: #12069: Filtering tables on table listing of particular database. 
Signed-off-by: Yunus Çağrı <ycagriyurdakul@gmail.com>
 2016-12-19 23:19:06 +03:00
Yunus Çağrı
ec4ef65f36 Feature: #12069: Filtering tables on table listing of particular database. 
Signed-off-by: Yunus Çağrı <ycagriyurdakul@gmail.com>
 2016-12-19 22:56:15 +03:00
Michal Čihař
5cbcb202b8 Merge branch 'QA_4_6' 2016-12-19 17:14:15 +01:00
Michal Čihař
d730db1259 Add some missing html encoding 
Issue #12804

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 17:13:43 +01:00
Michal Čihař
b8b872d449 Remove default value for js parameter 
The null is there implicitely anyway.

Fixes #12829

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 16:31:02 +01:00
Michal Čihař
6bf4f3bf39 Merge branch 'QA_4_6' 2016-12-19 16:20:57 +01:00
Michal Čihař
a856a61c9d Fix HTTP auth test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 16:20:51 +01:00
Michal Čihař
ffe68c7219 Honor user configured connection collation 
* the user set collation is now honored
* default value has been changed to utf8mb4
* it is downgraded to utf8 if server does not support it

Fixes #12826

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 16:18:21 +01:00
Michal Čihař
9835791bff Fix empty password login for http authetication 
Fixes #12828

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 16:01:00 +01:00
Michal Čihař
3a7eaf8538 Merge branch 'QA_4_6' 2016-12-19 15:28:25 +01:00
Michal Čihař
2557709949 Merge pull request #12807 from nijel/cookie-fatal 
Do not delete session on fatal error
 2016-12-19 15:28:07 +01:00
Michal Čihař
945e615253 Merge branch 'QA_4_6' 2016-12-19 15:23:31 +01:00
Michal Čihař
7d361806c3 Share code for rendering custom header and footer 
Fixes #12802

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 15:20:12 +01:00
Michal Čihař
e267c6f9af Merge remote-tracking branch 'origin/pull/12803' into tmp 2016-12-19 15:06:30 +01:00
Michal Čihař
2fd4e4b2ae Merge branch 'QA_4_6' 2016-12-19 14:44:25 +01:00
Michal Čihař
53274555b6 Add source release support 
See #12348

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 14:44:20 +01:00
Michal Čihař
0292859e2c Merge branch 'QA_4_6' 2016-12-19 13:36:48 +01:00
Michal Čihař
5cc8f7ebea Merge remote-tracking branch 'origin/QA_4_6' 2016-12-19 13:36:39 +01:00
Michal Čihař
7ad21270c4 Remove .htaccess from tests 
Issue #12348

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 13:35:28 +01:00
Weblate
677d1cd640 Merge remote-tracking branch 'origin/master' 2016-12-19 09:16:21 +01:00
Deven Bansod
a8018c2fa1 Merge branch 'QA_4_6' 2016-12-19 13:46:59 +05:30
Franco
0c416502c2 Translated using Weblate (Spanish) 
Currently translated at 99.8% (3234 of 3239 strings)

[CI skip]
 2016-12-19 09:16:21 +01:00
Weblate
59934c2914 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-12-19 09:15:31 +01:00
Franco
391c79e177 Translated using Weblate (Spanish) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-19 09:15:30 +01:00
Deven Bansod
33af5ac3d6 Uncomment mistakenly commented Selenium testing setting 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-19 13:45:00 +05:30
Isaac Bennetch
2a6b05d965 Use documentation link instead of wiki for Composer details 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-12-18 00:13:41 -05:00
Isaac Bennetch
697e1cec72 Hints about using Composer for library dependencies 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-12-18 00:09:36 -05:00
Isaac Bennetch
ea619794e5 Fix documentation markup 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-12-17 10:16:55 -05:00
Michal Čihař
c16f1eb87d Merge branch 'QA_4_6' 2016-12-15 09:18:05 +01:00
Michal Čihař
d00ad18075 Include token in all filter requests 
Fixes #12786

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-15 09:16:55 +01:00
Michal Čihař
0664d15cef Simplify checking for ajax request 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-15 09:11:06 +01:00
Michal Čihař
4e9a342794 Register shutdown directly on singleton instance 
This avoids additional call in the shutdown handler.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-15 09:06:02 +01:00
Michal Čihař
f08907544d Get response instance just once 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-15 08:58:18 +01:00
Michal Čihař
f914fcaba5 Share code for cascading ajax flag 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-15 08:54:45 +01:00
Deven Bansod
967755a1de ChangeLog for #12814 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-15 09:49:58 +05:30
Deven Bansod
352a5d79d5 MySQL allows precision to be specified for DATETIME, TIME type fields too 
Fix #12814

Ref : http://dev.mysql.com/doc/refman/5.7/en/fractional-seconds.html

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-15 09:47:17 +05:30
Marc Delisle
128b0279de Translated using Weblate (French) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-15 00:48:27 +01:00