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

104745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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ř
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
Michal Čihař
9586b8c142 Add missing space to separate two strings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 10:38:54 +01:00
Michal Čihař
125ad7c7c5 Remove trailing space from a string 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 10:20:44 +01:00
Michal Čihař
0a796560d8 Merge branch 'QA_4_5' 2016-01-22 10:20:21 +01:00
Michal Čihař
0a7fc9770e Remove trailing space from a string 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 10:19:11 +01:00
Michal Čihař
3307d1b5f7 Translated using Weblate (Vietnamese) 
Currently translated at 85.9% (2759 of 3210 strings)

[CI skip]
 2016-01-22 10:18:57 +01:00
Weblate
fdb4cd81e2 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-22 09:44:08 +01:00
Martin Lacina
38e511dc47 Translated using Weblate (Slovak) 
Currently translated at 84.1% (2701 of 3210 strings)

[CI skip]
 2016-01-22 09:44:07 +01:00
Michal Čihař
277fdc81c7 Merge branch 'QA_4_5' 2016-01-22 09:43:54 +01:00
Michal Čihař
e254cc8efb Merge commit '7e731770e5a90ea121934c2783948b06932eb4ce' 2016-01-22 09:43:50 +01:00
Michal Čihař
3bd0971db7 Validate version information before further processing it 
Do basic sanity checking before we return the value further. This can
especially happen in case the curl/allow_url_fopen is missing.

Fixes #11874
 2016-01-22 09:42:54 +01:00
Michal Čihař
b1ac8170fd Show warning in version check and error reporting are not available 
When curl is missing and allow_url_fopen is disabled, we can not access
remote files.

Fixes #11874

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 09:38:18 +01:00
Michal Čihař
28055b83e7 We no longer do cross site javascript request 
Remove condition to disable version check on IE, it no loger makes sense
as we do the check server side.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 09:33:10 +01:00
Michal Čihař
47798a60e4 Show more used PHP extensions 
This helps user to see what features are available.

Issue #11874

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 09:31:44 +01:00
Atul Pratap Singh
373ebc29bc Replace <?php echo with <?= in 'templates/' 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-20 19:14:11 +05:30
Weblate
95b1cb173e Merge remote-tracking branch 'origin/master' 2016-01-20 13:23:41 +01:00
Martin Lacina
18ecf7e6f6 Translated using Weblate (Slovak) 
Currently translated at 83.2% (2677 of 3216 strings)

[CI skip]
 2016-01-20 13:23:40 +01:00
Marc Delisle
b039a58347 PHP requirement to display phpMyAdmin version 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-20 07:23:24 -05:00
Weblate
7e731770e5 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-19 17:39:24 +01:00
Marc Delisle
1a046d4d3a Translated using Weblate (French) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-19 17:39:22 +01:00