ninadsp
c9253c0a0e
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
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
Michal Čihař
cfc7fd7a2d
The linked-tables infrastructure is now called phpMyAdmin configuration storage.
2010-07-26 17:16:55 +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ř
11e53fb141
[core] Dropped AllowAnywhereRecoding configuration variable.
...
It really does not make sense these days, now the recoding of
export/import is available when the necessary extensions are loaded and
it is possible to disable it using RecodingEngine directive.
2010-07-20 12:05:07 +02:00
Michal Čihař
d7192b3a95
DefaultCharset is not used anywhere.
2010-07-20 11:52:33 +02:00
lorilee
4434b2c231
Added option in config.inc.php to set the default export method to quick, custom, or custom-no-form
2010-07-13 18:41:15 -07: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
bed1948d04
testing git setup - no major change made in code yet
...
only added a few comments
2010-05-23 01:22:01 +05:30
Michal Čihař
4086ce69da
Add missing message.
2010-04-02 10:10:22 +02:00
Michal Čihař
a31e60356a
Add configuration of tracking features (bug #2966752 ).
2010-04-02 09:59:37 +02:00
Michal Čihař
d77b51803a
Allow to configure tracking table (bug #2966752 ).
2010-04-02 09:55:33 +02:00
Michal Čihař
2691e959c1
Prevent direct execution of some files.
2010-04-02 09:03:46 +02:00
Michal Čihař
f5359b393b
Yet another subversion notice.
2010-03-30 15:00:00 +02:00
Michal Čihař
15bf3c12db
Move setup script messages away to avoid their loading all the time.
2010-03-30 14:54:24 +02:00
