gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,349 Commits 12 Branches 481 Tags 2.4 GiB
08bf587dbb
Commit Graph

82349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
08bf587dbb Merge remote-tracking branch 'origin/master' 2013-04-15 18:49:12 +02:00
Rodrigo Souza
ff9f2f0676 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2605 of 2605)
 2013-04-15 18:49:08 +02:00
Marc Delisle
a79248b07e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-04-15 12:48:53 -04:00
Marc Delisle
ae7e542a51 Fix merge conflict 2013-04-15 12:47:19 -04:00
Weblate
be971a0573 Merge remote-tracking branch 'origin/master' 2013-04-15 18:26:51 +02:00
Rodrigo Souza
c273d30825 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2605 of 2605)
 2013-04-15 18:26:47 +02:00
Marc Delisle
a5ba10c7d9 Merge pull request #251 from xmujay/gsoc2013_4 
refactor server_engines.php
 2013-04-15 09:26:34 -07:00
Michal Čihař
0cd1254ef2 We want these for now 2013-04-15 16:38:09 +02:00
Michal Čihař
66c60852f3 fix spacing 2013-04-15 16:26:06 +02:00
Michal Čihař
0d3ce5a653 Relax some js checking 2013-04-15 16:25:49 +02:00
Michal Čihař
a6f93e99ee Use consistent indentation 2013-04-15 16:23:43 +02:00
Michal Čihař
c92409704b Move declaration before function usage 2013-04-15 16:21:26 +02:00
Michal Čihař
e2571c5628 Various javascript spacing fixes 2013-04-15 16:20:04 +02:00
Michal Čihař
b044cfc3b2 Use own jshint configuration 2013-04-15 16:20:04 +02:00
Michal Čihař
505a5a3656 Merge remote-tracking branch 'origin/QA_4_0' 2013-04-15 15:13:31 +02:00
Michal Čihař
3a024d6e41 Merge commit 'f1299ad66571b94063515ce347e2ee5018b3bbc8' 2013-04-15 15:13:23 +02:00
Michal Čihař
a1b6f206b2 Various spacing and identation fixes 2013-04-15 15:13:14 +02:00
Weblate
cc8b95e896 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-04-15 15:09:49 +02:00
Yungu Kim
e16ff8ce97 Translated using Weblate (Korean) 
Currently translated at 57.0% (1485 of 2605)
 2013-04-15 15:09:47 +02:00
Michal Čihař
f1299ad665 Remove extra ; from code 2013-04-15 15:09:32 +02:00
Weblate
b9aa5280b1 Merge remote-tracking branch 'origin/master' 2013-04-15 14:14:56 +02:00
Yungu Kim
2c3f59c41c Translated using Weblate (Korean) 
Currently translated at 57.0% (1485 of 2605)
 2013-04-15 14:14:52 +02:00
Michal Čihař
c935413fcc Various javascript fixes 
- missing ;
- confusing !
 2013-04-15 14:10:53 +02:00
Weblate
bdb70b833f Merge remote-tracking branch 'origin/master' 2013-04-15 13:26:12 +02:00
Yungu Kim
697f589537 Translated using Weblate (Korean) 
Currently translated at 56.4% (1468 of 2605)
 2013-04-15 13:26:08 +02:00
Michal Čihař
e6517db98a More javascript cleanup, more fixes of === / !=== 2013-04-15 13:25:50 +02:00
Michal Čihař
83c2a074a5 JS fixes for PMD code 
- parseInt with radix
- === and !== for type cast unsafe values
 2013-04-15 12:19:33 +02:00
Michal Čihař
6aa7eaabef Include pmd files in checking 2013-04-15 12:17:41 +02:00
Michal Čihař
cc7bef87d5 Some forgotten === conversion 2013-04-15 12:14:26 +02:00
Michal Čihař
cc2c8692c3 Do not use vars out of scope 2013-04-15 12:12:34 +02:00
Michal Čihař
502165de66 Explicitly define radix for parseInt 
This prevents unexpected behavior when parsing string like 033, which
would be treated as octal.
 2013-04-15 12:05:44 +02:00
Michal Čihař
020a3e1ce4 Use type cast safe comparison 
The values like true, '' or 0 could compare to lot of other stuff with
type casting.
 2013-04-15 12:03:11 +02:00
Michal Čihař
4f31f7fa1e Fix coding style 2013-04-15 11:47:24 +02:00
Michal Čihař
5de58e2049 Use type cast safe comparison 
The values like true, '' or 0 could compare to lot of other stuff with
type casting.
 2013-04-15 11:46:05 +02:00
Michal Čihař
efb7a2ae58 Define variable just once 2013-04-15 11:42:46 +02:00
Michal Čihař
e07a890905 Explicitly set radix for parseInt 2013-04-15 11:42:05 +02:00
Michal Čihař
a7b1e909fd Merge pull request #241 from ayushchd/issue_https 
Fixed config tests and static variable issue
 2013-04-15 02:38:57 -07:00
Michal Čihař
7b167c6fe5 Merge pull request #245 from adamgsoc2013/UT_string 
add test case for Table Class
 2013-04-15 02:29:30 -07:00
Michal Čihař
9c5c9ecc49 Ignore some more thing from coverage reports 
- coding style rules
- user examples
- admin scripts
 2013-04-15 10:56:54 +02:00
Madhura Jayaratne
298f4df3b2 Merge branch 'QA_4_0' 2013-04-15 13:07:48 +05:30
Madhura Jayaratne
f2c0c17c5f Merge pull request #253 from kasunchathuranga/Bug3875 
Fix bug 3875 Lost location hash and token on table add field
 2013-04-15 00:30:46 -07:00
Kasun Chathuranga
c4cb007570 Fix bug 3875 Lost location hash and token on table add field 2013-04-15 08:26:32 +05:30
Marc Delisle
ee09f98f73 Forgotten in refactoring 2013-04-14 19:21:35 -04:00
Madhura Jayaratne
b09b612579 Merge branch 'QA_4_0' 2013-04-14 23:39:48 +05:30
Madhura Jayaratne
2ce7be7798 HTTPS will not see OpenStreetMaps due to CSP. So do not show the checkbox also 2013-04-14 23:38:30 +05:30
Madhura Jayaratne
818167ad03 Merge pull request #247 from madhuracj/CSP 
Allow loading map tiles when HTTPS is not used
 2013-04-14 11:04:22 -07:00
Marc Delisle
32cd9478d0 Merge branch 'QA_4_0' 2013-04-14 13:03:34 -04:00
Marc Delisle
0dbc20d735 Fix merge conflict 2013-04-14 13:01:55 -04:00
xmujay
d81ebdb847 refactor display_export.lib.php 2013-04-14 23:05:18 +08:00
xmujay
99e6b13ba1 refactor server_engines.php 2013-04-14 22:37:44 +08:00