Commit Graph

96 Commits

Author SHA1 Message Date
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
ninadsp
f1e72d7664 Removed the inline call to confirmLink() and instead attached the jQuery call to it. jQuery call attached to the proper class 2010-08-26 20:20:51 +05:30
ninadsp
bbb94f628f Created a new js file for the tbl_structure.php page and moved jQuery scripts for it into that file 2010-08-26 20:03:15 +05:30
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
lorilee
8214c32340 Colspan should change to 3 when actions are hidden 2010-07-30 12:31:15 -07:00
lorilee
9877db1626 Fix for positioning in different browsers plus IE6 bug 2010-07-30 12:30:40 -07:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
lorilee
1faaa80b51 Fixing HTML markup 2010-07-28 15:00:36 -07:00
lorilee
542fe56469 Fixed a typo 2010-07-27 10:27:47 -07:00
lorilee
64b5900d96 Fixing bug for when the table is a view or information_schema 2010-07-27 10:25:12 -07:00
lorilee
428053bef5 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-26 13:44:30 -07:00
Michal Čihař
d291827444 No need to require_once footer
It is the last thing executed anyway (ends with exit).
2010-07-26 16:20:24 +02:00
Michal Čihař
ee767e2d3d No need to explicitely include relation.lib its anyway included in common.inc 2010-07-26 16:17:59 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
lorilee
aa49b85fad Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
Conflicts:
	libraries/display_export.lib.php
2010-07-20 15:23:12 -07:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
lorilee
a37b66bde5 Forgot to add <abbr> tags 2010-07-19 17:00:29 -07:00
lorilee
ddd5860901 Truncates long enum and set values 2010-07-19 16:55:49 -07:00
lorilee
9b2ff195de Fixed bug where table rows don't show up because of conflicting variable names 2010-07-16 00:11:07 -07:00
lorilee
9badb87f1a Reveal-on-hover table structure actions 2010-07-14 11:55:31 -07:00
ninadsp
52774d7616 Removed inline JavaScript calls to confirmLink and added ids to Drop
Column and Add Primary Key actions
2010-06-18 01:42:24 +05:30
ninadsp
42de77813c Merge remote branch 'origin/master' 2010-06-06 20:01:39 +05:30
Marc Delisle
e8ba43e299 this really means a column 2010-06-04 16:06:12 -04:00
ninadsp
160f4314eb Merge remote branch 'origin/master' 2010-06-03 22:34:52 +05:30
Marc Delisle
caa98445d8 conform to relational terminology regarding columns and rows 2010-05-31 14:33:21 -04:00
ninadsp
38ac78e3ba merging changes from origin 2010-05-24 18:32:42 +05:30
Marc Delisle
abc229d0b0 bug #3004216 Field attributes use inline CSS 2010-05-23 08:27:27 -04:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet
only added a few comments
2010-05-23 01:22:01 +05:30
Marc Delisle
17c9fb4d28 gettext conversion 2010-05-05 12:57:30 -04:00
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Marc Delisle
f55823f47f strings to gettext, first batch 2010-05-03 12:57:46 -04:00
Marc Delisle
05a7a9f307 Merge branch 'QA_3_3' 2010-04-29 12:31:10 -04:00
Marc Delisle
ef2a411db9 bug #2994168 Show auto_increment in uppercase 2010-04-29 12:30:59 -04:00
Michal Čihař
c2de4dd8d9 Add full uncompressed version of jquery ui. 2010-04-15 09:34:52 +02:00
s.troxler
2d8b20a28c Fix slider on table properties page.
patch #2983090, bug #2983050
2010-04-07 13:03:48 +02:00
Michal Čihař
a2a0d9bb38 Avoid multiple loading of jQuery. 2010-04-01 17:19:37 +02:00
Marc Delisle
9785bbc561 remove author names 2010-03-26 17:44:10 -04:00
Marc Delisle
58ebfd4591 jquery in subdirectory of js; trying jquery-ui toggle effect 2010-03-23 17:08:47 -04:00
Marc Delisle
f8fa3b4ede jQuery and slider effect 2010-03-21 07:36:39 -04:00
Marc Delisle
87dd6b3cee Merge branch 'QA_3_3' 2010-03-12 17:16:58 -05:00
Dieter Adriaenssens
7c818d046a patch #2969449 Name for MERGE engine varies depending on the MySQL version 2010-03-12 17:16:05 -05:00
Marc Delisle
819324ede6 remove author names, as discussed at the 2010 developer meeting and according to the book Producing Open Source Software 2010-03-06 18:04:17 +00:00