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

82313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Weblate
70a9ad2a42 Merge remote-tracking branch 'origin/master' 2013-04-14 15:58:08 +02:00
zz zz
1bde3891c9 Translated using Weblate (Simplified Chinese) 
Currently translated at 99.7% (2598 of 2605)
 2013-04-14 15:58:05 +02:00
Julio Guerra
d295ff1aaa Translated using Weblate (Galician) 
Currently translated at 99.3% (2588 of 2605)
 2013-04-14 15:58:00 +02:00
J.M
c149391909 Merge remote-tracking branch 'origin/QA_4_0' into master 2013-04-14 15:57:20 +02:00
J.M
1e1354faca Fix spacing in table operations, Alter table order box 2013-04-14 15:46:35 +02:00
Weblate
bed36d8711 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-04-14 15:41:49 +02:00
zz zz
d392c6ff26 Translated using Weblate (Simplified Chinese) 
Currently translated at 99.7% (2598 of 2605)
 2013-04-14 15:41:47 +02:00
J.M
f1513b2678 Fix bug #3873 Can't copy table to target database if table exists there 2013-04-14 15:40:29 +02:00
Weblate
a352413772 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-04-14 14:46:38 +02:00
Julio Guerra
534fd02231 Translated using Weblate (Galician) 
Currently translated at 99.3% (2588 of 2605)
 2013-04-14 14:46:36 +02:00
J.M
050d6d31aa Fix bug #3874 [export] No preselected option when exporting table 2013-04-14 14:46:00 +02:00
Kasun Chathuranga
1a459f3575 Fix incorrect listing of records from to count 2013-04-13 23:19:49 +05:30
Madhura Jayaratne
f9859a013c Revert 0862f0a1ee. This was suppose to be a part of the pull request 247, however erroneously merged to master. Hence reverting. 2013-04-13 18:34:02 +05:30
Madhura Jayaratne
5692546c00 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-04-13 18:21:15 +05:30
Madhura Jayaratne
ddceaedca2 Merge branch 'QA_4_0' 
Conflicts:
	po/ko.po
	po/ms.po
	po/pt_BR.po
 2013-04-13 18:05:52 +05:30
Madhura Jayaratne
637be71f0c Allow loading map tiles when HTTPS is not used 2013-04-13 17:23:35 +05:30
Weblate
bf77290011 Merge remote-tracking branch 'origin/master' 2013-04-13 13:49:41 +02:00
Rodrigo Souza
c07eae53a6 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2605 of 2605)
 2013-04-13 13:49:39 +02:00
Yungu Kim
02aec50b2b Translated using Weblate (Korean) 
Currently translated at 55.5% (1447 of 2605)
 2013-04-13 13:49:34 +02:00
Madhura Jayaratne
e3e1c05293 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-04-13 17:18:59 +05:30
Madhura Jayaratne
c833ec46fe Merge branch 'QA_4_0' 
Conflicts:
	po/ko.po
 2013-04-13 17:17:47 +05:30
Weblate
bb025f887d Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-04-13 13:44:55 +02:00
Rodrigo Souza
0873c69e16 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2605 of 2605)
 2013-04-13 13:44:53 +02:00
Ahmad Zulhilmi Idris
5fc4188b64 Translated using Weblate (Malay) 
Currently translated at 15.2% (396 of 2605)
 2013-04-13 13:44:52 +02:00
Yungu Kim
6de2c5490e Translated using Weblate (Korean) 
Currently translated at 55.5% (1447 of 2605)
 2013-04-13 13:44:50 +02:00
Madhura Jayaratne
14feb9ede5 Remove Osmarender layer as it is no longer maintained 2013-04-13 17:14:05 +05:30
Madhura Jayaratne
0862f0a1ee Allow loading map tiles when HTTPS is not used 2013-04-13 17:06:31 +05:30
Dong-bum Kim
cdca054e42 Translated using Weblate (Korean) 
Currently translated at 53.5% (1393 of 2605)
 2013-04-12 22:35:28 +02:00
adamgsoc2013
f3b9b90d77 add test case for Table Class 
1. testSetAndGet
 2013-04-13 01:48:11 +08:00
Weblate
a73a2e4ec1 Merge remote-tracking branch 'origin/master' 2013-04-12 19:20:07 +02:00
Rodrigo Souza
85b5f1d52e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2605 of 2605)
 2013-04-12 19:20:00 +02:00
Madhura Jayaratne
8b50d0771c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-04-12 22:49:11 +05:30
Madhura Jayaratne
ea09916fe5 Wrap more long lines 2013-04-12 22:47:29 +05:30
Madhura Jayaratne
5233193a26 Wrap some long lines 2013-04-12 22:38:27 +05:30
Weblate
49b4a117f0 Merge remote-tracking branch 'origin/master' 2013-04-12 18:49:11 +02:00
Rodrigo Souza
ecce13b5f5 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2605 of 2605)
 2013-04-12 18:49:06 +02:00