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

104764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
dc66b7745a Merge pull request #11889 from ibennetch/isaacGPG 
Update documents with Isaac as the new release manager
 2016-01-26 15:44:22 +01:00
Isaac Bennetch
d9749fccdb Document Isaac as the new release manager 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-01-26 09:40:24 -05:00
Massimiliano Caniparoli
6f55db79dc Translated using Weblate (Italian) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-01-25 17:23:48 +01:00
Michal Čihař
14d7c638a8 Merge branch 'QA_4_5' 2016-01-25 12:19:34 +01:00
Michal Čihař
1e6da495e1 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-25 12:18:42 +01:00
Michal Čihař
316792bf4a Move databse check to correct location 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 12:18:37 +01:00
Michal Čihař
981b90ba8a Move lint to separate step 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 12:08:41 +01:00
Michal Čihař
1917bc159b Make lint verbose to avoid timeout errors on Travis 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 12:08:22 +01:00
Michal Čihař
c76414b8bd Add todofy badge 
Fixes #11852

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 12:05:47 +01:00
Michal Čihař
c017f9f0a5 HHVM does not have config... 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 11:49:14 +01:00
Weblate
bc5370cad8 Merge remote-tracking branch 'origin/master' 2016-01-25 10:55:08 +01:00
Daniel Iltanen
1418427648 Translated using Weblate (Finnish) 
Currently translated at 66.7% (2147 of 3216 strings)

[CI skip]
 2016-01-25 10:55:06 +01:00
Michal Čihař
23a6918ceb Merge branch 'pecl-runkit' 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 10:54:49 +01:00
Michal Čihař
ee4d21eee4 Do not load runkit extension twice in tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 09:47:49 +01:00
Michal Čihař
56f9b32353 No PECL on HHVM 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 09:46:24 +01:00
Michal Čihař
b27e80df5a These test need runkit_internal_override enabled 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 09:42:04 +01:00
Michal Čihař
b508ed96f7 Revert "Use pecl to install runkit" 
This reverts commit 1810ae632c.

This shouldn't yet go to master...
 2016-01-25 09:40:28 +01:00
Michal Čihař
4bb155d874 Verbose script execution 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 09:03:09 +01:00
Michal Čihař
56cb67e203 Improve Travis setup 
- move setups to external script
- properly catch errors from conditional steps
- install runkit using PECL

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 09:01:48 +01:00
Michal Čihař
a39f256fa0 Remove PHP nightly build 
There is no major PHP version nearby and this just consumes build power.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 09:01:35 +01:00
Michal Čihař
ebe96369b2 Merge branch 'QA_4_5' 2016-01-25 08:39:25 +01:00
Weblate
da29e3ba2b Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-25 08:38:55 +01:00
Burak Yavuz
a8a9fa9032 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-25 08:38:54 +01:00
Arturs Nikolajevs
25bcee4035 Translated using Weblate (Latvian) 
Currently translated at 19.0% (611 of 3210 strings)

[CI skip]
 2016-01-25 08:38:54 +01:00
Adam Magnier
975e87d392 Translated using Weblate (French) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-25 08:38:53 +01:00
Michal Čihař
c048a519d4 Merge branch 'MAINT_4_4_15' into QA_4_5 2016-01-25 08:38:36 +01:00
Michal Čihař
78cea78ab7 Backport safety checks on version check 
Backported from master/QA_4_5

Issue #11713

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 08:36:19 +01:00
Michal Čihař
1810ae632c Use pecl to install runkit 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 08:15:31 +01:00
Weblate
644a306097 Merge remote-tracking branch 'origin/master' 2016-01-25 07:53:27 +01:00
Arturs Nikolajevs
dfd91b37ec Translated using Weblate (Latvian) 
Currently translated at 18.9% (608 of 3216 strings)

[CI skip]
 2016-01-25 07:53:26 +01:00
Adam Magnier
35710f245b Translated using Weblate (French) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-01-25 07:53:25 +01:00
Michal Čihař
a576d945d3 Merge pull request #11882 from djc/patch-1 
Add note about passing HTTP auth headers when running as FastCGI
 2016-01-25 07:53:17 +01:00
Dirkjan Ochtman
d49d7764bd Add note about passing HTTP auth headers when running as FastCGI 
Signed-off-by: Dirkjan Ochtman <dirkjan@ochtman.nl>
 2016-01-24 17:47:46 +01:00
Weblate
411d440feb Merge remote-tracking branch 'origin/master' 2016-01-22 19:00:59 +01:00
Burak Yavuz
cc2940f266 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-01-22 19:00:58 +01:00
Atul Pratap Singh
b6ee54035a Remove newline eof from templates/* 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-22 23:27:24 +05:30
Atul Pratap Singh
dd0882a3f8 Fix test cases 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-22 22:27:14 +05:30
Michal Čihař
beb1707274 Merge remote-tracking branch 'origin/QA_4_5' 2016-01-22 15:31:00 +01:00
Weblate
b51a55d6e5 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-22 15:27:51 +01:00
Masahiro Nishi
ac9b89b7af Translated using Weblate (Japanese) 
Currently translated at 67.6% (2170 of 3210 strings)

[CI skip]
 2016-01-22 15:27:50 +01:00
Michal Čihař
3d61936b8b Translated using Weblate (Czech) 
Currently translated at 95.8% (3077 of 3210 strings)

[CI skip]
 2016-01-22 15:27:49 +01:00
Michal Čihař
c0e370e356 Merge branch 'QA_4_5' 2016-01-22 15:27:34 +01:00
Michal Čihař
655de3d994 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-22 15:27:22 +01:00
Michal Čihař
da62e19833 Correctly handle what parameter on export 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 15:27:15 +01:00
Michal Čihař
e4dfb159c4 Do not use global constant with class 
As this doesn't play well together. This fixes the PDF schema export.

Fixes #11849

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 15:24:48 +01:00
Weblate
95f0b08128 Merge remote-tracking branch 'origin/master' 2016-01-22 12:16:16 +01:00
Masahiro Nishi
0fc1d512c5 Translated using Weblate (Japanese) 
Currently translated at 66.8% (2149 of 3216 strings)

[CI skip]
 2016-01-22 12:16:14 +01:00
Michal Čihař
2e931a9a7c Translated using Weblate (Czech) 
Currently translated at 94.4% (3039 of 3216 strings)

[CI skip]
 2016-01-22 12:16:13 +01:00
Atul Pratap Singh
017ec46808 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-01-22 16:43:45 +05:30
Atul Pratap Singh
ea4a072da8 Templates refactoring related to 'echo' 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-22 16:30:54 +05:30