Commit Graph

74754 Commits

Author SHA1 Message Date
Julio Guerra
7d9475aa3e Translated using Weblate. 2012-04-14 16:07:12 +02:00
Julio Guerra
31843d66d0 Translated using Weblate. 2012-04-14 15:03:46 +02:00
Michal Čihař
88d7eb6f1a Merge remote-tracking branch 'origin/master' 2012-04-14 14:26:19 +02:00
Madhura Jayaratne
b991118914 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-14 17:50:45 +05:30
Madhura Jayaratne
10727d665b Code refactoring to remove some duplications 2012-04-14 17:47:14 +05:30
Madhura Jayaratne
8e62b92d70 Coding style improvements 2012-04-14 17:44:39 +05:30
Michal Čihař
556fb19cd6 Merge remote-tracking branch 'origin/master' 2012-04-14 13:40:30 +02:00
Marc Delisle
e0637ba0c2 Merge branch 'QA_3_5' 2012-04-14 07:39:07 -04:00
Michal Čihař
198a270ddc Merge remote-tracking branch 'origin/master' 2012-04-14 13:38:48 +02:00
ruleant
89a95661a6 Merge pull request #30 from wiltave/master
Small fixes
2012-04-14 04:38:38 -07:00
Marc Delisle
8b31dd3991 Merge branch 'MAINT_3_5_0' into QA_3_5 2012-04-14 07:38:28 -04:00
Marc Delisle
ea17cef342 Fix merge conflicts 2012-04-14 07:38:03 -04:00
Marc Delisle
7738ec98e8 Merge branch 'QA_3_4' into MAINT_3_5_0 2012-04-14 07:36:52 -04:00
Marc Delisle
3345d64a6f 3.4.11 release 2012-04-14 07:35:22 -04:00
Michal Čihař
f494214d92 Merge remote-tracking branch 'origin/master' 2012-04-14 07:12:34 +02:00
Madhura Jayaratne
ef68eaa254 Fix Checkstyle Warnings - Type: CloseBracketLine 2012-04-14 10:40:39 +05:30
Michal Čihař
cdef4b2ef7 Merge remote-tracking branch 'origin/master' 2012-04-14 05:44:06 +02:00
Julio Guerra
f5e022763a Translated using Weblate. 2012-04-14 05:43:56 +02:00
Madhura Jayaratne
3332151859 Fix Checkstyle Warnings - Type: CloseBracketLine (Closing parenthesis of a multi-line function call must be on a line by itself) 2012-04-14 09:09:21 +05:30
Willian Gustavo Veiga
bf540384ee Unnecessary "else" statement removed 2012-04-13 22:12:28 -03:00
Willian Gustavo Veiga
fca5517ae6 Small typo: "JavaScript" instead of "Java script" 2012-04-13 22:08:25 -03:00
Julio Guerra
9792ba4dbf Translated using Weblate. 2012-04-14 00:46:24 +02:00
Michal Čihař
7939044653 Merge remote-tracking branch 'origin/master' 2012-04-13 19:35:14 +02:00
Jo Michael
e662600415 Calculate table action more_opts maximum width correctly 2012-04-13 19:34:10 +02:00
Jo Michael
92f8d794c7 Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 2012-04-13 19:24:22 +02:00
Jo Michael
b2aee016c4 Calculate table action more_opts maximum width correctly 2012-04-13 19:23:51 +02:00
Michal Čihař
44ed411ba2 Merge remote-tracking branch 'origin/master' 2012-04-13 19:05:24 +02:00
Madhura Jayaratne
ba21546008 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-13 22:33:43 +05:30
Madhura Jayaratne
6b2a502de7 Merge branch 'QA_3_5' 2012-04-13 22:32:19 +05:30
Michal Čihař
aa29f4fcac Merge remote-tracking branch 'origin/master' 2012-04-13 18:41:32 +02:00
Madhura Jayaratne
d19ede62f9 Translated using Weblate. 2012-04-13 18:41:27 +02:00
Marc Delisle
7e00134398 Merge pull request #26 from mynetx/codemirror_enable
Allow disabling CodeMirror
2012-04-13 09:41:23 -07:00
Madhura Jayaratne
ea800101cb Fix Checkstyle Warnings - Type: BraceOnSameLine 2012-04-13 21:50:26 +05:30
Dieter Adriaenssens
8a69710150 Translated using Weblate. 2012-04-13 18:00:37 +02:00
Madhura Jayaratne
fa9aaea8c0 Coding style improvements 2012-04-13 20:57:17 +05:30
Madhura Jayaratne
3af218eb76 Make some messages translatable 2012-04-13 19:56:47 +05:30
Michal Čihař
dac767f3c4 Merge remote-tracking branch 'origin/QA_3_5' 2012-04-13 10:07:23 +02:00
Madhura Jayaratne
2707c6c463 Translated using Weblate. 2012-04-13 10:06:35 +02:00
Jo Michael
8744f8cf66 + rfe #3517354 [interface] Allow disabling CodeMirror with $cfg['CodemirrorEnable'] = false 2012-04-13 01:43:32 +02:00
Michal Čihař
1fc4e7cafd Merge remote-tracking branch 'origin/master' 2012-04-12 23:40:33 +02:00
Madhura Jayaratne
d43c1de210 Translated using Weblate. 2012-04-12 23:40:28 +02:00
Marc Delisle
6557b71b88 ChangeLog entry
Protect script contents with CDATA, see
https://developer.mozilla.org/En/Properly_Using_CSS_and_JavaScript_in_XHTML_Documents
2012-04-12 17:38:59 -04:00
Atul Pratap Singh
5ab6e746b8 Patch #3517040 Login screen appears under the page 2012-04-12 17:31:54 -04:00
Michal Čihař
f7de1a212b Merge remote-tracking branch 'origin/QA_3_5' 2012-04-12 16:08:29 +02:00
Madhura Jayaratne
9dc092c4a6 Translated using Weblate. 2012-04-12 16:07:54 +02:00
Julio Guerra
a3df522316 Translated using Weblate. 2012-04-12 16:07:53 +02:00
Madhura Jayaratne
2dedc5ae0d Translated using Weblate. 2012-04-12 16:07:42 +02:00
Julio Guerra
59f2b77364 Translated using Weblate. 2012-04-12 16:07:41 +02:00
Robert Readman
243ec3e798 Translated using Weblate. 2012-04-12 15:12:41 +02:00
Michal Čihař
9996628f21 Merge remote-tracking branch 'origin/master' 2012-04-12 11:00:16 +02:00