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

95577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
4a22906590 Merge remote-tracking branch 'origin/master' 2014-10-25 15:02:11 +02:00
Fadhiil Rachman
c6595420e8 Translated using Weblate (Indonesian) 
Currently translated at 71.8% (2136 of 2973 strings)

[CI skip]
 2014-10-25 15:02:09 +02:00
Marc Delisle
7d110fa4f4 4.2.10.1 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-25 09:00:54 -04:00
Marc Delisle
0b9bd29f27 Merge branch 'QA_4_2' 2014-10-25 08:59:12 -04:00
Marc Delisle
ad024b1192 Merge commit '2a67e33' 2014-10-25 08:59:05 -04:00
Marc Delisle
1e51819d6e bug in makegrid.js: where_clause is undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-25 08:58:20 -04:00
Marc Delisle
b58f072c75 Fix parameter type warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-24 14:25:21 -04:00
Marc Delisle
5687d9792b Improve parameter doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-24 14:11:21 -04:00
Weblate
953993cd92 Merge remote-tracking branch 'origin/master' 2014-10-24 19:00:38 +02:00
Ed Jr
2290a1990c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.1% (2798 of 2973 strings)

[CI skip]
 2014-10-24 19:00:37 +02:00
Marc Delisle
e92107b9b5 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-24 13:00:23 -04:00
Weblate
ce2cad3ef5 Merge remote-tracking branch 'origin/master' 2014-10-23 18:59:19 +02:00
Ion Adrian-Ionut
181bd52169 Translated using Weblate (Romanian) 
Currently translated at 60.8% (1809 of 2973 strings)

[CI skip]
 2014-10-23 18:59:17 +02:00
Marc Delisle
e8e62d00f0 Merge branch 'QA_4_2' 2014-10-23 12:58:09 -04:00
Weblate
2a67e3340d Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-23 18:57:59 +02:00
Ion Adrian-Ionut
7ec9944355 Translated using Weblate (Romanian) 
Currently translated at 62.4% (1729 of 2768 strings)

[CI skip]
 2014-10-23 18:57:58 +02:00
Eyal Visoker
12b7effa0c Translated using Weblate (Hebrew) 
Currently translated at 21.4% (595 of 2768 strings)

[CI skip]
 2014-10-23 18:57:56 +02:00
Dennis Jakobsen
92ef2afd6f Translated using Weblate (Danish) 
Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]
 2014-10-23 18:57:55 +02:00
Marc Delisle
e6c3f10d72 bug #4571 Database Privileges link does not work 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-23 12:57:45 -04:00
Weblate
4b3f233581 Merge remote-tracking branch 'origin/master' 2014-10-23 13:46:26 +02:00
Dennis Jakobsen
7aabfffac2 Translated using Weblate (Danish) 
Currently translated at 96.5% (2871 of 2973 strings)

[CI skip]
 2014-10-23 13:46:25 +02:00
Marc Delisle
0f58673cee Merge pull request #1383 from smita786/master 
moving out inline js from db_designer.lib.php plus minor bug fixes
 2014-10-23 07:46:22 -04:00
Ann + J.M
5b5d50e471 Fix phpdoc errors 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 21:11:50 +02:00
Ann + J.M
953e865fc6 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 20:44:50 +02:00
Chanaka Dharmarathna
b1b6232c04 Remove dead codes 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-10-22 23:08:13 +05:30
Smita Kumari
28622a4bcc fixing coding style 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-22 22:53:35 +05:30
Weblate
5f50dc9e8a Merge remote-tracking branch 'origin/master' 2014-10-22 18:41:18 +02:00
Eyal Visoker
b5d04d24c1 Translated using Weblate (Hebrew) 
Currently translated at 19.6% (584 of 2973 strings)

[CI skip]
 2014-10-22 18:41:17 +02:00
Marc Delisle
5df7783e97 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-22 12:41:06 -04:00
Smita Kumari
b4906839e4 remove trailing white spaces 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-21 23:45:32 +05:30
Smita Kumari
41eda0819a resolve conflict 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-21 23:43:10 +05:30
Madhura Jayaratne
c678cc5bb0 Merge branch 'QA_4_2' 2014-10-21 22:27:13 +05:30
Madhura Jayaratne
1e21d7b0da bug #4568 Date displayed incorrectly when charting a timeline 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-21 22:24:44 +05:30
Madhura Jayaratne
35b228d534 Merge branch 'QA_4_2' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-21 22:03:10 +05:30
Madhura Jayaratne
e28912d49e bug #4557 PHP fatal error, undefined function __() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-21 21:59:46 +05:30
Madhura Jayaratne
3334ca3ce6 bug #4564 Designer: spaces in table name with edit table link generates bad links 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-21 21:20:24 +05:30
Madhura Jayaratne
ef33a839fb Avoid accessing undefined indexes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-21 21:05:06 +05:30
Marc Delisle
387f6aa273 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-10-21 10:39:58 -04:00
Marc Delisle
b906e51112 Merge commit 'd8d4a80' 2014-10-21 10:39:43 -04:00
Marc Delisle
dde9ca7c79 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-21 10:38:46 -04:00
Michal Čihař
a00cc2b106 Translated using Weblate (Czech) 
Currently translated at 93.7% (2787 of 2973 strings)

[CI skip]
 2014-10-21 16:33:48 +02:00
Marc Delisle
1ca706fd1e Merge commit '319aac3' 2014-10-21 10:31:43 -04:00
Marc Delisle
83e3223524 Merge commit '8186a0e' 2014-10-21 10:31:29 -04:00
Weblate
a5516f3b34 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-21 16:31:12 +02:00
josep constanti
4e7fbc287c Translated using Weblate (Catalan) 
Currently translated at 88.3% (2446 of 2768 strings)

[CI skip]
 2014-10-21 16:31:10 +02:00
Marc Delisle
d8d4a8062a Merge commit 'd0e3ab3' into QA_4_2 2014-10-21 10:29:37 -04:00
Marc Delisle
873ffa3ffe Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-21 10:29:14 -04:00
Marc Delisle
b75e19f8df Merge commit '319aac3' into QA_4_2 2014-10-21 10:27:49 -04:00
Marc Delisle
d0e3ab3bc9 4.2.10.1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-21 10:26:58 -04:00
Smita Kumari
d87a99e01c moving inline js out from db_designer.lib.php plus minor bug fixes 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-21 12:40:09 +05:30