Commit Graph

78560 Commits

Author SHA1 Message Date
Michal Čihař
5b56ea6e75 Merge remote-tracking branch 'origin/QA_3_5' 2012-08-31 10:40:03 +02:00
Weblate
2fcf7d7a58 Merge remote-tracking branch 'origin/master' 2012-08-31 08:52:10 +02:00
Namuk Kang
22c698fc4d Translated using Weblate. 2012-08-31 08:52:05 +02:00
Weblate
694f971755 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-08-31 08:52:01 +02:00
ProUser
12300850cd Translated using Weblate. 2012-08-31 08:51:58 +02:00
Michal Čihař
9c9e1d5c33 Merge branch 'QA_3_5' 2012-08-31 08:50:58 +02:00
Michal Čihař
66ec8870eb Add missing format string 2012-08-31 08:50:47 +02:00
Michal Čihař
f97658827e Merge remote-tracking branch 'origin/QA_3_5' 2012-08-31 08:49:48 +02:00
Weblate
b5827eb233 Merge remote-tracking branch 'origin/master' 2012-08-31 05:08:51 +02:00
ProUser
ae8b5ec51f Translated using Weblate. 2012-08-31 05:08:42 +02:00
Madhura Jayaratne
54b0cb49c8 Doc comments 2012-08-31 08:37:46 +05:30
ProUser
760276d04b Translated using Weblate. 2012-08-30 22:36:40 +02:00
Madhura Jayaratne
1924f342bc Merge branch 'QA_3_5'
Conflicts:
	build.xml
	po/ar.po
	po/pt_BR.po
2012-08-31 01:55:06 +05:30
Weblate
5a8a458f5a Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-08-30 22:15:53 +02:00
Rui Simoes
7c24e9472a Translated using Weblate. 2012-08-30 22:15:50 +02:00
مترجم حرّ
d172c8ac44 Translated using Weblate. 2012-08-30 22:15:47 +02:00
Madhura Jayaratne
efafb8c156 Ignore jqplot files in CheckStyle analysis 2012-08-31 01:45:00 +05:30
Weblate
1226790de0 Merge remote-tracking branch 'origin/master' 2012-08-30 21:59:02 +02:00
Rui Simoes
eb884a5ac8 Translated using Weblate. 2012-08-30 21:58:58 +02:00
مترجم حرّ
c4fb4532fd Translated using Weblate. 2012-08-30 21:58:55 +02:00
Madhura Jayaratne
f21aa802f8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-08-31 01:28:02 +05:30
Madhura Jayaratne
7e169fcaef Coding style improvements 2012-08-31 01:27:17 +05:30
Madhura Jayaratne
ba16e22315 Coding style improvements 2012-08-31 00:46:35 +05:30
Weblate
68d9e03cca Merge remote-tracking branch 'origin/master' 2012-08-30 19:55:38 +02:00
مترجم حرّ
74fa94d209 Translated using Weblate. 2012-08-30 19:55:34 +02:00
Weblate
0c13414f23 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-08-30 19:55:07 +02:00
Guto Rocha
2833a60d0d Translated using Weblate. 2012-08-30 19:55:03 +02:00
مترجم حرّ
f11d5422ef Translated using Weblate. 2012-08-30 19:54:58 +02:00
Madhura Jayaratne
7c2b8ca8b6 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-08-30 23:24:31 +05:30
Atul Pratap Singh
87e5288441 Merge branch 'QA_3_5-jqplot' into QA_3_5 2012-08-30 23:19:52 +05:30
Madhura Jayaratne
78c36808e5 Fix method names 2012-08-30 23:17:25 +05:30
Weblate
665e863344 Merge remote-tracking branch 'origin/master' 2012-08-30 19:46:14 +02:00
مترجم حرّ
2b2f79b92b Translated using Weblate. 2012-08-30 19:46:10 +02:00
Atul Pratap Singh
47e79dea1f Merge remote-tracking branch 'upstream/master' 2012-08-30 23:14:28 +05:30
Atul Pratap Singh
d44714fefc Resolve conflicts while merging QA_3_5-jqplot to master 2012-08-30 23:11:24 +05:30
Madhura Jayaratne
542cea013f Fix variable names 2012-08-30 23:07:04 +05:30
Atul Pratap Singh
2f88914bbd jqplot: fix settings to somewhat enable charts 2012-08-30 23:05:02 +05:30
Madhura Jayaratne
5aea2de2cb Proper function naming 2012-08-30 22:52:32 +05:30
Madhura Jayaratne
3062786732 Coding style fixes 2012-08-30 22:50:31 +05:30
Madhura Jayaratne
9edee90ba5 Fix coding style 2012-08-30 22:45:52 +05:30
Madhura Jayaratne
1ebe5f4499 Fix coding style 2012-08-30 22:36:49 +05:30
Madhura Jayaratne
97da49085b Remove trailing white spaces 2012-08-30 22:36:30 +05:30
Madhura Jayaratne
35f29764f0 Fix multi line conditions 2012-08-30 22:35:56 +05:30
Madhura Jayaratne
12fbba3724 Inline control structures are discouraged 2012-08-30 22:19:00 +05:30
Madhura Jayaratne
226c3d5186 Trailing white space cleanup 2012-08-30 22:17:55 +05:30
Madhura Jayaratne
38aa111ffe Fix spaces in between arguments of function calls 2012-08-30 22:07:36 +05:30
Madhura Jayaratne
c49a5df9a3 Remove tabs and trailing white spaces 2012-08-30 22:03:07 +05:30
Weblate
4d14e99d16 Merge remote-tracking branch 'origin/master' 2012-08-30 18:04:13 +02:00
gurjit dhillon
f4242416cb Translated using Weblate. 2012-08-30 18:04:09 +02:00
Guto Rocha
faf60a4e52 Translated using Weblate. 2012-08-30 18:04:06 +02:00