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

156 Commits

Author SHA1 Message Date
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
Tyron Madlener
5e09426666 Merge 2011-06-06 14:38:56 +02:00
Madhura Jayaratne
17c222f83e Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	themes/original/css/theme_right.css.php
	themes/pmahomme/css/theme_right.css.php
 2011-06-03 15:59:08 +05:30
Piotr Przybylski
08da1557e2 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-02 22:32:22 +02:00
Rouslan Placella
9bf9726bf9 Merge branch 'master' into rte 2011-06-02 20:10:21 +01:00
Marc Delisle
da46a09c24 rfe #3310562 Wording about Column 2011-06-02 11:25:12 -04:00
Michal Čihař
7dccf6d944 Revert "Remove div which seems to be leftover from slider removal" 
This reverts commit 095e0818b8.

It seems to be useful after recent fix for the broken CSS.
 2011-06-02 17:03:14 +02:00
Piotr Przybylski
121cd6263b Merge remote-tracking branch 'origin/master' into drizzle 2011-06-02 15:43:28 +02:00
Michal Čihař
095e0818b8 Remove div which seems to be leftover from slider removal 2011-06-02 15:17:27 +02:00
Piotr Przybylski
1220eafa89 Merge remote-tracking branch 'origin/master' into drizzle 2011-05-25 23:31:17 +02:00
Madhura Jayaratne
71ac83fa28 New spatial icons. 2011-05-25 23:52:56 +05:30
Madhura Jayaratne
f2569ac991 Spatial indexes added. 2011-05-25 23:51:58 +05:30
Rouslan Placella
0659c39435 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into rte 2011-05-24 22:33:51 +01:00
Marc Delisle
84006bfeb2 Put back the div that was generated by previous slider 2011-05-24 10:52:21 -04:00
Marc Delisle
29940ea6b0 Put back the div that was generated by previous slider 2011-05-24 10:51:26 -04:00
Marc Delisle
468238bd08 bug #3306958 [interface] Unnecessary Details slider 2011-05-24 10:36:14 -04:00
Marc Delisle
24a7764533 bug #3306958 [interface] Unnecessary Details slider 2011-05-24 10:35:04 -04:00
Rouslan
6547444673 Removed references to Routines, Triggers and Events from *_structute.php files 2011-05-21 17:39:09 +01:00