gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,053 Commits 12 Branches 481 Tags 2.4 GiB
22096fcdc8
Commit Graph

95053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
22096fcdc8 Merge remote-tracking branch 'origin/master' 2014-09-12 14:28:57 +02:00
Kristjan Räts
abd86bec45 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2964 of 2964)

[ci skip]
 2014-09-12 14:28:54 +02:00
Marc Delisle
7b6c4e01e3 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-12 08:28:42 -04:00
Marc Delisle
2b7ef3f31f Merge branch 'QA_4_2' 2014-09-11 08:12:32 -04:00
Marc Delisle
1ef714febe bug #4529 Undefined index: pos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-11 08:12:06 -04:00
Marc Delisle
f8742726a6 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-10 19:19:14 -04:00
Marc Delisle
e35133c25e Remove unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-10 07:29:45 -04:00
Marc Delisle
9f65021d1e Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-09 09:21:27 -04:00
Hugues Peccatte
3cd1d69f8b Improve PMA_String* unit tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-08 21:49:55 +02:00
Marc Delisle
ac964a1470 rfe #1544 MySQL 5.7.5 compatibility 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-08 13:20:04 -04:00
Michal Čihař
e7b0530fdb Exclude composer installation directory from code checks 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-09-08 16:10:10 +02:00
Marc Delisle
e8a12ad9b4 Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-08 08:03:36 -04:00
Marc Delisle
7f6bceebb7 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-07 16:56:19 -04:00
Hugues Peccatte
38e78437cb Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-09-07 17:14:01 +02:00
Hugues Peccatte
cf5783e427 Merge remote-tracking branch 'origin/QA_4_2' 2014-09-07 17:13:07 +02:00
Hugues Peccatte
c3aeccad1d Merge commit 'e1664a35e' 2014-09-07 17:09:14 +02:00
Hugues Peccatte
87b1cd1a2d Merge pull request #1354 from Tithugues/b4524_q42 
Fix #4524: Add missing 0 initial on the "Users overview".
 2014-09-07 17:06:16 +02:00
Marc Delisle
b3bcdf55ee Remove unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-07 09:40:02 -04:00
Marc Delisle
dec999944b Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-09-07 09:25:26 -04:00
Marc Delisle
2905b29f68 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-07 09:25:14 -04:00
Hugues Peccatte
360a012c88 Add missing definition. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-07 15:24:58 +02:00
Hugues Peccatte
451ece01f4 Fix #4524: Add missing 0 initial on the "Users overview". 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-07 15:17:27 +02:00
Hugues Peccatte
e28a833103 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-09-07 00:32:14 +02:00
Hugues Peccatte
5985894160 Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-07 00:31:45 +02:00
Marc Delisle
64ca449359 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-06 14:14:24 -04:00
Marc Delisle
fde42eb2e8 No need to have a distinct file 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-06 14:11:04 -04:00
Hugues Peccatte
ff0011ac3f Merge pull request #1353 from Tithugues/securityStringSquash 
Mass modifications to use PMA_String.
 2014-09-06 19:15:06 +02:00
Hugues Peccatte
623715c5f9 Add PMA_String::substrCount. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 17:53:30 +02:00
Hugues Peccatte
70366f31c1 Move method definition. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 17:09:48 +02:00
Hugues Peccatte
d4bbde9ec5 Make Scrutinizer happier. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 17:05:00 +02:00
Hugues Peccatte
fe452a7240 Make Scrutinizer happier. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 13:56:42 +02:00
Marc Delisle
4b757d0516 Merge pull request #1352 from D-storm/null-datetime 
check null checkbox for datetime with default value null
 2014-09-06 06:45:46 -04:00
Hugues Peccatte
767b45380c Merge branch 'master' into securityStringSquash 2014-09-06 11:48:24 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
Chirayu Chiripal
a4e2472108 check null checkbox for datetime with default value null 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-09-06 13:47:06 +05:30
Marc Delisle
4def6c262b Merge branch 'QA_4_2' 2014-09-05 12:39:14 -04:00
Weblate
e1664a35e2 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-09-05 18:39:05 +02:00
Alex Smirnov
6e34c029fd Translated using Weblate (Russian) 
Currently translated at 99.8% (2765 of 2768)

[ci skip]
 2014-09-05 18:39:02 +02:00
Marc Delisle
efbf606a4d bug sql.js: str is undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-05 12:38:04 -04:00
Marc Delisle
7d918615e2 Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-05 10:35:15 -04:00
Marc Delisle
726e291beb Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-09-04 05:55:50 -04:00
Marc Delisle
461035cbed Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-04 05:55:44 -04:00
Weblate
ab363605f9 Merge remote-tracking branch 'origin/master' 2014-09-04 11:44:59 +02:00
Caio Fonsêca
d7431f6783 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.6% (2777 of 2964)

[ci skip]
 2014-09-04 11:44:56 +02:00
Marc Delisle
582b02262b Remove Overhead from Server > Databases > Enable Statistics. We cannot show 
correct results in the case of InnoDB tables.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-04 05:43:02 -04:00
Marc Delisle
3464916f30 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-03 13:41:23 -04:00
Weblate
873f2f93cf Merge remote-tracking branch 'origin/master' 2014-09-03 19:32:15 +02:00
Aputsiaq Niels Janussen
9ee46bef3e Translated using Weblate (Danish) 
Currently translated at 96.8% (2870 of 2964)

[ci skip]
 2014-09-03 19:32:11 +02:00
Marc Delisle
a7bad3e7bf Merge pull request #1351 from cmyker/master 
Fixed undefined index notices
 2014-09-03 13:32:04 -04:00
Igor Prokopenkov
adb0ad4fb8 https://github.com/phpmyadmin/phpmyadmin/pull/1351/files#r16997280 
Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
 2014-09-03 12:50:12 +03:00