Commit Graph

49520 Commits

Author SHA1 Message Date
Thilanka Kaushalya
3f7c35cd69 Fixed bug in refresing the navigation after table operations 2011-08-02 21:39:58 +05:30
Thilanka Kaushalya
5ee97c7787 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-02 21:34:28 +05:30
Thilanka Kaushalya
18310f6b40 Fixed bug in refresing the navigation after table operations 2011-08-02 21:33:47 +05:30
Michal Čihař
85d729ac5f Coding style adjustments 2011-08-02 16:57:32 +02:00
Michal Čihař
f4b86a21d0 Merge remote-tracking branch 'pootle/master' 2011-08-02 16:51:07 +02:00
Michal Čihař
8f262140fa Improve coding style 2011-08-02 16:48:57 +02:00
Michal Čihař
b4a0b3f776 Remove tabs, remove dead code 2011-08-02 16:45:00 +02:00
Pootle server
c36df906f0 Merge remote-tracking branch 'origin/master' 2011-08-02 16:40:26 +02:00
Michal Čihař
46cec0c8da Merge remote-tracking branch 'origin/QA_3_4' 2011-08-02 16:22:04 +02:00
Michal Čihař
78fdc7d3f4 Merge commit 'c17add38ed40312f934451e1d1cf1f0b0ef8240e'
Conflicts:
	js/sql.js
2011-08-02 16:21:56 +02:00
Michal Čihař
e466dec53b Update from master 2011-08-02 16:18:21 +02:00
Rouslan Placella
c17add38ed Fixed bug #3374802 - Comment on a column breaks inline editing 2011-08-02 16:15:39 +02:00
Yuichiro
bbaa465a67 Translation update done using Pootle. 2011-08-02 16:09:12 +02:00
Yuichiro
2e6421038a Translation update done using Pootle. 2011-08-02 16:08:30 +02:00
Yuichiro
1657409d56 Translation update done using Pootle. 2011-08-02 16:08:01 +02:00
Yuichiro
c3cd4aba62 Translation update done using Pootle. 2011-08-02 16:06:47 +02:00
Michal Čihař
9fcb5e7c86 Merge branch 'fix-inlineedit' of git://github.com/csware/phpmyadmin into integration 2011-08-02 16:04:07 +02:00
Yuichiro
44991badfc Translation update done using Pootle. 2011-08-02 15:55:07 +02:00
Yuichiro
233092543b Translation update done using Pootle. 2011-08-02 15:54:54 +02:00
Michal Čihař
98cff52cf8 Fix indentation in few places 2011-08-02 15:54:52 +02:00
Michal Čihař
3769b849aa Forgot to reindent some files 2011-08-02 15:53:19 +02:00
Michal Čihař
7e7be00f84 Forgot to reindent this one 2011-08-02 15:50:44 +02:00
Yuichiro
2abffe5682 Translation update done using Pootle. 2011-08-02 15:47:59 +02:00
Yuichiro
43f18b93cf Translation update done using Pootle. 2011-08-02 15:46:46 +02:00
Yuichiro
3c75861e51 Translation update done using Pootle. 2011-08-02 15:45:17 +02:00
Yuichiro
9d9c1fc904 Translation update done using Pootle. 2011-08-02 15:43:18 +02:00
Michal Čihař
8cb1f3a1cc Fix indentation 2011-08-02 15:25:27 +02:00
Yuichiro
8cb8a3d4c7 Translation update done using Pootle. 2011-08-02 12:41:35 +02:00
Yuichiro
07690aa7ea Translation update done using Pootle. 2011-08-02 11:59:31 +02:00
Yuichiro
d74f90b848 Translation update done using Pootle. 2011-08-02 11:53:15 +02:00
Yuichiro
d7807aee24 Translation update done using Pootle. 2011-08-02 11:52:12 +02:00
Yuichiro
5cf92b0cc8 Translation update done using Pootle. 2011-08-02 11:50:41 +02:00
Yuichiro
fdceb91948 Translation update done using Pootle. 2011-08-02 11:50:15 +02:00
Yuichiro
5020a62da0 Translation update done using Pootle. 2011-08-02 11:49:57 +02:00
Yuichiro
a275af5e8b Translation update done using Pootle. 2011-08-02 11:49:42 +02:00
Yuichiro
a0334dee87 Translation update done using Pootle. 2011-08-02 11:46:59 +02:00
Yuichiro
d0cd77517c Translation update done using Pootle. 2011-08-02 11:46:11 +02:00
Yuichiro
29c398e923 Translation update done using Pootle. 2011-08-02 11:45:25 +02:00
Yuichiro
62cb73505c Translation update done using Pootle. 2011-08-02 11:43:54 +02:00
Yuichiro
ffeaf03547 Translation update done using Pootle. 2011-08-02 11:41:00 +02:00
Burak Yavuz
2e2ba2732f Translation update done using Pootle. 2011-08-02 10:45:33 +02:00
Burak Yavuz
4bea4ab7fe Translation update done using Pootle. 2011-08-02 10:44:41 +02:00
Burak Yavuz
1182ef584d Translation update done using Pootle. 2011-08-02 10:44:03 +02:00
Burak Yavuz
96c3dc32a4 Translation update done using Pootle. 2011-08-02 10:41:17 +02:00
Burak Yavuz
ec8a4e140f Translation update done using Pootle. 2011-08-02 10:40:38 +02:00
Burak Yavuz
cea2a9c531 Translation update done using Pootle. 2011-08-02 10:38:27 +02:00
Burak Yavuz
28e50fd5ba Translation update done using Pootle. 2011-08-02 10:37:53 +02:00
Pootle server
f7323710ea Merge remote-tracking branch 'origin/master' 2011-08-02 02:40:19 +02:00
Piotr Przybylski
3a373b4a14 Respect MaxCharactersInDisplayedSQL in process list on Server Status page 2011-08-02 01:27:52 +02:00
Sven Strickroth
a458f0d644 Translation update done using Pootle. 2011-08-01 20:57:39 +02:00