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

95032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Weblate
bcdcd9ca6c Merge remote-tracking branch 'origin/master' 2014-09-03 00:21:27 +02:00
Dieter Adriaenssens
f291158069 Translated using Weblate (Dutch) 
Currently translated at 98.6% (2923 of 2964)

[ci skip]
 2014-09-03 00:21:24 +02:00
Marc Delisle
bfd832b2da Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-02 18:21:12 -04:00
Marc Delisle
a19804dc5c Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-02 18:18:58 -04:00
Igor Prokopenkov
b497324ad6 Removed trailing whitespace 
Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
 2014-09-02 15:13:39 +03:00
Igor Prokopenkov
5a5bd3e535 Fixed undefined index notices 
Fixed misspelling in the comment

Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
 2014-09-02 15:06:54 +03:00
Marc Delisle
8a79d8316d ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-02 07:50:56 -04:00
Weblate
bd63258d41 Merge remote-tracking branch 'origin/master' 2014-09-02 13:49:48 +02:00
Alex Smirnov
4d7e19839b Translated using Weblate (Russian) 
Currently translated at 99.7% (2956 of 2964)

[ci skip]
 2014-09-02 13:49:44 +02:00
Marc Delisle
f2e6c24370 Merge pull request #1350 from cmyker/master 
Support of MariaDB 10+ multi-master replication functionality See https:...
 2014-09-02 07:49:39 -04:00
cmyker
06e8b65738 Support of MariaDB 10+ multi-master replication functionality See https://mariadb.com/kb/en/mariadb/documentation/replication-cluster-multi-master/replication/multi-source-replication/ 
Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
 2014-09-02 13:52:09 +03:00
Marc Delisle
4faa0d1ebd Merge branch 'QA_4_2' 2014-09-01 11:39:50 -04:00
Marc Delisle
2a34539a48 bug ajax.js responseHandler: cannot read property of null 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-01 11:39:07 -04:00
Marc Delisle
afd2abbe3c Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-01 09:04:33 -04:00
Marc Delisle
3ebd68a315 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 20:22:21 -04:00
Marc Delisle
ecdc5f3dc6 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 17:10:59 -04:00
chanaka
f26f6287db Remove useless code 
Signed-off-by: chanaka <chanaka@oneit.com.au>
 2014-08-31 22:37:47 +05:30
Marc Delisle
321d3eee91 Merge branch 'QA_4_2' 2014-08-31 10:54:56 -04:00
Marc Delisle
d56af4f911 4.2.8 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 10:54:18 -04:00
Marc Delisle
68c82fcd2e 4.2.9-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 10:50:23 -04:00
Marc Delisle
0266a6a55c Merge commit 'b0d3056' 2014-08-31 10:49:52 -04:00