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

95069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
d978643fc2 Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-14 06:55:05 -04:00
Marc Delisle
c8b4217e42 Fix tests 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-13 10:54:46 -04:00
Marc Delisle
308ae6fb90 Merge commit 'e38891f' 2014-09-13 10:43:19 -04:00
Marc Delisle
969aa8a987 Merge commit 'c0548df' 2014-09-13 10:43:00 -04:00
Marc Delisle
c85c9fd417 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-13 10:39:21 -04:00
Marc Delisle
757bd71959 Merge commit '01c553a' 2014-09-13 10:36:41 -04:00
Weblate
e38891f07a Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-09-13 16:35:12 +02:00
Kristjan Räts
bfc4c21b1f Translated using Weblate (Estonian) 
Currently translated at 100.0% (2768 of 2768)

[ci skip]
 2014-09-13 16:35:09 +02:00
Marc Delisle
f2be36ae80 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-13 10:33:32 -04:00
Marc Delisle
c0548df2f9 Merge commit '01c553a' into QA_4_2 2014-09-13 10:31:56 -04:00
Marc Delisle
33b39f9f1d bug #4530 [security] DOM based XSS that results to a CSRF that creates a ROOT account in certain conditions 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-13 10:30:47 -04:00
Marc Delisle
cce31f752e ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-13 08:45:46 -04:00
Marc Delisle
92640e56d3 Merge pull request #1355 from smita786/master 
avoid session timeout when user is active FR#1529
 2014-09-13 08:43:27 -04:00
Chanaka Dharmarathna
e12131f769 CSS imprvements - added more space between top menu and page content in structure and insert pages 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-13 10:45:01 +05:30
Smita Kumari
42223e1bf6 avoid session timeout when user is active FR#1529 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-09-13 03:10:40 +05:30
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