Commit Graph

87045 Commits

Author SHA1 Message Date
Madhura Jayaratne
511a005281 Merge branch 'QA_4_0' 2013-09-25 06:46:04 +05:30
Madhura Jayaratne
352c60d4ca bug #4102 ALTER TABLE ORDER BY and InnoDB 2013-09-25 06:43:15 +05:30
Madhura Jayaratne
381b4b58aa Merge branch 'QA_4_0' 2013-09-24 22:34:16 +05:30
Madhura Jayaratne
1d6bb8ed6b bug #4100 table tree group strategy 2013-09-24 22:27:47 +05:30
Dieter Adriaenssens
0b86704892 fix coding style : wrap long lines 2013-09-24 15:33:21 +02:00
Madhura Jayaratne
3b17233f25 Remove HTML, PHP mix 2013-09-24 16:58:51 +05:30
Marc Delisle
668c55a437 Fix merge conflicts 2013-09-24 06:55:16 -04:00
Weblate
d8b4658981 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-09-24 12:50:26 +02:00
Robert Readman
2639a5b491 Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (2611 of 2611)
2013-09-24 12:50:20 +02:00
Marc Delisle
256fcb61fe bug #4099 Server/library difference warning: setting is ignored 2013-09-24 06:49:39 -04:00
Marc Delisle
5b214d07e7 Fix coding style 2013-09-24 06:25:54 -04:00
Robert Readman
5c2c128712 Translated using Weblate (English (United Kingdom))
Currently translated at 100.0% (2722 of 2722)
2013-09-24 03:42:49 +02:00
Marc Delisle
c38b002226 Merge branch 'QA_4_0' 2013-09-23 12:33:08 -04:00
Marc Delisle
5ffeac5b57 4.0.7 release 2013-09-23 12:32:48 -04:00
Madhura Jayaratne
80b7056a65 Merge branch 'QA_4_0' 2013-09-23 19:24:44 +05:30
Madhura Jayaratne
35de20e86b bug #4098 Default table tab is ignored 2013-09-23 19:16:54 +05:30
Marc Delisle
42248d4090 Fix coding style 2013-09-23 08:13:56 -04:00
Michal Čihař
520e718756 Merge pull request #708 from adamgsoc2013/UT_display_change_password
UT for PMA_display_change_password
2013-09-23 00:16:41 -07:00
adamgsoc2013
d7ef4af12c add initial value for global relation 2013-09-23 09:49:01 +08:00
Madhura Jayaratne
a9ef19bf2a Use grouping for views as well 2013-09-23 07:05:38 +05:30
Madhura Jayaratne
dd576c21d0 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-09-23 06:08:05 +05:30
Marc Delisle
f476b90323 Merge pull request #707 from madhuracj/master
Clicking on 'Tables' links in navigation tree should show only tables
2013-09-22 12:21:42 -07:00
Madhura Jayaratne
b67aee6cb0 Double quotes are better for SQLs since single quotes inside the SQL need not be escaped. 2013-09-22 22:23:54 +05:30
Madhura Jayaratne
ea8324f67f Handle 'in_use' tables properly 2013-09-22 22:21:22 +05:30
Madhura Jayaratne
b134d79413 tbl_group is not for comments 2013-09-22 22:11:46 +05:30
Madhura Jayaratne
e848b29a88 selecting tables by comment does not seem to be used anywhere. If you need to get the list of views, use new $tble_type parameter. 2013-09-22 22:09:38 +05:30
Madhura Jayaratne
190725ce27 Clicking on 'Tables' links in navigation tree should show only tables 2013-09-22 21:29:52 +05:30
Weblate
edb1411b8e Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-09-22 15:56:05 +02:00
yad taha
fc557fc3a6 Translated using Weblate (Kurdish Sorani)
Currently translated at 21.1% (550 of 2611)
2013-09-22 15:56:02 +02:00
Aputsiaq Niels Janussen
c584e9f675 Translated using Weblate (Danish)
Currently translated at 100.0% (2611 of 2611)
2013-09-22 15:56:00 +02:00
Marc Delisle
00b20b70e8 Merge branch 'QA_4_0' 2013-09-22 09:55:59 -04:00
Marc Delisle
509970d9e8 bug #4002 Edit Index on big table does not show "Loading" or any message 2013-09-22 09:55:12 -04:00
Marc Delisle
c6e692c1dd Fix coding style 2013-09-22 07:36:38 -04:00
Marc Delisle
a5d9a28209 Merge pull request #706 from xmujay/0919_server_privileges
UTs for PMA_server_privileges
2013-09-22 04:23:25 -07:00
xmujay
b11ec4c635 fix UT failure 2013-09-22 18:18:48 +08:00
xmujay
c46aca1580 remove unneeded included files 2013-09-22 18:14:54 +08:00
Marc Delisle
5f5d6be015 Fix typo 2013-09-21 11:44:30 -04:00
Aputsiaq Niels Janussen
c9f168812f Translated using Weblate (Danish)
Currently translated at 100.0% (2722 of 2722)
2013-09-21 16:05:24 +02:00
Weblate
3b44065ac7 Merge remote-tracking branch 'origin/master' 2013-09-21 13:25:13 +02:00
yad taha
866081c334 Translated using Weblate (Kurdish Sorani)
Currently translated at 19.4% (529 of 2722)
2013-09-21 13:25:08 +02:00
Marc Delisle
0f520af1f0 Fix codestyle 2013-09-21 07:24:32 -04:00
Marc Delisle
81bd6d4a02 Fix merge conflict 2013-09-20 06:09:36 -04:00
Marc Delisle
0134d5154f bug #4060 Browser tries to remember wrong password when creating new user 2013-09-20 06:03:44 -04:00
Marc Delisle
a77abb3cdd Fix codestyle 2013-09-20 05:45:57 -04:00
Domen
22e112ea6b Translated using Weblate (Slovenian)
Currently translated at 100.0% (2722 of 2722)
2013-09-20 10:59:50 +02:00
Michal Čihař
10c69d2155 Merge pull request #705 from adamgsoc2013/UT_tbl_chart
add Unit test case for PMA_tbl_chart
2013-09-19 23:18:03 -07:00
Weblate
28670443ca Merge remote-tracking branch 'origin/master' 2013-09-20 03:51:12 +02:00
Michal Čihař
4532db34ef Translated using Weblate (Hindi)
Currently translated at 53.5% (1455 of 2722)
2013-09-20 03:51:08 +02:00
Madhura Jayaratne
2b736c1b1a Merge branch 'QA_4_0' 2013-09-20 07:20:09 +05:30
Madhura Jayaratne
a86dc47741 Include separator in the table group 2013-09-20 07:16:13 +05:30