gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,751 Commits 12 Branches 481 Tags 2.4 GiB
6e688982cc
Commit Graph

96751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
6e688982cc Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-12-23 15:15:50 +05:30
Madhura Jayaratne
974f7afe71 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-23 15:15:18 +05:30
Madhura Jayaratne
7cf678f79d bug #4664 select min() displays 1 row, but reports the table amount of rows returned 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-23 15:03:23 +05:30
Atul Pratap Singh
21b63f9af4 Fix js reports: JSONparse Syntax Error: Unexpected token '<' 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-12-23 14:16:56 +05:30
Marc Delisle
26ecf0e954 Merge commit 'f735d23' 2014-12-22 11:54:21 -05:00
Marc Delisle
11f22027dd Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-22 11:54:04 -05:00
Marc Delisle
f735d2360b Merge pull request #1434 from Tithugues/b4648_qa43_browseTab 
Remove borders in table browse tab (linked to #4648).
 2014-12-22 11:51:49 -05:00
Hugues Peccatte
66c7c04582 Remove borders in table browse tab (linked to #4648). 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-22 14:16:40 +01:00
Marc Delisle
44060b77c9 Merge branch 'QA_4_3' 2014-12-22 07:33:02 -05:00
Madhura Jayaratne
481e89ac94 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-22 07:32:05 -05:00
Madhura Jayaratne
3621900b96 Merge branch 'QA_4_3' 2014-12-22 17:10:35 +05:30
Madhura Jayaratne
fbe587ce73 bug #4661 Drag and drop file import always fails 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-22 17:09:10 +05:30
Madhura Jayaratne
05a75cdae9 Fix comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-22 16:02:40 +05:30
Madhura Jayaratne
f6165c649f Update tcpdf to version 6.2.3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-22 15:56:40 +05:30
Madhura Jayaratne
40dc352d3b Merge branch 'QA_4_3' 2014-12-22 15:03:18 +05:30
Madhura Jayaratne
bac38f3ef6 bug #4653 Always connection error was shown, on /setup at tab "configuration storage" 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-22 14:58:58 +05:30
Michal Čihař
d2fe838f72 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-21 13:06:38 +01:00
Michal Čihař
79ec938ec4 Merge branch 'QA_4_3' 2014-12-21 13:06:04 +01:00
Michal Čihař
fb731ad37b Merge remote-tracking branch 'weblate-4.3/QA_4_3' into QA_4_3 
Conflicts:
	po/nl.po
 2014-12-21 13:05:45 +01:00
Marc Delisle
918d8d3253 Merge commit '3960df3' 2014-12-21 06:33:05 -05:00
Marc Delisle
7f7b465599 4.3.3 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-21 06:32:26 -05:00
Marc Delisle
3960df34bc 4.3.4-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-21 06:31:09 -05:00
Marc Delisle
3767f0ec92 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-21 06:13:23 -05:00
Marc Delisle
796f616e88 Merge commit '409049c' 2014-12-21 06:12:56 -05:00
A. Voogt
8b695200e7 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-12-21 12:12:31 +01:00
Marc Delisle
409049ce33 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-21 06:11:56 -05:00
Weblate
4ce3f59ca8 Merge remote-tracking branch 'origin/master' 2014-12-21 11:38:52 +01:00
A. Voogt
6099e4ac83 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2989 of 2989 strings)

[CI skip]
 2014-12-21 11:38:50 +01:00
Smita Kumari
16a8565d56 Merge pull request #1432 from smita786/master 
bug fix #4662
 2014-12-21 16:08:44 +05:30
Smita Kumari
8380d5b0c1 bug fix #4662 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-12-21 02:46:37 +05:30
Weblate
d521f39c7c Merge remote-tracking branch 'origin/master' 2014-12-20 21:07:02 +01:00
A. Voogt
804416c7d8 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2989 of 2989 strings)

[CI skip]
 2014-12-20 21:06:59 +01:00
Marc Delisle
a9676e31e1 Merge branch 'QA_4_3' 2014-12-20 15:06:26 -05:00
Marc Delisle
74e61bd3db Merge commit 'ec4d80b' 2014-12-20 15:06:17 -05:00
Marc Delisle
cefcefc009 Merge commit '8415dd4' 2014-12-20 15:06:04 -05:00
Marc Delisle
490f4befdf Merge commit 'd1a4e7d' 2014-12-20 15:05:53 -05:00
Marc Delisle
e88e44f554 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-20 15:04:22 -05:00
Weblate
ec4d80b98d Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-20 21:00:45 +01:00
A. Voogt
5a90333587 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-12-20 21:00:43 +01:00
Marc Delisle
c64b77981e Merge pull request #1431 from rakeshkaundilya/QA_4_3 
fix bug #4659: trim white spaces
 2014-12-20 15:00:40 -05:00
Rakesh Kumar
8415dd4d35 fix bug #4659: trim white spaces 
Signed-off-by: Rakesh Kumar <rakeshkumar4294@gmail.com>
 2014-12-21 00:55:20 +05:30
Luis Garcia
a0818c8332 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2989 of 2989 strings)

[CI skip]
 2014-12-20 20:09:37 +01:00
Luis Garcia
d1a4e7d7cc Translated using Weblate (Spanish) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-12-20 20:06:24 +01:00
Weblate
15469864d7 Merge remote-tracking branch 'origin/master' 2014-12-20 19:35:04 +01:00
Szász Attila
3efcb3606f Translated using Weblate (Hungarian) 
Currently translated at 79.7% (2385 of 2989 strings)

[CI skip]
 2014-12-20 19:35:01 +01:00
A. Voogt
2886d9299b Translated using Weblate (Dutch) 
Currently translated at 100.0% (2989 of 2989 strings)

[CI skip]
 2014-12-20 19:35:00 +01:00
Marc Delisle
944bc3abad Merge branch 'QA_4_3' 2014-12-20 13:33:43 -05:00
Marc Delisle
f7129c504b Merge commit '1a0603c' 2014-12-20 13:33:12 -05:00
Weblate
1ee864d74c Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-20 19:32:56 +01:00
Balázs Úr
e2f8b75c16 Translated using Weblate (Hungarian) 
Currently translated at 80.1% (2386 of 2978 strings)

[CI skip]
 2014-12-20 19:32:53 +01:00