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
48,816 Commits 12 Branches 481 Tags
66fbb2da266c19cd6631eef9f80dc38fef4b84dd
Commit Graph

137 Commits

Author SHA1 Message Date
Thilanka Kaushalya
67ad16516b Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-22 23:32:28 +05:30
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
Tyron Madlener
3b3a9fc762 pma spritify part 2 2011-07-15 09:42:16 +03: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
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
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
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
7db86a94bb Rename file for consistency with routines and events 2011-06-08 00:45:09 +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
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
Michal Čihař
095e0818b8 Remove div which seems to be leftover from slider removal 2011-06-02 15:17:27 +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
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Marc Delisle
73c57b099e Continue to replace warning level with error level 2011-05-03 19:05:24 -04:00
Piotr Przybylski
2c3fa8aa7c Don't display More for views and information_schema tables 2011-05-03 14:14:57 +02:00
Azhari Harahap
5afcef00e6 (Drizzle) Listing/change table structure small fix 2011-04-14 10:25:47 +02:00
Michal Čihař
0e63bd0487 Fix multi submits for MSIE with <input type="image".. 2011-03-18 14:55:27 +01:00
Michal Čihař
cb377c360c Use non translated string for identification of submited value in table properties 2011-03-18 14:38:19 +01:00
Michal Čihař
bc0a0bc2d9 Mark texts translatable 2011-02-01 18:23:51 +01:00
Marc Delisle
5b900ead54 Conditional Ajax on table Structure 2011-01-27 13:08:33 -05:00
Marc Delisle
17b7ac6ac6 Add action verbs to More choices in Structure page 2010-12-22 12:58:59 -05:00
Marc Delisle
7cbdcd6be1 fix merge conflicts 2010-10-09 06:37:30 -04:00
Marc Delisle
2d4b9e2aea support ARIA storage engine as well as its previous name MARIA 2010-10-09 06:35:06 -04:00
Michal Čihař
8417db5866 rfe #2956556 [interface] Allow to wrap enum values. 2010-09-16 16:02:49 +02:00
Marc Delisle
98a5ba7317 misleading variable name 2010-09-04 07:01:30 -04:00
Marc Delisle
49ae8993fe forgot to rename these in a previous commit 2010-09-04 06:46:12 -04:00
Michal Čihař
d17fba309c Fix permissions. 
Most files were made executable somewhere in ninadsp tree, reverting
this.
 2010-08-30 09:53:37 +02:00