Commit Graph

75127 Commits

Author SHA1 Message Date
Abdurahman Taskibaev
fb8d50ba71 Translated using Weblate. 2012-04-24 15:28:22 +02:00
Michal Čihař
499bf0b479 Merge remote-tracking branch 'origin/master' 2012-04-24 15:00:26 +02:00
Michal Čihař
f1e2bfc103 Wrap comments 2012-04-24 14:55:40 +02:00
Michal Čihař
e7639a9152 Better coding style 2012-04-24 14:54:25 +02:00
Michal Čihař
11fbda2304 PMA_getenv already returns empty string if not found 2012-04-24 14:54:14 +02:00
Michal Čihař
2595b5f390 Wrap some long lines 2012-04-24 14:52:30 +02:00
Michal Čihař
a209d376bc Merge remote-tracking branch 'origin/master' 2012-04-24 14:42:48 +02:00
Alex Marin
09504babb3 Translated using Weblate. 2012-04-24 14:42:46 +02:00
Michal Čihař
45f05524ad Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-24 14:42:35 +02:00
Michal Čihař
e3eb5e6196 Wrap some long lines 2012-04-24 14:12:47 +02:00
Michal Čihař
617b76c2ea Merge remote-tracking branch 'origin/master' 2012-04-24 14:08:16 +02:00
Alex Marin
9e11b7162b Translated using Weblate. 2012-04-24 14:08:13 +02:00
Marc Delisle
485bb0f410 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-24 08:07:54 -04:00
Michal Čihař
a078640436 Merge remote-tracking branch 'origin/master' 2012-04-24 14:06:41 +02:00
Alex Marin
fc5533cc71 Translated using Weblate. 2012-04-24 14:06:30 +02:00
Michal Čihař
317b365baa Various coding style improvements 2012-04-24 14:06:15 +02:00
Marc Delisle
b76ac64121 Avoid STABLE update for a non-stable release 2012-04-24 08:01:46 -04:00
Marc Delisle
b3a7232c86 Fix merge conflicts 2012-04-24 07:34:57 -04:00
Marc Delisle
715914a48d Merge branch 'QA_3_5' 2012-04-24 07:33:55 -04:00
Marc Delisle
abf645b0a3 3.5.2-dev 2012-04-24 07:33:31 -04:00
Marc Delisle
404d826e4f 3.5.1-rc1 2012-04-24 07:29:06 -04:00
Michal Čihař
0e3589619f Improve docs 2012-04-24 13:25:16 +02:00
Michal Čihař
3308e16db4 Improve docs 2012-04-24 11:58:57 +02:00
Michal Čihař
ddec158385 Merge remote-tracking branch 'origin/QA_3_5' 2012-04-24 07:40:38 +02:00
Dieter Adriaenssens
c016f6dc70 Translated using Weblate. 2012-04-24 07:29:57 +02:00
Dieter Adriaenssens
a91187b309 Translated using Weblate. 2012-04-23 16:55:27 +02:00
Yuichiro Takahashi
203e088485 Translated using Weblate. 2012-04-23 11:55:17 +02:00
Yuichiro Takahashi
73ea9b91bc Translated using Weblate. 2012-04-23 11:54:54 +02:00
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