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

94173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
bf263492fc Update po files 2014-07-26 09:19:12 -04:00
Weblate
7f29e5b6ea Merge remote-tracking branch 'origin/master' 2014-07-26 06:38:38 +02:00
Burak Yavuz
c89ac5c76b Translated using Weblate (Turkish) 
Currently translated at 99.3% (2924 of 2943)
 2014-07-26 06:38:35 +02:00
Madhura Jayaratne
a34b6fea5a Merge pull request #1283 from kb-yashodha/indexdb 
IndexDB for designer - Use the designer without configuring tables
 2014-07-26 10:08:32 +05:30
Marc Delisle
75d12daa09 Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-25 17:46:05 -04:00
Marc Delisle
8bfda09b8f Merge pull request #1301 from D-storm/tests 
improve test cases of server_privileges.lib.php
 2014-07-25 17:42:39 -04:00
Marc Delisle
7c9931d1e7 Merge pull request #1298 from D-storm/update 
update transformation path in getInfo method
 2014-07-25 17:40:16 -04:00
Chirayu Chiripal
1d65c1d2f2 improve test cases of server_privileges.lib.php 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-26 02:06:00 +05:30
Marc Delisle
f41666c0ac Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-25 15:38:46 -04:00
Weblate
a321fecac0 Merge remote-tracking branch 'origin/master' 2014-07-25 21:30:28 +02:00
Burak Yavuz
951303a065 Translated using Weblate (Turkish) 
Currently translated at 99.3% (2923 of 2943)
 2014-07-25 21:30:24 +02:00
Marc Delisle
c125e5a8bc Merge pull request #1300 from mebjas/pma_drag&drop 
#BUG:4496 -- part 2 fix
 2014-07-25 15:30:21 -04:00
minhaz
7d2cfdf573 #Feature:1522 enhancement 
- User can close the upload status box, after uploading an invalid extension file, as suggested by D-Storm
 - minimize/maximise changed from -/- to -/+

Signed-off-by: A V Minhaz <minhazav@gmail.com>
 2014-07-26 00:36:18 +05:30
Marc Delisle
605381469f Clarify variable's origin 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-25 11:54:56 -04:00
minhaz
51ffa87647 Merge pull request #1 from D-storm/drag-drop-import 
check dragged element is file or not
 2014-07-25 16:06:02 +05:30
Chirayu Chiripal
e7087eb698 check dragged element is file or not 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-25 15:46:06 +05:30
Bimal Yashodha
39d4fc1023 Check whether the db is not system schema 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-25 15:36:48 +05:30
Bimal Yashodha
28571419a1 Escape HTML 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-25 14:44:41 +05:30
Bimal Yashodha
72adfea9bb Make callbacks non mandatory 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-25 14:30:58 +05:30
Bimal Yashodha
e03e19b470 Fix issues highlighted 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-25 14:30:35 +05:30
minhaz
6330df4175 #BUG4496 -- part 2, propagation bug fixed 
Signed-off-by: A V Minhaz <minhazav@gmail.com>
 2014-07-25 14:28:27 +05:30
Weblate
6533ae7377 Merge remote-tracking branch 'origin/master' 2014-07-25 07:21:49 +02:00
Edward Cheng
3553901c07 Translated using Weblate (Simplified Chinese) 
Currently translated at 84.3% (2482 of 2943)
 2014-07-25 07:21:46 +02:00
Sevdimali İsa
89daed5501 Translated using Weblate (Azerbaijani) 
Currently translated at 46.4% (1367 of 2943)
 2014-07-25 07:21:43 +02:00
Michal Čihař
adb9ab921e Merge pull request #1299 from SiebelsTim/fix-hhvm-serverport 
Fix default port to null for hhvm
 2014-07-25 07:21:42 +02:00
minhaz
c78b05eeab #BUG:4496 -- part 2 fix 
Signed-off-by: A V Minhaz <minhazav@gmail.com>
 2014-07-25 02:25:29 +05:30
Tim Siebels
d9cbf2664c Fix default port to null for hhvm 
HHVM doesn't allow false to be passed as port to mysqli_real_connect.
It only allows a nullable integer until ZendParamMode is finished.

See facebook/hhvm#1817

Signed-off-by: Tim Siebels <tim_siebels_aurich@yahoo.de>
 2014-07-24 17:54:21 +02:00
Marc Delisle
484a85a51b Clarify variable's origin 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-24 05:11:00 -07:00
Chirayu Chiripal
871ad6d8ab update transformation path in getInfo method 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-24 14:14:03 +05:30
Michal Čihař
f060e5905d Fixed path to transformation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-07-24 07:27:05 +02:00
Marc Delisle
6fa46343c9 Merge commit '91e7a32' 2014-07-23 08:49:11 -07:00
Marc Delisle
430d62b6b1 Regenerate sprites 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-23 08:48:46 -07:00
Marc Delisle
91e7a32aaf Regenerate sprites 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-23 08:47:30 -07:00
Marc Delisle
0af93fcbb1 Merge commit 'c2aada9' 2014-07-23 08:46:13 -07:00
Marc Delisle
ef08d707d5 Merge commit '09b6dc6' 2014-07-23 08:45:55 -07:00
Marc Delisle
50c3c7eed7 Merge commit '5c6723a' 2014-07-23 08:45:40 -07:00
Marc Delisle
c2aada9dc9 Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 2014-07-23 08:44:52 -07:00
Marc Delisle
09b6dc6c1f bug #4493 s_attention.png is missing 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-23 08:44:32 -07:00
Marc Delisle
e326b2bfaa Update po files 2014-07-23 08:38:53 -07:00
Marc Delisle
e2b38097ba Merge branch 'QA_4_2' 2014-07-23 08:37:10 -07:00
Marc Delisle
edfd5cb6dd Merge commit '5870fc9' 2014-07-23 08:36:59 -07:00
Weblate
5c6723af9f Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-07-23 17:36:41 +02:00
கணேஷ் குமார்
652ae05c04 Translated using Weblate (Tamil) 
Currently translated at 31.0% (860 of 2768)
 2014-07-23 17:36:36 +02:00
Giovanni Sora
945b6c7b8a Translated using Weblate (Interlingua) 
Currently translated at 57.5% (1594 of 2768)
 2014-07-23 17:36:34 +02:00
Marc Delisle
2688b367a8 Remove code for older MySQL version (no longer supported) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-23 08:36:08 -07:00
Marc Delisle
1e09c92b7b Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-07-23 08:10:07 -07:00
Marc Delisle
54a12d97cf Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-23 07:01:51 -07:00
Weblate
d007595842 Merge remote-tracking branch 'origin/master' 2014-07-23 15:50:06 +02:00
Burak Yavuz
a600477cd4 Translated using Weblate (Turkish) 
Currently translated at 99.1% (2920 of 2944)
 2014-07-23 15:50:01 +02:00
கணேஷ் குமார்
91299d5431 Translated using Weblate (Tamil) 
Currently translated at 31.7% (936 of 2944)

கிடைக்கபெறும் உலவியின் காட்சித்தெரிவு மாற்றமைப்புகள்
 2014-07-23 15:49:54 +02:00