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
c9253c0a0e
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
Michal Čihař
124ba18d03
Better to use format strings.
2010-08-19 11:26:34 +02:00
ninadsp
a2f78a6d38
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
lorilee
428053bef5
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
2010-07-26 13:44:30 -07:00
lorilee
2a59451ac5
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
...
Conflicts:
server_export.php
2010-07-26 13:42:42 -07: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
lorilee
2ebf96d242
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
...
Conflicts:
libraries/display_export.lib.php
libraries/display_import.lib.php
2010-07-20 13:04:03 -07:00
lorilee
b8022422f7
Updated enum/set editor (submit button has only one function, escapes special characters, has more instructions for formatting
2010-07-20 12:22:39 -07:00
Michal Čihař
318dc4b650
Drop @version tag from docblocks.
2010-07-20 13:59:17 +02:00
lorilee
0e0ce976ee
ENUM/SET editor support for no javascript; Added feature that allows users to add more than one new field at a time
2010-07-05 16:28:40 -07:00
lorilee
9bd658ae03
Removed inline Javascript, ENUM/SET editor message remains visible when Javascript is disabled
2010-06-28 22:28:25 -04:00
lorilee
cd7b5448f9
ENUM/SET editor
2010-06-28 20:48:41 -04:00
ninadsp
ac7cab7160
Revert "Revert "Merge remote branch 'origin/master'""
...
This reverts commit 4214d83e12
.
2010-06-26 15:45:27 +05:30
ninadsp
4214d83e12
Revert "Merge remote branch 'origin/master'"
...
This reverts commit c850b8be8b
, reversing
changes made to dcdde2f99f
.
2010-06-26 15:43:52 +05:30
ninadsp
c850b8be8b
Merge remote branch 'origin/master'
...
Conflicts:
po/tr.po
2010-06-26 15:38:12 +05:30
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
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
2586524b03
gettext conversion; clarify code
2010-05-06 07:48:38 -04:00
Marc Delisle
2182098af6
strings to gettext, second batch
2010-05-04 20:07:19 -04:00
Michal Čihař
e5350145ff
Fix syntax.
2010-05-04 17:08:01 +02:00
Marc Delisle
f55823f47f
strings to gettext, first batch
2010-05-03 12:57:46 -04:00
Marc Delisle
9785bbc561
remove author names
2010-03-26 17:44:10 -04: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
Michal Čihař
0051be2540
Do not fail on editing existing table.
2010-01-22 16:44:32 +00:00
Michal Čihař
2fc3f1beba
Allow to edit table name when creating new one.
2010-01-22 15:40:45 +00:00
Marc Delisle
ad48d9f31c
bug #2895894 [structure] Empty default value not set properly
2009-11-13 11:14:10 +00:00
Herman van Rink
593c28aabd
[interface] #2879909 Removed double htmlspecialchars when editing enum column
2009-10-15 15:49:09 +00:00
Marc Delisle
15441ded5d
do not try to display a tab that was not built
2009-08-22 11:22:50 +00:00
Michal Čihař
7de18b4e7a
patch #2649087 None default is different than other None in some languages.
2009-03-03 16:41:41 +00:00
Marc Delisle
5501bdce7e
Show AUTO_INCREMENT instead of A_I when in vertical mode
2009-01-24 17:32:16 +00:00
Marc Delisle
3fe2709fd8
bug #2363653 [properties] Various problems with table structure
2008-12-19 21:29:41 +00:00
Marc Delisle
0a36001aba
bug #2417058 [properties] Edit fields: losing auto-increment setting
2008-12-17 18:49:26 +00:00
Michal Čihař
1bf10aa501
Hopefully last missing @package tags.
2008-11-24 11:24:56 +00:00
Marc Delisle
5295bce9e8
rfe #823652 [structure] ENUM values: field size too small
2008-10-04 12:42:22 +00:00
Marc Delisle
e61a8e9c93
XHTML compatibility
2008-08-17 11:25:12 +00:00
Marc Delisle
1ce9daf87c
bug #1982315 [GUI] Comma and quote in ENUM, thanks to Joshua Hogendorn
2008-07-05 22:01:04 +00:00
Marc Delisle
71efad3fe7
message change, thanks to Sebastian Mendel
2008-07-01 18:54:53 +00:00
Marc Delisle
71d4770bd5
None as default choice for default value
2008-06-29 13:08:59 +00:00
Marc Delisle
afbb2a9dc2
protection against XSS when register_globals is on and .htaccess has no effect
2008-06-21 15:01:27 +00:00
Marc Delisle
7b0051ac7a
undefined DefaultType
2008-05-10 13:57:15 +00:00
Marc Delisle
75e0cc9937
new message $strUserDefined
2008-05-10 13:33:12 +00:00
Sebastian Mendel
206f4add2f
refactored complete table/column creation altering;
...
register_globals independent;
fixed bug #1344768 [database] create/alter table new field can not have empty string as default;
tweaked form layout to save space;
2008-05-07 12:35:00 +00:00
Marc Delisle
fc041e4e15
do not remove the BINARY attribute in drop-down
2008-04-30 17:00:54 +00:00
Marc Delisle
166d0e181a
clarifications
2008-04-09 00:22:06 +00:00
Marc Delisle
4e66babab7
undefined variable row on table creation, since the new logic for BIT values
2008-04-07 16:22:07 +00:00
Marc Delisle
42a4a8c24b
bug #1926357 [data] BIT defaults displayed incorrectly
2008-04-02 17:19:59 +00:00