Commit Graph

88119 Commits

Author SHA1 Message Date
Hugues Peccatte
146879ea14 Update po files 2013-12-01 00:40:45 +01:00
Hugues Peccatte
6b2ed44c50 Display error message when using "Change Login Information / Copy User" dialog to update password (bug 4157) 2013-12-01 00:21:05 +01:00
Marc Delisle
458cb8c626 Merge branch 'QA_4_1' 2013-11-30 08:13:11 -05:00
Marc Delisle
35ab010a46 4.1.0-rc2 2013-11-30 08:12:31 -05:00
Weblate
5efb085912 Merge remote-tracking branch 'origin/master' 2013-11-30 13:46:17 +01:00
Andriy Bandura
cbbe265fd7 Translated using Weblate (Ukrainian)
Currently translated at 94.2% (2584 of 2742)
2013-11-30 13:46:12 +01:00
Marc Delisle
204e138770 - Fix typo
- Fix coding style
2013-11-30 07:44:15 -05:00
Madhura Jayaratne
e28f8824bf Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-11-30 00:04:04 +05:30
Madhura Jayaratne
03fef95e14 Coding style fixes - valid class names 2013-11-30 00:00:56 +05:30
Weblate
2b6d6ffd3e Merge remote-tracking branch 'origin/master' 2013-11-29 19:17:05 +01:00
Andriy Bandura
925a687fbb Translated using Weblate (Ukrainian)
Currently translated at 86.4% (2371 of 2742)
2013-11-29 19:17:01 +01:00
Madhura Jayaratne
4484acdc49 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-11-29 23:46:31 +05:30
Madhura Jayaratne
728d3f32a3 Doc comment improvements 2013-11-29 23:23:19 +05:30
Marc Delisle
6c90e8b8b7 Merge branch 'QA_4_1' 2013-11-29 12:23:02 -05:00
Weblate
64dece9fb3 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2013-11-29 18:20:20 +01:00
Chien Wei Lin
432ab953c1 Translated using Weblate (Traditional Chinese)
Currently translated at 100.0% (2742 of 2742)
2013-11-29 18:20:15 +01:00
흥재 신
6191c36fb4 Translated using Weblate (Korean)
Currently translated at 71.0% (1948 of 2742)
2013-11-29 18:20:10 +01:00
Atul Pratap Singh
91ab107e3a Fix bug#4146, set guid of wrapped function same as original function 2013-11-29 12:19:14 -05:00
Chien Wei Lin
955a8e8f1e Translated using Weblate (Traditional Chinese)
Currently translated at 100.0% (2742 of 2742)
2013-11-29 15:23:34 +01:00
Atul Pratap Singh
5fd23f1385 Fix bug#4146, set guid of wrapped function same as original function 2013-11-29 22:22:28 +05:30
Weblate
a63bf83abe Merge remote-tracking branch 'origin/master' 2013-11-29 11:35:49 +01:00
흥재 신
ce1631ec0b Translated using Weblate (Korean)
Currently translated at 71.0% (1948 of 2742)
2013-11-29 11:35:43 +01:00
Marc Delisle
b7015b68f4 Fix coding style 2013-11-29 05:34:32 -05:00
Madhura Jayaratne
e97a5fedef Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-11-28 23:15:52 +05:30
Madhura Jayaratne
de2f210fc9 Improve doc comments 2013-11-28 23:13:41 +05:30
Marc Delisle
7aa96075fa Merge branch 'QA_4_1' 2013-11-28 12:40:37 -05:00
Marc Delisle
a07ff540f3 Merge commit 'a88e3b3' 2013-11-28 12:40:28 -05:00
Marc Delisle
a65be4fef8 Complete the list of credits for GSoC 2013 2013-11-28 12:39:58 -05:00
Marc Delisle
8f9652e903 Merge pull request #719 from ruleant/string_width
move duplicate getStringWidth method to seperate class
2013-11-28 08:07:08 -08:00
Madhura Jayaratne
ecbcfa3e36 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-11-28 21:35:47 +05:30
Madhura Jayaratne
6a5062af3d Fix failing tests 2013-11-28 21:34:02 +05:30
Dieter Adriaenssens
0fe2acc424 Merge branch 'master' into string_width
Conflicts:
	test/classes/schema/Svg_test.php
2013-11-28 16:32:49 +01:00
Weblate
7c7b0eba0c Merge remote-tracking branch 'origin/master' 2013-11-28 14:08:46 +01:00
Helder Santana
251d1b18e3 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2742 of 2742)
2013-11-28 14:08:42 +01:00
Marc Delisle
fd1563d10b Fix coding style 2013-11-28 08:08:31 -05:00
Helder Santana
a88e3b3ffe Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2742 of 2742)
2013-11-28 14:02:38 +01:00
Madhura Jayaratne
b47bf72063 Fix coding style 2013-11-28 00:04:20 +05:30
Madhura Jayaratne
30390d4ae2 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-11-28 00:03:56 +05:30
Madhura Jayaratne
ab9a1273ee Drizzle compatibility 2013-11-28 00:02:49 +05:30
Marc Delisle
4ccf98d58c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-11-27 13:09:04 -05:00
Marc Delisle
fe668e138f Fix tests 2013-11-27 13:08:51 -05:00
Madhura Jayaratne
ab3fa5e2bd Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-11-27 23:14:36 +05:30
Madhura Jayaratne
ca5494c320 Fix spacing in doc comments 2013-11-27 23:11:57 +05:30
Marc Delisle
20770f3f33 Merge branch 'QA_4_1' 2013-11-27 12:41:45 -05:00
Marc Delisle
fbce9502e4 Fix merge conflicts 2013-11-27 12:41:01 -05:00
Marc Delisle
b22b76e7f5 bug #4158 Events page says no privileges with ALL PRIVILEGES 2013-11-27 12:36:51 -05:00
Madhura Jayaratne
846d991d2a Merge branch 'QA_4_1' 2013-11-27 22:59:39 +05:30
Weblate
fde793a730 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2013-11-27 18:20:29 +01:00
Lakshmanan M
5629cf644f Translated using Weblate (Tamil)
Currently translated at 15.0% (413 of 2742)
2013-11-27 18:20:25 +01:00
Matías Bellone
dc82e778d3 Translated using Weblate (Spanish)
Currently translated at 100.0% (2742 of 2742)
2013-11-27 18:20:23 +01:00