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

104696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michal Čihař
0df7eeecc1 Merge branch 'QA_4_5' 2016-01-19 17:39:12 +01:00
Michal Čihař
91bfa27ee2 Do not cache data if releases attribute is missing 
Issue #11874

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 17:38:22 +01:00
Marc Delisle
147fbcd508 Translated using Weblate (French) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-01-19 13:42:51 +01:00
Michal Čihař
c036b92b8b Merge branch 'QA_4_5' 2016-01-19 11:59:52 +01:00
Michal Čihař
a11475efe3 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-19 11:59:45 +01:00
Michal Čihař
1431625d68 Fixes possible error when query is empty/not analyzed 
Fixes #11873

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:45:52 +01:00
Michal Čihař
f0e4b242ea Merge branch 'QA_4_5' 2016-01-19 11:40:06 +01:00
Michal Čihař
fbb3529fa8 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-19 11:39:32 +01:00
Michal Čihař
a5affed07a Validate database before starting designer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:38:50 +01:00
Michal Čihař
0f119bb329 Merge branch 'QA_4_5' 2016-01-19 11:31:41 +01:00
Michal Čihař
76e003a8cb Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-19 11:27:26 +01:00
Michal Čihař
5359d9a968 Check for parameter before using it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:26:59 +01:00
Michal Čihař
a6ae24741e Validate parameters before use 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:23:36 +01:00
Michal Čihař
897a844581 Check for parameter before using it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:23:36 +01:00
Michal Čihař
1523c4b364 Gracefully handle calling sql.php without SQL query 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:23:36 +01:00
Michal Čihař
0490d20408 Check for parameter before using it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 10:48:32 +01:00
Michal Čihař
8e99da9685 Merge branch 'QA_4_5' 2016-01-19 10:45:06 +01:00
Michal Čihař
32c7a54076 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-19 10:44:58 +01:00
Michal Čihař
dcdeee28eb Gracefully handle errors in regex based javascript search 
User can write any invalid regex and we should handle this gracefully.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 10:44:03 +01:00
Michal Čihař
9947f17c3c Merge branch 'QA_4_5' 2016-01-19 09:01:13 +01:00
Michal Čihař
d6df4fe290 Merge branch 'QA_4_5' 2016-01-19 09:00:27 +01:00
Weblate
62f3c7e3cf Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-19 09:00:15 +01:00
BlackyPanther
0ef9cfc300 Translated using Weblate (German) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-19 09:00:13 +01:00
Xosé Calvo
8d006f1a23 Translated using Weblate (Galician) 
Currently translated at 86.2% (2770 of 3210 strings)

[CI skip]
 2016-01-19 09:00:13 +01:00
Michal Čihař
7db4672aeb Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-19 08:59:56 +01:00
Michal Čihař
59036e1562 Simplify test to avoid need fo multiline regexp 
Cherry picked from master to avoid test suite failures on PHP 7.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 08:59:14 +01:00
Weblate
8beee54526 Merge remote-tracking branch 'origin/master' 2016-01-18 23:56:13 +01:00
BlackyPanther
f35c670ab4 Translated using Weblate (German) 
Currently translated at 99.8% (3213 of 3219 strings)

[CI skip]
 2016-01-18 23:56:10 +01:00
Marc Delisle
7aed59efd2 Substitute these not not operators with their real meaning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-18 17:55:56 -05:00