Commit Graph

77815 Commits

Author SHA1 Message Date
Stian Berg
01341ea7bb Translated using Weblate. 2012-07-28 15:47:39 +02:00
Michal Čihař
749af3df8c Merge remote-tracking branch 'origin/master' 2012-07-28 14:07:36 +02:00
Madhura Jayaratne
9282f48caf Merge branch 'QA_3_5'
Conflicts:
	tbl_select.php
2012-07-28 17:32:12 +05:30
Madhura Jayaratne
ad1bc257e4 bug #3548491 [interface] Inline query editor doesn't work from search results 2012-07-28 17:29:52 +05:30
Michal Čihař
adcb3ffdca Merge remote-tracking branch 'origin/master' 2012-07-28 13:45:43 +02:00
Madhura Jayaratne
17ad243469 Merge branch 'QA_3_5' 2012-07-28 17:14:08 +05:30
Madhura Jayaratne
a143b74067 bug #3549084 [edit] Can't enter date directly when editing inline 2012-07-28 17:10:44 +05:30
Madhura Jayaratne
d8c334ee29 Grid editing of binary columns should adhere to cfg['ProtectBinary'] directive 2012-07-28 15:29:22 +05:30
Madhura Jayaratne
b92d7151a1 White space cleanup 2012-07-28 15:23:28 +05:30
Michal Čihař
5318d8abff Merge remote-tracking branch 'origin/master' 2012-07-28 08:37:25 +02:00
Xavier Navarro
42f011fc84 Translated using Weblate. 2012-07-28 08:37:23 +02:00
Madhura Jayaratne
18da661f60 Reverting 4465c287c. $analyzed_sql is not defined at this point 2012-07-28 12:05:58 +05:30
Madhura Jayaratne
aaf9f775c4 White space cleanup 2012-07-28 12:04:37 +05:30
Matías Bellone
f3e959c523 Translated using Weblate. 2012-07-27 18:07:27 +02:00
Burak Yavuz
2f9d7db9fc Translated using Weblate. 2012-07-27 17:50:58 +02:00
Victor Volkov
f8626b59e1 Translated using Weblate. 2012-07-27 17:27:17 +02:00
Domen
3a7e553988 Translated using Weblate. 2012-07-27 12:49:24 +02:00
Michal Čihař
1807e52ac4 Merge remote-tracking branch 'origin/QA_3_5' 2012-07-27 11:53:24 +02:00
Burak Yavuz
33d0d85aa1 Translated using Weblate. 2012-07-27 11:52:25 +02:00
Martin Lacina
300d4d239a Translated using Weblate. 2012-07-27 11:52:25 +02:00
Hyun-Sung Yun
dc1eb2c1e8 Translated using Weblate. 2012-07-27 11:52:24 +02:00
shanyan baishui
74b72b21fb Translated using Weblate. 2012-07-27 11:52:23 +02:00
Xavier Navarro
8c3f56180a Translated using Weblate. 2012-07-27 11:52:22 +02:00
Michal Čihař
973b2ec2a1 Translated using Weblate. 2012-07-27 11:52:04 +02:00
Michal Čihař
5e7868e6a2 Update po files 2012-07-27 10:41:43 +02:00
Michal Čihař
6c2fc80ee3 Adjust syntax, some PHP versions seem to dislike [ after method call 2012-07-27 10:39:50 +02:00
Michal Čihař
c93326473e Merge remote-tracking branch 'origin/master' 2012-07-27 07:59:47 +02:00
Michal Čihař
3a1e5d20d5 Merge remote-tracking branch 'chanaka/master' 2012-07-27 07:59:20 +02:00
Michal Čihař
983c39c3af Merge remote-tracking branch 'origin/master' 2012-07-26 22:18:29 +02:00
Xavier Navarro
e2c6672f46 Translated using Weblate. 2012-07-26 22:18:24 +02:00
Marc Delisle
d07e580dd7 Merge branch 'atul' 2012-07-26 16:16:49 -04:00
Chanaka Indrajith
85d91e453a Improve success message displaying in routines 2012-07-26 23:50:33 +05:30
Chanaka Indrajith
b458ba2b18 Merge remote branch 'upstream/master' 2012-07-26 23:14:40 +05:30
Chanaka Indrajith
4465c287c1 Fixed an issue related to multiquery statements and routines modifications 2012-07-26 23:06:29 +05:30
Michal Čihař
a990dd4bea Merge remote-tracking branch 'origin/master' 2012-07-26 09:36:54 +02:00
Michal Čihař
b9caf58127 Merge remote-tracking branch 'weblate/master' 2012-07-26 09:36:18 +02:00
Michal Čihař
ab01c55a3b Merge remote-tracking branch 'origin/master' 2012-07-26 09:36:00 +02:00
Burak Yavuz
2abb9cfef4 Translated using Weblate. 2012-07-26 09:36:00 +02:00
Hyun-Sung Yun
dfe09a1673 Translated using Weblate. 2012-07-26 09:35:59 +02:00
Michal Čihař
3864f8d927 Merge remote-tracking branch 'alex/plugins-and-OOP' 2012-07-26 09:35:31 +02:00
Marc Delisle
3dd52636eb Bypass InnoDB and views row counting by default, for performance
reasons.
See https://github.com/phpmyadmin/phpmyadmin/pull/83 for the discussion,
but my commit changes the default values, not the sample values.
2012-07-25 08:19:41 -04:00
Alex Marin
503e1a8b1a oop: add properties subgroups for ExportSql 2012-07-25 14:09:55 +03:00
Alex Marin
2082fe2471 oop: fix properties subgroup for ExportMediawiki 2012-07-25 14:07:19 +03:00
Alex Marin
e304e79032 oop: fix display for subgroups of properties 2012-07-25 14:05:36 +03:00
Alex Marin
54213e16a8 oop: use properties without subgroups for ExportSql 2012-07-25 11:55:44 +03:00
Alex Marin
aef3d70ac8 oop: fix properties for ExportMediawiki 2012-07-25 11:04:55 +03:00
Alex Marin
6b7331e9ef oop: use properties for ExportMediawiki 2012-07-25 11:04:55 +03:00
Alex Marin
854d198191 remove unused variable 2012-07-25 11:04:35 +03:00
Atul Pratap Singh
c59aeba53d Fix typo 2012-07-24 23:32:48 +05:30
Atul Pratap Singh
81456ec05d Merge remote-tracking branch 'upstream/master' 2012-07-24 21:36:12 +05:30