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

92673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
9c0a72d996 Update po files 2014-05-24 09:08:12 -04:00
Marc Delisle
ee7d793599 Merge commit '7b00947' 2014-05-24 09:07:46 -04:00
Marc Delisle
68eca169a8 Merge commit '60fca63' 2014-05-24 09:07:19 -04:00
Marc Delisle
7b00947113 Update po files 2014-05-24 09:05:53 -04:00
Marc Delisle
60fca63630 Missing message for /setup 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-24 09:05:10 -04:00
Marc Delisle
489826139e Merge commit '16036ac' 2014-05-23 10:31:20 -04:00
Marc Delisle
7e43534848 Merge commit '54e2c0f' 2014-05-23 10:30:45 -04:00
Marc Delisle
c1756b96e3 Merge commit '56d5ef0' 2014-05-23 10:30:10 -04:00
Marc Delisle
1a32869ba1 Merge commit 'ec29a0c' 2014-05-23 10:29:13 -04:00
Marc Delisle
ad1e2352ca Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-23 10:28:48 -04:00
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
Atul Pratap Singh
16036ac143 Fix bug#4424 Table indexes disappear after altering field 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-05-22 23:44:31 +05:30
Atul Pratap Singh
54e2c0f82a Use setdate and make input readonly 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-05-22 23:05:55 +05:30
Atul Pratap Singh
56d5ef04a0 Date format problem in firefox, use jquery datepicker to get date 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-05-22 21:49:46 +05:30
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
ec29a0c59d Add missing ) 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 21:46:54 +02:00
Ann + J.M
5facff36bd Add missing break in # comment detection switch 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 21:43:20 +02:00
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