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

105035 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
07fab97f80 Merge remote-tracking branch 'origin/master' 2016-02-09 10:49:25 +01:00
Παναγιώτης Παπάζογλου
4cf308233c Translated using Weblate (Greek) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-09 10:49:23 +01:00
Michal Čihař
d3adace4b7 Merge pull request #11928 from bamarni/composer-no-dev 
[doc] Installation with Composer - add --no-dev option
 2016-02-09 10:49:17 +01:00
Michal Čihař
ac25772f3a Merge branch 'QA_4_6' 2016-02-08 16:43:19 +01:00
Michal Čihař
a501b8f012 Merge commit '9a22f5af69635501de745dc3eeae1e5644415d4a' 2016-02-08 16:43:15 +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
9dfd1ea2d6 Merge branch 'QA_4_5' 2016-02-08 21:09:14 +05:30
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
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
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
Bilal Amarni
3d9095c326 [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-08 11:51:08 +01:00
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
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ř
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