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

95596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
62d04772ed Merge commit '2b4ed22' 2014-10-28 15:53:38 -04:00
Marc Delisle
83789ce982 Merge commit '347d345' 2014-10-28 15:53:25 -04:00
Marc Delisle
2b4ed22505 bug #4572 missing trailing slash (import and open_basedir) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-28 15:51:10 -04:00
Marc Delisle
90ee48f0ba Merge pull request #1384 from phpmyadmin/ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style 
RFE 1550: PMA_URL_getCommon(): new style
 2014-10-28 08:14:45 -04:00
Ann + J.M
ddbcb5165a Fix unit tests 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-28 11:37:17 +01:00
Marc Delisle
5d62fcbf78 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-27 15:01:29 -04:00
Marc Delisle
e7598d7cc9 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-27 12:57:35 -04:00
Weblate
5da5636527 Merge remote-tracking branch 'origin/master' 2014-10-26 15:00:03 +01:00
Dadan Setia
cd75356587 Translated using Weblate (Indonesian) 
Currently translated at 74.2% (2206 of 2973 strings)

[CI skip]
 2014-10-26 15:00:01 +01:00
Marc Delisle
2662295765 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-26 09:59:48 -04:00
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
Weblate
347d345942 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-25 14:58:37 +02:00
Fadhiil Rachman
193d93e56d Translated using Weblate (Indonesian) 
Currently translated at 78.6% (2176 of 2768 strings)

[CI skip]
 2014-10-25 14:58:35 +02: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
c98356f9fc Fix unit test 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 20:55:30 +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
Ann + J.M
6feb3b0d3a Fix failing unit tests 
Signed-off-by: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 20:06:14 +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
Ann + J.M
29ec69c849 Merge branch 'master' into ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 16:58:00 +02: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