Commit Graph

75099 Commits

Author SHA1 Message Date
Michal Čihař
5894cb6cd2 Merge remote-tracking branch 'origin/QA_3_5' 2012-04-23 09:06:35 +02:00
Alex Marin
3f5491d359 Translated using Weblate. 2012-04-23 09:04:59 +02:00
Lucas David
b888e0d0a4 Translated using Weblate. 2012-04-23 09:04:59 +02:00
Alex Marin
5810a787e0 Translated using Weblate. 2012-04-23 09:04:48 +02:00
Lucas David
f8f0c59c55 Translated using Weblate. 2012-04-23 09:04:48 +02:00
Jo Michael
a6486ce67d Re-allow to truncate empty tables in database structure (reverse-merged from commit c23fc1efe6) 2012-04-22 20:23:45 +02:00
Madhura Jayaratne
4b4ffd2761 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-22 21:39:27 +05:30
Madhura Jayaratne
7f6e390f5f Improve coding style 2012-04-22 21:36:43 +05:30
Madhura Jayaratne
4b8d52d937 Fix CheckStyle warnings, Type:CloseBracketNewLine (Closing parenthesis of a multi-line IF statement must be on a new line) 2012-04-22 21:28:41 +05:30
Michal Čihař
244bafbe11 Merge remote-tracking branch 'origin/QA_3_5' 2012-04-22 17:50:49 +02:00
Michal Čihař
160f762e88 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-04-22 17:49:25 +02:00
Yuichiro Takahashi
650c7f1b82 Translated using Weblate. 2012-04-22 17:49:20 +02:00
Dieter Adriaenssens
b408c4ecd9 Translated using Weblate. 2012-04-22 17:49:18 +02:00
Michal Čihař
0ca85c0d2b Merge remote-tracking branch 'weblate/master'
Conflicts:
	po/ja.po
	po/nl.po
	po/pl.po
	po/ro.po
	po/ru.po
	po/si.po
	po/th.po
2012-04-22 17:46:46 +02:00
Madhura Jayaratne
67134da3d0 Fix style violations reported by CheckStyle 2012-04-22 20:10:19 +05:30
Marc Delisle
f804fe5cfb ChangeLog entry 2012-04-22 07:45:02 -04:00
Yuichiro Takahashi
7c6f3e10dd Translated using Weblate. 2012-04-22 12:54:12 +02:00
Dieter Adriaenssens
6db00c402d Translated using Weblate. 2012-04-22 12:54:11 +02:00
Atul Pratap Singh
00ca858181 Patch #3500882 Fixing checkbox behaviour while editing identical rows 2012-04-22 06:53:54 -04:00
Marc Delisle
bdd4fbb9f9 Merge branch 'QA_3_5' 2012-04-22 05:51:10 -04:00
Tufan Barış YILDIRIM
66c10144f3 Missing condition for confirmation message 2012-04-22 05:50:54 -04:00
Rouslan Placella
7083dd0c93 Use LF line endings instead of CRLF 2012-04-22 00:27:46 +01:00
Rouslan Placella
f6253e1e6a Remove more stray trailing whitespaces 2012-04-22 00:24:20 +01:00
Yuichiro Takahashi
eeb89b96a1 Translated using Weblate. 2012-04-22 01:12:59 +02:00
Rouslan Placella
ff66fdbdf9 Remove stray trailing whitespaces 2012-04-22 00:12:30 +01:00
Michal Čihař
3605f76973 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-04-21 22:38:14 +02:00
Marc Delisle
da0e04d179 Fix merge conflicts 2012-04-21 16:37:50 -04:00
Marc Delisle
a26aec4d80 bug #3516089 [structure] DROP does not work on defective VIEWs 2012-04-21 16:29:05 -04:00
Marc Delisle
e78a25ac76 Malayalam in language selector 2012-04-21 15:27:33 -04:00
Marc Delisle
3ae2d1852d Clarify variable names 2012-04-21 14:57:44 -04:00
Marc Delisle
3da49e3418 Clarify variable name 2012-04-21 14:48:30 -04:00
Marc Delisle
1c58314c53 Clarify function name 2012-04-21 14:40:08 -04:00
Madhura Jayaratne
06f153b4b1 Merge branch 'QA_3_5'
Conflicts:
	js/server_status_monitor.js
2012-04-21 23:54:22 +05:30
Rouslan Placella
f95d2fa43d Regenerated sprites 2012-04-21 19:19:58 +01:00
Michal Čihař
70dcbf3bc7 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-04-21 20:19:52 +02:00
Madhura Jayaratne
227644088c Make button texts translatable 2012-04-21 23:49:14 +05:30
Rouslan Placella
00b57ea19f Removed more unused images 2012-04-21 19:18:13 +01:00
Rouslan Placella
74339e7139 Merge branch 'images' 2012-04-21 19:10:44 +01:00
Rouslan Placella
80e2eda56a Use CSS gradients instead of image backgrounds 2012-04-21 19:09:16 +01:00
Madhura Jayaratne
f856db18ab Merge branch 'QA_3_5'
Conflicts:
	js/server_status_monitor.js
2012-04-21 23:18:14 +05:30
Michal Čihař
fee7d94dde Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-04-21 19:45:45 +02:00
Madhura Jayaratne
24af8431bb Setting the title initially is problematic with commit faeffd3 2012-04-21 23:14:07 +05:30
Rouslan Placella
d2bc29220e Removed unused images 2012-04-21 18:31:28 +01:00
Madhura Jayaratne
af7173b4c9 Translated using Weblate. 2012-04-21 19:16:19 +02:00
Madhura Jayaratne
f203b456b2 Merge branch 'QA_3_5'
Conflicts:
	js/server_status_monitor.js
2012-04-21 22:45:38 +05:30
Michal Čihař
74bd0ab221 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-04-21 19:11:01 +02:00
Setthawut Sawaengkit
74d632159c Translated using Weblate. 2012-04-21 19:10:55 +02:00
Madhura Jayaratne
0bd73341b3 Translated using Weblate. 2012-04-21 19:10:55 +02:00
Victor Volkov
3cf070f17f Translated using Weblate. 2012-04-21 19:10:54 +02:00
Alex Marin
ba224548d7 Translated using Weblate. 2012-04-21 19:10:54 +02:00