webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity
87,045 Commits 12 Branches 481 Tags
511a005281fd7acfaccef41d0045ff685aecfcda
Commit Graph

10334 Commits

Author SHA1 Message Date
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
Marc Delisle
5b214d07e7 Fix coding style 2013-09-24 06:25:54 -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
Madhura Jayaratne
a9ef19bf2a Use grouping for views as well 2013-09-23 07:05:38 +05:30
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
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
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
Madhura Jayaratne
199a9e60bc Merge branch 'QA_4_0' 
Conflicts:
	libraries/db_info.inc.php
 2013-09-19 23:19:27 +05:30
Madhura Jayaratne
e8f734e31a bug #3975 Table grouping isn't implemented properly 2013-09-19 23:13:47 +05:30
Marc Delisle
7e3d92f346 Merge pull request #704 from xmujay/0919_refactor_display_table 
refactor display_create_table.lib.php
 2013-09-19 09:32:19 -07:00
Marc Delisle
abdfff3f80 Merge pull request #702 from kasunchathuranga/newDatabase 
Add 'new database' entry to navigation tree
 2013-09-19 03:34:21 -07:00
Marc Delisle
a17c161e6b Fix codestyle 2013-09-19 06:26:20 -04:00
xmujay
2b1acfaf84 refactor display_create_table 2013-09-19 17:56:14 +08:00
adamgsoc2013
e170375d7f Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UnitTestCases 2013-09-18 21:30:27 +08:00
Marc Delisle
5b023232db 4.0.8-dev 2013-09-18 07:57:12 -04:00
Kasun Chathuranga
601104d910 Add 'new database' entry to navigation tree 2013-09-18 09:43:11 +05:30
Dieter Adriaenssens
ccd9835347 offset is a global var 2013-09-17 15:40:51 +02:00
Dieter Adriaenssens
d0d419fe8d display esri-type in message 2013-09-17 13:52:07 +02:00
Madhura Jayaratne
5638d6b956 Merge branch 'QA_4_0' 2013-09-17 16:51:07 +05:30
Madhura Jayaratne
f9300c7b07 bug #4001 Import error: Class 'ImportOds' not found 2013-09-17 16:49:06 +05:30
Marc Delisle
3f385970f4 Fix coding style 2013-09-17 06:06:07 -04:00
Michal Čihař
100416c25a Fix variable name 2013-09-17 11:25:15 +02:00
Madhura Jayaratne
510c2db1de Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-09-17 07:30:16 +05:30
Madhura Jayaratne
cdd9312e65 bug #4000 "Table does not contain unique column" message appears after adding a unique column 2013-09-17 07:27:06 +05:30
Dieter Adriaenssens
6420189a16 fix coding style 2013-09-16 22:03:38 +02:00
adamgsoc2013
5826915e98 add Unit test case for PMA_tbl_indexes and PMA_tbl_printview 2013-09-16 21:04:44 +08:00
Michal Čihař
3fef046acf Do not set memory limit in SHP import as well 
- First of all current detection is wrong and it will fail on values as
  65536K.
- Also I see no reason why single import should override global settings
  we have.
 2013-09-16 09:19:42 +02:00
Michal Čihař
db178d62c2 Avoid hardcoded time limit in SHP import 2013-09-16 09:17:05 +02:00
Dieter Adriaenssens
70d9f27213 remove trailing space 2013-09-15 12:37:39 +02:00
Dieter Adriaenssens
377c682304 wrap long lines 2013-09-15 12:35:44 +02:00
Marc Delisle
df21b2cebe Fix codestyle 2013-09-15 06:09:25 -04:00
Madhura Jayaratne
b162238695 bug #4087 Undefined index query 2013-09-15 13:57:57 +05:30
Madhura Jayaratne
988b1142ac Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0 
Conflicts:
	ChangeLog
 2013-09-15 13:18:05 +05:30
Madhura Jayaratne
5111eb7eb5 bug #4088 MySQL server version at index.php incorrect w/ controlhost 2013-09-15 13:16:00 +05:30
Madhura Jayaratne
80afe42f19 Remove trailing white spaces 2013-09-15 13:15:28 +05:30
Marc Delisle
90accaef3b Fix failing test 2013-09-14 12:26:14 -04:00
Marc Delisle
3535dc9d62 Merge pull request #696 from scnakandala/refac_tbl_add_field 
Refactoring tbl_addfield.php
 2013-09-14 08:23:38 -07:00
Marc Delisle
2dbc95d110 Fix typos 2013-09-14 11:00:38 -04:00
Marc Delisle
d4a480328b Use proper term (SQL column) 2013-09-14 10:59:38 -04:00
Marc Delisle
84dbb40e88 Merge pull request #693 from scnakandala/refac_tbl_change 
Refac tbl change
 2013-09-14 07:56:04 -07:00