Commit Graph

36856 Commits

Author SHA1 Message Date
Michal Čihař
31df8ebb5d Merge branch 'MAINT_3_4_3' into QA_3_4 2011-06-27 16:08:11 +02:00
Marc Delisle
d3b67a35a0 Merge branch 'MAINT_3_4_3' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into MAINT_3_4_3 2011-06-27 08:23:05 -04:00
Marc Delisle
edf46c8022 3.4.3 release 2011-06-27 08:21:06 -04:00
Marc Delisle
e21d6073e4 3.4.3 release 2011-06-27 08:20:21 -04:00
Michal Čihař
43c7f939c3 Merge branch 'MAINT_3_4_3' into QA_3_4 2011-06-27 13:56:05 +02:00
Michal Čihař
79d924add8 Really show full field definition, not just "full text" text 2011-06-27 13:55:54 +02:00
Michal Čihař
5e28dbea22 Merge branch 'MAINT_3_4_3' into QA_3_4 2011-06-27 13:40:49 +02:00
Michal Čihař
4bec3b3bee Lower threshold for translations
It looks like incomplete translations do attract new translators, so
let's include few more.
2011-06-27 13:40:15 +02:00
Michal Čihař
2c6666bf03 Update translations from master 2011-06-27 13:39:17 +02:00
Michal Čihař
f09d19cfa3 Merge branch 'MAINT_3_4_3' into QA_3_4 2011-06-24 12:59:38 +02:00
Michal Čihař
52269e0e56 Update translations from master 2011-06-24 12:59:27 +02:00
Rouslan Placella
e8ee4eb11b Fixed changelog (bugfixes for 3.4.4, were filed under 3.4.3) 2011-06-22 13:43:10 +01:00
Rouslan Placella
9e224184d7 Fixed bug #3323101 - Invalid escape sequence in SQL parser 2011-06-21 20:38:42 +01:00
Rouslan Placella
c2dd99965d Fixed bug #3323060 - SQL parser breaks AJAX requests if query has unclosed quotes 2011-06-21 20:33:32 +01:00
Michal Čihař
341dc1296f Merge branch 'MAINT_3_4_3' into QA_3_4 2011-06-21 12:08:54 +02:00
Michal Čihař
dc6c1e8b5c I think htmlspecialchars should be used here 2011-06-21 12:08:48 +02:00
Michal Čihař
3336bf3636 Merge branch 'MAINT_3_4_3' into QA_3_4 2011-06-21 12:05:16 +02:00
Michal Čihař
cb043f4365 Use standard infrastructure for generating links, this also prevents XSS 2011-06-21 12:04:52 +02:00
Marc Delisle
7ecb1abaa4 3.4.4-dev 2011-06-20 12:21:11 -04:00
Marc Delisle
a8caf74fda 3.4.3-rc1 2011-06-20 12:18:57 -04:00
Marc Delisle
6944ee44ce ChangeLog entry for "Minor XSS" 2011-06-20 10:15:08 -04:00
Marc Delisle
3bd3f60b28 Merge commit '7602e1593c1565b4dbd90df13fd162cee6546798' into QA_3_4 2011-06-20 10:12:52 -04:00
Michal Čihař
6616a6b34c Changes from master 2011-06-20 11:28:05 +02:00
Rouslan Placella
ada8916b98 bug #3319466 [edit] Inline query edit does not escape special characters 2011-06-17 21:10:00 +01:00
Michal Čihař
b45de543c0 Fix syntax error 2011-06-17 11:50:28 +02:00
Michal Čihař
bbe388010b Update based on master 2011-06-17 11:04:15 +02:00
Madhura Jayaratne
9d2269d297 bug #3317293 [edit] Inline edit places HTML line breaks in edit area 2011-06-16 21:05:54 +05:30
Jacob Middag
99bae4acb9 patch #3317206 [privileges] Generate password option missing on new accounts 2011-06-16 07:57:09 -04:00
Madhura Jayaratne
396e4e9979 bug #3315741 [display] Inline query edit broken 2011-06-15 20:06:26 +05:30
Michal Čihař
8cebaca19b bug #3315720 [search] Fix search in non unicode tables
We need to convert field to unicode because the connection is in utf-8
and we might give utf-8 input as well.
2011-06-14 09:15:07 +02:00
Michal Čihař
c4c8fcb2b5 Merge changes from master 2011-06-14 08:57:20 +02:00
Michal Čihař
fa6640559b Update from master 2011-06-13 14:25:27 +02:00
Michal Čihař
7ff4cb07cc Update from master 2011-06-13 08:52:17 +02:00
Herman van Rink
7602e1593c Minor xss reported by Aung Khant 2011-06-12 21:41:54 +02:00
Herman van Rink
e49ab1bfe1 Minor xss reported by Aung Khant 2011-06-10 21:43:16 +02:00
Herman van Rink
bbccc36817 Minor xss reported by Aung Khant 2011-06-10 21:38:43 +02:00
Marc Delisle
20118f89cf Changelog entry for patch #3313326 2011-06-10 12:54:34 -04:00
Rouslan Placella
c422694746 Patch #3313326 Some tooltips do not disappear 2011-06-10 12:53:33 -04:00
Marc Delisle
2d56821c0f Improved fix for bug #3313210 2011-06-07 11:43:30 -04:00
Marc Delisle
82ac1e8028 bug #3313210 [interface] Columns class sometimes changed for nothing 2011-06-07 11:06:38 -04:00
Michal Čihař
7afbe60f2b Merge remote-tracking branch 'origin/MAINT_3_4_2' into QA_3_4 2011-06-07 14:35:10 +02:00
Marc Delisle
42fd105f24 3.4.2 release 2011-06-07 08:11:40 -04:00
Marc Delisle
8b48c1998d 3.4.2 release 2011-06-07 08:11:12 -04:00
Michal Čihař
54cf26644a Merge branch 'MAINT_3_4_2' into QA_3_4 2011-06-07 13:25:01 +02:00
Michal Čihař
4f2251417c Update from master 2011-06-07 13:24:52 +02:00
Michal Čihař
2a22d7dae7 Update from master 2011-06-06 11:23:18 +02:00
Jo Michael
7996a36575 patch #3311539 Inline Edit does not escape backslash 2011-06-05 06:29:46 -04:00
Marc Delisle
86d3b7e58c bug #3307616 [edit] Inline edit updates multiple duplicate rows 2011-06-05 06:13:11 -04:00
Marc Delisle
60089624dd bug #3304544 [parser] master is not a reserved word 2011-06-04 06:39:09 -04:00
Yuichiro
2bdfe06982 patch #3304473 [setup] Redefine a lable that was wrong 2011-06-04 05:59:34 -04:00