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

94845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
b00afd54e7 Merge branch 'QA_4_2' 2014-08-21 13:09:12 -04:00
Marc Delisle
d3f4d1c2c3 Merge commit '7c29ef9' 2014-08-21 13:09:00 -04:00
Marc Delisle
70fbae31aa Merge commit '89d57f8' 2014-08-21 13:07:21 -04:00
Marc Delisle
8862de224a bug #4518 Export to SQL: CREATE TABLE option AUTO_INCREMENT ignored 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-21 13:06:48 -04:00
Marc Delisle
7c29ef9438 Merge pull request #1340 from smita786/QA_4_2 
Fix bug #4518
 2014-08-21 13:04:59 -04:00
Smita Kumari
89d57f8336 Fix bug #4518 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-21 21:39:11 +05:30
Madhura Jayaratne
94738c9e67 Merge branch 'QA_4_2' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-21 19:29:29 +05:30
Madhura Jayaratne
fae3858669 bug #4521 Initially allowed chart types do not match selected data 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-21 19:24:33 +05:30
Marc Delisle
ed6968eabc Add missing parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-21 09:04:28 -04:00
Marc Delisle
3da4600891 Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-20 12:38:19 -04:00
Marc Delisle
861b0b0954 Merge branch 'QA_4_2' 2014-08-20 12:29:20 -04:00
Marc Delisle
27c6ffb7d3 Merge commit 'fedc2ba' 2014-08-20 12:29:13 -04:00
Weblate
70e52f3cb3 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-20 18:28:05 +02:00
Alex Smirnov
17b8f3efb3 Translated using Weblate (Ukrainian) 
Currently translated at 96.9% (2683 of 2768)

[ci skip]
 2014-08-20 18:28:02 +02:00
s.c. yoo
dcb290fc10 Translated using Weblate (Korean) 
Currently translated at 83.3% (2308 of 2768)

[ci skip]
 2014-08-20 18:27:59 +02:00
Marc Delisle
4992cea190 bug #4520 sql.js: cannot read property 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-20 12:27:05 -04:00
Weblate
8f23c88fda Merge remote-tracking branch 'origin/master' 2014-08-20 14:27:20 +02:00
Alex Smirnov
22da4e0dd5 Translated using Weblate (Ukrainian) 
Currently translated at 91.5% (2713 of 2965)

[ci skip]
 2014-08-20 14:27:17 +02:00
s.c. yoo
56220b4770 Translated using Weblate (Korean) 
Currently translated at 77.6% (2301 of 2965)

[ci skip]
 2014-08-20 14:27:13 +02:00
Marc Delisle
d2d6145c70 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-20 08:27:03 -04:00
Hugues Peccatte
570ca18011 PHPDoc update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-08-19 17:23:41 +02:00
Marc Delisle
29fca69f57 Merge branch 'QA_4_2' 2014-08-19 08:52:06 -04:00
Marc Delisle
0b4909a584 Merge commit '9109c96' 2014-08-19 08:51:59 -04:00
Weblate
fedc2ba51d Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-19 14:51:47 +02:00
Alex Smirnov
c9807b838f Translated using Weblate (Ukrainian) 
Currently translated at 95.8% (2653 of 2768)

[ci skip]
 2014-08-19 14:51:44 +02:00
Alecsandru Prună
af6b8da5a7 Translated using Weblate (Romanian) 
Currently translated at 61.8% (1713 of 2768)

[ci skip]
 2014-08-19 14:51:42 +02:00
Pl
4db6c42bc8 Translated using Weblate (Bulgarian) 
Currently translated at 64.8% (1795 of 2768)

[ci skip]
 2014-08-19 14:51:39 +02:00
Marc Delisle
a2ab758e9b bug #4519 Uncaught TypeError: Cannot read property 'success' of null 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-19 08:51:15 -04:00
Remi Collet
4f352990dc fix gettext include path 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-19 07:49:15 -04:00
Marc Delisle
5a677a3ec4 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-18 21:34:19 -04:00
Marc Delisle
6d3a919ee0 Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-18 21:10:49 -04:00
Alex Smirnov
f6b1462ed1 Translated using Weblate (Ukrainian) 
Currently translated at 88.3% (2619 of 2965)

[ci skip]
 2014-08-18 15:18:53 +02:00
Pl
9b564d2e4e Translated using Weblate (Bulgarian) 
Currently translated at 59.3% (1760 of 2965)

[ci skip]
 2014-08-18 15:18:51 +02:00
Marc Delisle
8da8eb2a4f Translated using Weblate (French) 
Currently translated at 100.0% (2965 of 2965)

[ci skip]
 2014-08-18 15:18:32 +02:00
Kristjan Räts
4b6831c916 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2965 of 2965)

[ci skip]
 2014-08-18 09:18:49 +02:00
Ibrahim Redzhebov
9109c96322 Translated using Weblate (Bulgarian) 
Currently translated at 64.4% (1785 of 2768)

[ci skip]
 2014-08-17 20:57:43 +02:00
Domen
8b5634502a Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2965 of 2965)

[ci skip]
 2014-08-17 20:05:49 +02:00
Weblate
31875e2730 Merge remote-tracking branch 'origin/master' 2014-08-17 19:37:30 +02:00
Ibrahim Redzhebov
3e3ad02128 Translated using Weblate (Bulgarian) 
Currently translated at 59.0% (1751 of 2965)

[ci skip]
 2014-08-17 19:37:25 +02:00
Marc Delisle
f7fd63916c Merge pull request #1337 from ashutoshdhundhara/scrutinizer_fix 
Fix issues reported by Scrutinizer.
 2014-08-17 13:37:22 -04:00
Marc Delisle
440fddd85e Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-08-17 12:50:04 -04:00
Marc Delisle
0927941195 Merge commit 'f47eaae' 2014-08-17 12:49:47 -04:00
Weblate
8faf31cba0 Merge remote-tracking branch 'origin/master' 2014-08-17 18:48:50 +02:00
Alex Smirnov
756e7a00e8 Translated using Weblate (Ukrainian) 
Currently translated at 88.2% (2617 of 2965)

[ci skip]
 2014-08-17 18:48:46 +02:00
Alecsandru Prună
ba7a744dc8 Translated using Weblate (Romanian) 
Currently translated at 60.6% (1797 of 2965)

[ci skip]
 2014-08-17 18:48:43 +02:00
Panagiotis Papazoglou
3c4ad5d52b Translated using Weblate (Greek) 
Currently translated at 100.0% (2965 of 2965)

[ci skip]
 2014-08-17 18:48:40 +02:00
Marc Delisle
8ee9b58d90 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 12:48:09 -04:00
Marc Delisle
38b8cd7a80 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 12:40:53 -04:00
Marc Delisle
0c7702518b Merge commit '773c507' 2014-08-17 12:40:01 -04:00
Weblate
f47eaae742 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-17 15:48:26 +02:00