gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,026 Commits 12 Branches 481 Tags 2.4 GiB
84ed3ae6ca
Commit Graph

105026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
84ed3ae6ca Correctly document what this function expects 
Issue #11930, #11931

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-09 16:53:37 +01:00
Michal Čihař
ef7114d850 Merge branch 'QA_4_5' into QA_4_6 2016-02-09 16:53:06 +01:00
Michal Čihař
afe00d7c10 The storage engine needs to be upper case all the time 
So far the current was uppercase, but the possibly new was lower case
leading to many weird effects.

Fixes #11930

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-09 16:51:20 +01:00
Michal Čihař
9016fd6a72 Changelog entry for #11880 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-09 16:44:35 +01:00
Michal Čihař
a6eb9468b1 Merge remote-tracking branch 'origin/pull/11880' into QA_4_6 2016-02-09 16:44:08 +01:00
Durgesh
de28889a30 Fix HTML rendering in error message, Issue #11872 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-09 16:10:15 +05:30
Michal Čihař
3ebacb0025 Simplify loading of vendor configuration 
Do it just once and very early, so that all scripts can rely on it being
available.

Fixes autoloading of phpseclib.

Fixes #11914

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-09 11:00:54 +01:00
Bilal Amarni
db270f86fb [doc] Installation with Composer - add --no-dev option 
Otherwise it installs multiple dependencies not needed for
running PhpMyAdmin (phpunit, code sniffer, etc.).

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
 2016-02-09 10:49:10 +01:00
Παναγιώτης Παπάζογλου
e821a26793 Translated using Weblate (Greek) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 21:43:24 +01:00
Weblate
5f1a5ac2ca Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-08 16:43:39 +01:00
Domen
e04461b195 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 16:43:39 +01:00
Seongki Shin
1454dc0da9 Translated using Weblate (Korean) 
Currently translated at 78.0% (2508 of 3214 strings)

[CI skip]
 2016-02-08 16:43:38 +01:00
Giovanni Sora
2f9edad6b7 Translated using Weblate (Interlingua) 
Currently translated at 72.6% (2335 of 3214 strings)

[CI skip]
 2016-02-08 16:43:38 +01:00
Marc-Antoine Thevenet
73368e276b Translated using Weblate (French) 
Currently translated at 99.9% (3213 of 3214 strings)

[CI skip]
 2016-02-08 16:43:37 +01:00
dingo thirteen
53b65d88b4 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 16:43:37 +01:00
Michal Čihař
29edefae02 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_6 2016-02-08 16:42:51 +01:00
Atul Pratap Singh
5a00545bf8 Add missing teardown 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-02-08 21:06:53 +05:30
Atul Pratap Singh
9b3a037ff4 changelog entry 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-02-08 20:58:37 +05:30
Atul Pratap Singh
aeb69d3fed Merge pull request #11926 from 007durgesh219/Issue#11906 
Fix Loading... banner shows on login screen, Issue #11906
 2016-02-08 20:48:35 +05:30
Kristjan Räts
9a22f5af69 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 14:54:57 +01:00
Domen
f940258e64 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 14:35:36 +01:00
Burak Yavuz
97a9a8bbd8 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 12:25:19 +01:00
Durgesh
59fd4e0efc Fix Loading... banner shows on login screen, Issue #11906 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-08 16:37:30 +05:30
Weblate
65bfc602df Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-08 11:08:30 +01:00
Kristjan Räts
b1174f0b08 Translated using Weblate (Estonian) 
Currently translated at 99.9% (3212 of 3214 strings)

[CI skip]
 2016-02-08 11:08:29 +01:00
Michal Čihař
5b928b9138 Adjust Docker documentation to match current code 
The port has been changed from 8080 to 80 in
https://github.com/phpmyadmin/docker/pull/19

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-08 11:07:41 +01:00
Michal Čihař
de7181653f Correctly handle paths to exact files when setting cookie 
We need to set path to folder not a given file.

Fixes #11916

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-08 09:54:57 +01:00
Michal Čihař
4f6fe19c30 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-08 09:38:28 +01:00
Michal Čihař
bf9bc710c2 Merge branch 'QA_4_5' into QA_4_6 2016-02-08 09:38:01 +01:00
Atul Pratap Singh
9e8bb3bef1 Merge pull request #11925 from zalog/master 
Search and replace with nothing
 2016-02-07 08:20:21 +05:30
Catalin Zalog
271e6d59d9 Search and replace with nothing 
Signed-off-by: Catalin Zalog <catalinzalog@yahoo.com>
 2016-02-07 04:15:32 +02:00
Stefano Martinelli
0a47d2a529 Translated using Weblate (Italian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-02-06 12:44:44 +01:00
Pedro Moreira
4b096e6214 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.8% (2979 of 3210 strings)

[CI skip]
 2016-02-05 21:44:57 +01:00
Weblate
433bb7f6b4 Merge remote-tracking branch 'origin/master' 2016-02-05 01:43:45 +01:00
Stefano Martinelli
094f4b0675 Translated using Weblate (Italian) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-02-05 01:43:44 +01:00
Isaac Bennetch
9324fde659 Small language improvement about HSTS 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-04 19:42:13 -05:00
Παναγιώτης Παπάζογλου
3205d145d5 Translated using Weblate (Greek) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-02-04 12:44:33 +01:00
Michal Čihař
22e5f4a4be Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 21:07:07 +01:00
Michal Čihař
a28cc6d2de Ensure we always restore original instance even on failure 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 20:41:00 +01:00
Michal Čihař
b846681c26 Correctly mock Response instance 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 20:30:07 +01:00
Michal Čihař
9bd4844c26 Do not skip test if IIS is defined 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 20:26:45 +01:00
Michal Čihař
1bddcff0d5 Remove accidental comment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 20:22:49 +01:00
Michal Čihař
2148e7cad8 Implement test for Cookie auth without runkit 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 20:21:40 +01:00
Michal Čihař
be8b4ccd76 Add mising separator 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:57:42 +01:00
Weblate
0be1869339 Merge remote-tracking branch 'origin/master' 2016-02-03 19:56:44 +01:00
Pedro Moreira
8618600876 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.2% (2936 of 3216 strings)

[CI skip]
 2016-02-03 19:56:43 +01:00
Michal Čihař
e3843ab1a9 Test with SID if set 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:56:26 +01:00
Weblate
2402a0b053 Merge remote-tracking branch 'origin/master' 2016-02-03 19:49:18 +01:00
Pedro Moreira
5e0dc6b139 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.2% (2935 of 3216 strings)

[CI skip]
 2016-02-03 19:49:16 +01:00
Michal Čihař
c2b41b829a Wrap header() and headers_sent() in response 
This allows us to test the code without using runkit. Currenly only
AuthenticationHttp is migrated to new code, but others will follow.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:49:05 +01:00