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

105020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
d156e8b179 Merge remote-tracking branch 'origin/master' 2016-02-08 16:25:10 +01:00
Burak Yavuz
ff3d43c4c8 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 16:25:10 +01:00
Domen
24336e7ed4 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3214 of 3214 strings)

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

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

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

[CI skip]
 2016-02-08 16:25:06 +01:00
Kristjan Räts
8416202511 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 16:25:06 +01:00
dingo thirteen
e2a3408cc7 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-02-08 16:25:05 +01:00
Atul Pratap Singh
74bdd57ecc Merge branch 'QA_4_5' 2016-02-08 20:54:29 +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
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
bd47943cc5 Merge remote-tracking branch 'origin/master' 2016-02-08 11:08:35 +01:00
Kristjan Räts
d880f6c6ec Translated using Weblate (Estonian) 
Currently translated at 99.9% (3212 of 3214 strings)

[CI skip]
 2016-02-08 11:08:31 +01:00
Michal Čihař
19395d89f1 Merge branch 'QA_4_6' 2016-02-08 11:08:19 +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ř
2a01a5520d Merge branch 'QA_4_6' 2016-02-08 09:56:36 +01:00
Michal Čihař
ef7a16e1bd Merge commit '4f6fe19c30589425d92494747516994951ae2163' 2016-02-08 09:56:32 +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ř
1012004214 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-08 09:42:55 +01:00
Michal Čihař
475f936366 Setting version to 4.7.0-dev 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-08 09:42:29 +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
Michal Čihař
10e11fe67d Replace define by using Config class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-08 09:36:27 +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
Michal Čihař
ca9fbec4c2 Use newer phpunit (for withConsecutive) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:49:05 +01:00
Michal Čihař
431450a237 Make test run even without runkit 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 19:49:05 +01:00
Ayrton Fidélis
9d10b94303 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.0% (2928 of 3216 strings)

[CI skip]
 2016-02-03 19:38:39 +01:00
Pedro Moreira
ac61e4b78c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.0% (2928 of 3216 strings)

[CI skip]
 2016-02-03 19:31:50 +01:00
Michal Čihař
db6af1be82 Simplify code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:57:19 +01:00
Michal Čihař
892d09cf74 Add more tests for getting cookie path 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:50:00 +01:00