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

97346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
9cdcd992b1 Merge branch 'QA_4_3' 2015-01-21 11:14:58 +05:30
Madhura Jayaratne
cb18ec2320 bug #4700 Error text: Internal Server Error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-21 11:13:44 +05:30
Madhura Jayaratne
888a58ff0c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-21 10:23:55 +05:30
Madhura Jayaratne
fbb1c42176 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-21 10:23:10 +05:30
Madhura Jayaratne
11612c6420 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2015-01-21 10:16:50 +05:30
Madhura Jayaratne
2002e9d6f8 ChangeLog entry for bug #4719 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-21 10:15:40 +05:30
Madhura Jayaratne
d1d5ee02f4 Merge branch 'bug4719' into QA_4_3 2015-01-21 10:13:28 +05:30
Weblate
6df22f5eb8 Merge remote-tracking branch 'origin/master' 2015-01-21 05:38:48 +01:00
Krystian Biesaga
3385e88a14 Translated using Weblate (Polish) 
Currently translated at 88.5% (2646 of 2987 strings)

[CI skip]
 2015-01-21 05:38:45 +01:00
josep constanti
666f1002f2 Translated using Weblate (Catalan) 
Currently translated at 84.5% (2526 of 2988 strings)

[CI skip]
 2015-01-21 05:38:42 +01:00
Madhura Jayaratne
43e5a71e2c Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-21 10:08:39 +05:30
Weblate
1dd6915157 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-21 05:32:11 +01:00
Krystian Biesaga
07b3ba91cf Translated using Weblate (Polish) 
Currently translated at 89.1% (2659 of 2982 strings)

[CI skip]
 2015-01-21 05:32:08 +01:00
josep constanti
c84da25657 Translated using Weblate (Catalan) 
Currently translated at 84.8% (2530 of 2982 strings)

[CI skip]
 2015-01-21 05:32:06 +01:00
Madhura Jayaratne
924e5128d9 Add ChangeLog entry for bug #4721 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-21 10:01:47 +05:30
Madhura Jayaratne
190ea0452e Merge branch 'bug4721' into QA_4_3 2015-01-21 10:00:55 +05:30
Marc Delisle
e9807d2e3e Fix doc for removed parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-20 13:32:41 -05:00
Madhura Jayaratne
6ff3e42d53 Check whether version and date is set 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-20 23:31:46 +05:30
Madhura Jayaratne
56027c51ba Lose navigation panel state on pref save. There is no point of selectively preserving it. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-20 23:21:50 +05:30
Marc Delisle
535db88e47 Merge branch 'QA_4_3' 2015-01-20 12:48:58 -05:00
Marc Delisle
4e5866a8a6 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-20 12:48:34 -05:00
Marc Delisle
5c8ed0e35e Merge pull request #1463 from rakeshkaundilya/QA_4_3 
BugFix#4714
 2015-01-20 12:47:18 -05:00
Marc Delisle
ac6859149f Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-20 09:14:52 -05:00
RAKESH KUMAR
915f209ca1 BugFix#4714 
Signed-off-by: RAKESH KUMAR <rakeshkumar4294@gmail.com>
 2015-01-20 19:34:12 +05:30
Weblate
006788069a Merge remote-tracking branch 'origin/master' 2015-01-19 18:41:15 +01:00
Martin Lacina
ba202fb735 Translated using Weblate (Slovak) 
Currently translated at 79.1% (2364 of 2988 strings)

[CI skip]
 2015-01-19 18:41:12 +01:00
Juha
0630416931 Translated using Weblate (Finnish) 
Currently translated at 64.5% (1930 of 2988 strings)

[CI skip]
 2015-01-19 18:41:10 +01:00
Marc Delisle
3e16842639 Merge commit '8bc1de7' 2015-01-19 12:40:35 -05:00
Marc Delisle
a1b908a9b7 Merge commit 'd33df18' 2015-01-19 12:40:19 -05:00
Marc Delisle
9d3860fa14 Merge commit 'cdf9a7c' 2015-01-19 12:40:06 -05:00
Weblate
8bc1de7c8d Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-19 18:39:39 +01:00
Martin Lacina
1422cb28b5 Translated using Weblate (Slovak) 
Currently translated at 79.4% (2366 of 2979 strings)

[CI skip]
 2015-01-19 18:39:36 +01:00
Juha
79e2ce9cbc Translated using Weblate (Finnish) 
Currently translated at 64.7% (1930 of 2982 strings)

[CI skip]
 2015-01-19 18:39:34 +01:00
Marc Delisle
d33df18248 Merge pull request #1461 from ashutoshdhundhara/datepicker_bug 
bug#4712: Wrongly positioned date-picker while Grid-Editing.
 2015-01-19 12:39:27 -05:00
Ashutosh Dhundhara
c9c280e992 bug#4712: Wrongly positioned date-picker while Grid-Editing. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2015-01-19 12:21:54 +05:30
Marc Delisle
9f7b25a269 Merge branch 'QA_4_3' 2015-01-18 06:37:16 -05:00
Marc Delisle
b43acad3d9 Merge commit '5bcda83' 2015-01-18 06:36:58 -05:00
Weblate
cdf9a7ca3a Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-18 12:36:49 +01:00
Martin Lacina
1d8d57e691 Translated using Weblate (Slovak) 
Currently translated at 78.9% (2353 of 2979 strings)

[CI skip]
 2015-01-18 12:36:46 +01:00
worldwideskier
27ec01ca12 Translated using Weblate (Japanese) 
Currently translated at 73.2% (2184 of 2982 strings)

[CI skip]
 2015-01-18 12:36:43 +01:00
Juha
0e9c5b8627 Translated using Weblate (Finnish) 
Currently translated at 64.0% (1909 of 2982 strings)

[CI skip]
 2015-01-18 12:36:41 +01:00
Marc Delisle
27540ea81a Bug Undefined constant PMA_DRIZZLE 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-18 06:36:23 -05:00
Weblate
2dc457de44 Merge remote-tracking branch 'origin/master' 2015-01-18 11:45:46 +01:00
worldwideskier
5cc71359e8 Translated using Weblate (Japanese) 
Currently translated at 72.7% (2174 of 2988 strings)

[CI skip]
 2015-01-18 11:45:43 +01:00
Marc Delisle
3b9ade288b exclude third-party library (sql-formatter) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-18 05:45:30 -05:00
Balázs Úr
ba7f6dc4be Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2988 of 2988 strings)

[CI skip]
 2015-01-18 10:27:13 +01:00
Marc Delisle
71491754a4 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-17 07:14:45 -05:00
Marc Delisle
06991961de ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-17 07:00:15 -05:00
Marc Delisle
55c3e7877f Merge pull request #1450 from nisargjhaveri/sql_format 
SQL formatting with sql-formatter
 2015-01-17 06:57:46 -05:00
Nisarg Jhaveri
7d03fff8a3 Some tests for sql-formatter 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-01-17 17:17:06 +05:30