gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,609 Commits 12 Branches 481 Tags 2.4 GiB
c8ffa90ac8
Commit Graph

173 Commits

Author SHA1 Message Date
Piotr Przybylski
bd3b7d28d4 Whitespace cleanup 2011-08-25 13:16:06 +02:00
Piotr Przybylski
3e0af18434 Fix indentation broken by past merges 2011-08-24 13:24:21 +02:00
Piotr Przybylski
a7c0c55c7f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	libraries/common.lib.php
	tbl_printview.php
	tbl_select.php
	tbl_structure.php
 2011-08-12 22:02:40 +02:00
Michal Čihař
3f81e8790d Remove useless space from messages 2011-08-10 13:44:39 +02:00
Michal Čihař
86eaf538be Internationalize whole string 2011-08-10 13:10:19 +02:00
Michal Čihař
38d99b4e17 Use PMA_getIcon instead of duplicating logic 2011-08-08 10:05:22 +02:00
Michal Čihař
51dc70d35a Wrap long line 2011-08-08 09:57:47 +02:00
Michal Čihař
f9a713dea1 Use PMA_linkOrButton here as the query can be quite long 2011-08-08 09:56:43 +02:00
Michal Čihař
2f9ca4de99 Merge branch 'edit-view' of git://github.com/csware/phpmyadmin into int 2011-08-08 09:44:19 +02:00
Piotr Przybylski
4965898803 Always get full information here 2011-08-05 01:16:02 +02:00
Piotr Przybylski
66665f326a Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_qbe.php
	js/server_status.js
	libraries/export/xml.php
	libraries/schema/Pdf_Relation_Schema.class.php
	tbl_printview.php
	tbl_structure.php
 2011-08-04 20:19:43 +02:00
Michal Čihař
83d3c0d2fd Move attribute processing to PMA_extractFieldSpec 2011-08-04 17:08:49 +02:00
Michal Čihař
542738dd88 Export print_type and make it usable for set/enum as well 2011-08-04 16:33:34 +02:00
Michal Čihař
b231ab4072 Factor out some type matching 2011-08-04 15:56:56 +02:00
Michal Čihař
c63474bde1 Use PMA_DBI_get_columns 2011-08-04 15:47:56 +02:00
Michal Čihař
4fb5b65fd2 Remove unused parameter $container from PMA_getIcon 2011-08-04 13:47:44 +02:00
Sven Strickroth
c9434d11c7 add "edit view" link to table structure view 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2011-08-01 15:38:41 +02:00
Piotr Przybylski
e94e42fb73 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-23 23:33:19 +02:00
Thilanka Kaushalya
67ad16516b Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-22 23:32:28 +05:30
Piotr Przybylski
3586bb992f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/database_interface.lib.php
	libraries/server_synchronize.lib.php
	server_status.php
	sql.php
 2011-07-22 11:07:04 +02:00
Michal Čihař
219ec73d69 Spacing around if 2011-07-22 09:10:37 +02:00
Thilanka Kaushalya
063b6bd544 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-21 23:55:31 +05:30
Thilanka Kaushalya
3a2d3e3c4e Ajaxified add columns option in table structure 2011-07-21 23:53:37 +05:30
Piotr Przybylski
f36b2e5441 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/db_links.inc.php
	libraries/server_links.inc.php
	tbl_structure.php
	themes/pmahomme/css/theme_right.css.php
 2011-07-21 16:21:16 +02:00
Tyron Madlener
3b3a9fc762 pma spritify part 2 2011-07-15 09:42:16 +03:00
Piotr Przybylski
b1b4e6389d Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/server_synchronize.lib.php
 2011-07-06 18:31:38 +02:00
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02:00
Rouslan Placella
9e8e70f0a1 Merge branch 'QA_3_4' 2011-07-04 12:32:23 +01:00
Rouslan Placella
c4ecddb5a2 Fix for bug #3353649 - "Create an index on X columns" form not validated 2011-07-04 12:31:14 +01:00
Thilanka Kaushalya
71bb5415d8 Added show hide option for index table in table structure 2011-07-02 15:16:00 +05:30
Thilanka Kaushalya
d33590a544 Resolved conflicts 2011-07-01 23:50:58 +05:30
Thilanka Kaushalya
0cb77d14ba Ajaxify Index edit in table structure 2011-07-01 23:39:23 +05:30
Piotr Przybylski
7b1976d14d Don't show "Propose table structure" link (Drizzle) 2011-06-28 23:33:09 +02:00
Piotr Przybylski
96c5c6dbc6 Add $column parameter to PMA_DBI_get_columns 2011-06-28 23:11:58 +02:00
Piotr Przybylski
3bde595666 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-27 23:55:32 +02: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ř
29e778d8e2 Merge remote-tracking branch 'origin/QA_3_4' 2011-06-27 13:56:29 +02:00
Michal Čihař
79d924add8 Really show full field definition, not just "full text" text 2011-06-27 13:55:54 +02:00
Thilanka Kaushalya
146a8da5e9 Ajaxified the multi column change in table structure 2011-06-27 07:23:25 -04:00
Thilanka Kaushalya
bc049c6311 Ajaxified the multi column change in table structure 2011-06-25 16:57:54 +05:30
Piotr Przybylski
e38b5cd4ff Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/common.lib.php
	libraries/database_interface.lib.php
	tbl_structure.php
 2011-06-23 14:02:58 +02:00
Madhura Jayaratne
b261436a03 Merge remote branch 'remotes/madhura/master' 
Conflicts:
	themes/original/css/theme_right.css.php
	themes/pmahomme/css/theme_right.css.php
 2011-06-21 07:33:40 +05:30
Piotr Przybylski
c2b06f0a11 Don't use OPTIMIZE TABLE and REPAIR TABLE with Drizzle 2011-06-19 21:10:42 +02:00
Piotr Przybylski
12f70e8938 Replace all SHOW FIELDS calls with PMA_DBI_get_columns() or PMA_DBI_get_columns_sql() 
Fix PMA_DBI_get_columns() in Drizzle when $full == false
 2011-06-17 00:22:25 +02:00
Tyron Madlener
2816b427ab Merge remote-tracking branch 'origin/master' 2011-06-13 15:00:11 +02:00
Madhura Jayaratne
28a9b971bf Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-06-12 20:14:31 +05:30
Piotr Przybylski
b35cd1b40f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	tbl_structure.php
 2011-06-08 00:47:17 +02:00
Piotr Przybylski
7db86a94bb Rename file for consistency with routines and events 2011-06-08 00:45:09 +02:00
Piotr Przybylski
6cca81e04d Don't load tbl_triggers.lib.php for Drizzle 2011-06-08 00:39:53 +02:00