Commit Graph

42971 Commits

Author SHA1 Message Date
Aris Feryanto
6665c1a889 Merge branch 'hidecol' into aris 2011-06-28 17:52:31 +08:00
Aris Feryanto
5184256f10 Merge remote-tracking branch 'origin/master' into aris 2011-06-28 17:52:27 +08:00
Aris Feryanto
5304f19396 Fix bug when hovering 'More' under 'Structure' tab 2011-06-28 17:51:59 +08:00
Michal Čihař
500daacd24 Merge remote-tracking branch 'pootle/master' 2011-06-28 09:52:31 +02:00
Michal Čihař
267d6b2772 Merge remote-tracking branch 'origin/QA_3_4' 2011-06-28 09:52:28 +02:00
Michal Čihař
614639a5c5 Merge remote-tracking branch 'origin/MAINT_3_4_3' into QA_3_4 2011-06-28 09:51:02 +02:00
Aris Feryanto
b97aeef6b6 Fix bug in shift+click 2011-06-28 10:25:11 +08:00
Aris Feryanto
14ffb9ae84 Merge branch 'hidecol' into aris 2011-06-28 09:57:25 +08:00
Aris Feryanto
60a0334661 Fix merge conflict with origin/master 2011-06-28 09:50:54 +08:00
Aris Feryanto
c7892cf5bb Change to and some code fix 2011-06-28 09:42:26 +08:00
Aris Feryanto
216b4e80b2 Better shift+click handling 2011-06-28 09:33:09 +08:00
Pootle server
3a27183455 Merge remote-tracking branch 'origin/master' 2011-06-27 16:40:14 +02:00
Michal Čihař
9fc6e35cfd Avoid double escaping 2011-06-27 10:20:29 -04:00
Michal Čihař
49a39787c3 Merge remote-tracking branch 'origin/QA_3_4' 2011-06-27 16:10:48 +02:00
Michal Čihař
9129444381 Avoid double escaping 2011-06-27 16:09:22 +02:00
Michal Čihař
0c4148a68e Merge remote-tracking branch 'origin/QA_3_4' 2011-06-27 16:08:55 +02:00
Michal Čihař
31df8ebb5d Merge branch 'MAINT_3_4_3' into QA_3_4 2011-06-27 16:08:11 +02:00
Marc Delisle
e9c3e1dc33 Translation update done using Pootle. 2011-06-27 15:26:01 +02:00
Marc Delisle
b62b781df2 Translation update done using Pootle. 2011-06-27 15:25:31 +02:00
Marc Delisle
682533fca4 Translation update done using Pootle. 2011-06-27 15:25:20 +02:00
Marc Delisle
eb308e6a13 Translation update done using Pootle. 2011-06-27 15:25:10 +02:00
Michal Čihař
12348ee826 Fix escaping on LIKE queries
All these need special variant of PMA_sqlAddSlashes.
2011-06-27 14:50:16 +02:00
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Michal Čihař
6a422caf52 Proper escaping while checking for table (bug#3323066) 2011-06-27 14:46:04 +02:00
Michal Čihař
44fd261fa6 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-27 14:36:09 +02:00
Michal Čihař
78ee628312 Use cache to skip blobstreaming check if server does not support it 2011-06-27 14:35:34 +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
5e05e80086 3.4.3 release 2011-06-27 08:21:46 -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ř
29e778d8e2 Merge remote-tracking branch 'origin/QA_3_4' 2011-06-27 13:56:29 +02: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
Tyron Madlener
7f9797bc6a Hides the bookmarkoptions checkboxes when the bookmark label is empty 2011-06-27 13:53:55 +02:00
Marc Delisle
93db9fdc12 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-27 07:44:20 -04:00
Marc Delisle
7ecd11483e ChangeLog entry 2011-06-27 07:43:15 -04:00
Michal Čihař
6b06041f34 Merge remote-tracking branch 'origin/QA_3_4' 2011-06-27 13:41:38 +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
Marc Delisle
1970c357a3 These are jQuery objects 2011-06-27 07:39:47 -04:00
Michal Čihař
2c6666bf03 Update translations from master 2011-06-27 13:39:17 +02:00
Marc Delisle
f7157a5fc6 Typos 2011-06-27 07:32:14 -04:00
Thilanka Kaushalya
1d9f5cdf73 Fixed bugs in show error message ine multi row change in table structure 2011-06-27 07:24:08 -04:00
Thilanka Kaushalya
610509e384 Fixed bugs in multi column change in table structure 2011-06-27 07:23:52 -04:00
Thilanka Kaushalya
146a8da5e9 Ajaxified the multi column change in table structure 2011-06-27 07:23:25 -04:00
Pootle server
64c50006c3 Merge remote-tracking branch 'origin/master' 2011-06-27 12:40:04 +02:00
Yuichiro
2191ca891e Translation update done using Pootle. 2011-06-27 12:34:39 +02:00
Yuichiro
7932b5daa7 Translation update done using Pootle. 2011-06-27 12:32:36 +02:00
Yuichiro
07e1d3b2e1 Translation update done using Pootle. 2011-06-27 12:32:08 +02:00
Yuichiro
a982873fc0 Translation update done using Pootle. 2011-06-27 12:28:40 +02:00