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

92658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
decbcdfeee Merge commit '524e82e' 2014-05-23 10:24:35 -04:00
Marc Delisle
e50b0d2b71 Merge commit 'daaf70b' 2014-05-23 10:23:51 -04:00
Marc Delisle
7630006be2 Merge commit 'd666ed6' 2014-05-23 10:23:31 -04:00
Marc Delisle
20b2a3a707 Merge commit '28074d2' 2014-05-23 10:22:51 -04:00
Marc Delisle
9373e1b204 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-23 10:21:37 -04:00
Marc Delisle
1acfaf4a7f Merge commit 'ddbe5ae' 2014-05-23 10:15:49 -04:00
Marc Delisle
e98a9a7bdb Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-23 10:03:39 -04:00
Weblate
737df91c37 Merge remote-tracking branch 'origin/master' 2014-05-22 14:17:35 +02:00
கணேஷ் குமார்
68d39e8fd9 Translated using Weblate (Tamil) 
Currently translated at 27.8% (773 of 2772)

தலைப்புக்களைப் பெறுவதில் தவறியது.->நிறைவரிசை எண்ணிக்கையை பெற தவறியது.
 2014-05-22 14:17:31 +02:00
Marc Delisle
3bb157d6ce Merge pull request #1191 from D-storm/browse-foreign 
fixed browse foreign values copying description in input field
 2014-05-22 08:17:24 -04:00
Chirayu Chiripal
58dba3809f fixed browse foreign values copying description in input field 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-22 13:49:05 +05:30
Ann + J.M
524e82e33c Extrace query cache total blocks value correctly 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 21:34:21 +02:00
Ann + J.M
daaf70bca2 Rename OptionsPropertyOneItem::$_force overwritten from parent 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 21:29:51 +02:00
Ann + J.M
d666ed61af Comment that missing break statement is intended 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 21:25:44 +02:00
Ann + J.M
28074d27f4 Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 21:22:12 +02:00
Ann + J.M
5ddd0c1990 Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 20:56:01 +02:00
Ann + J.M
ddbe5aed27 DBQbe::_getInsDelAndOrCell: Fix PHPDoc param type 2014-05-21 20:19:23 +02:00
Ann + J.M
9f186aae7d ini_set: Use string for param 2 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 20:19:17 +02:00
Marc Delisle
6e7c8439c0 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-05-21 12:52:09 -04:00
Isaac Bennetch
02c4e352c5 Merge pull request #1189 from D-storm/FR-982 
rfe-982: Support for editing binary fields in hexadecimal
 2014-05-21 12:52:02 -04:00
Marc Delisle
0db68db620 Merge branch 'QA_4_2' 2014-05-21 12:51:03 -04:00
Marc Delisle
c2d719b4eb bug #4423 Moving fields not working 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-21 12:49:55 -04:00
Marc Delisle
eebac0cd0f Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-21 12:21:23 -04:00
Chirayu Chiripal
85390a7169 rfe-982: Support for editing binary fields in hexadecimal 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-21 21:42:21 +05:30
Marc Delisle
635534e068 Merge pull request #1188 from D-storm/testcase-fix 
failing test fix
 2014-05-20 17:56:03 -04:00
Chirayu Chiripal
146b204a0b failing test fix 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-21 00:09:55 +05:30
Marc Delisle
161d22a587 4.2.3-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-20 08:30:25 -04:00
Marc Delisle
f32e14c2c6 Merge commit '45f33fd' 2014-05-20 08:29:42 -04:00
Marc Delisle
45f33fdafe Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 2014-05-20 08:28:52 -04:00
Marc Delisle
634307329e 4.2.3-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-20 08:28:42 -04:00
Weblate
4d70eda6b4 Merge remote-tracking branch 'origin/master' 2014-05-20 14:22:29 +02:00
Jouni Kähkönen
b9fc353774 Translated using Weblate (Finnish) 
Currently translated at 62.1% (1722 of 2772)
 2014-05-20 14:22:26 +02:00
Marc Delisle
f027527c51 Merge branch 'QA_4_2' 2014-05-20 08:22:00 -04:00
Weblate
c3860e8f5b Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-20 14:21:52 +02:00
Jouni Kähkönen
37ea4aa905 Translated using Weblate (Finnish) 
Currently translated at 62.2% (1722 of 2768)
 2014-05-20 14:21:49 +02:00
Marc Delisle
fda047361d Fix notice 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-20 08:21:27 -04:00
Marc Delisle
8e99c1159f Merge branch 'QA_4_2' 2014-05-19 17:40:00 -04:00
Marc Delisle
389d26c811 Merge commit '9207203' 2014-05-19 17:39:53 -04:00
Marc Delisle
7937cbde62 Complete the fix for bug #4418 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-19 17:38:55 -04:00
Ann + J.M
9207203a56 Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:51:33 +02:00
Ann + J.M
d9bd81a2a1 Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:40:24 +02:00
Ann + J.M
69ddb29989 Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:33:01 +02:00
Ann + J.M
5cab1dfbf2 Add string check for json_decode in SavedSearches::setCriterias 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:20:14 +02:00
Ann + J.M
ec5292fb31 Config class: Drop dead initializations 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:06:52 +02:00
Ann + J.M
6743e78ea4 PMA_Bookmark_delete: Drop unnecessary $db param 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:04:22 +02:00
Ann + J.M
8838d58666 Advisor class: Drop unnecessary initialization 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:03:39 +02:00
Ann + J.M
b3dbec1107 Advisor: Check for possibly undefined memory usage values 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 21:48:25 +02:00
Ann + J.M
71fb5057a3 rfe #1523 Better visual clue for table structure primary key column 
Signed-Off-By: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 14:02:08 +02:00
Marc Delisle
9b15ce4d27 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-05-19 07:39:39 -04:00
Marc Delisle
24720826cc Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-19 07:39:36 -04:00