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
d229f6ca24
ACcidentally deleted these files
2010-07-20 13:10:34 -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
Michal Čihař
318dc4b650
Drop @version tag from docblocks.
2010-07-20 13:59:17 +02: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
lorilee
cb25753966
Sets the default export method if it is not set in config.inc.php
2010-07-19 17:17:04 -07:00
lorilee
ecb4cdc764
Added option in config.inc.php to set the default export method to quick, custom, or custom-no-form
2010-07-13 18:21:34 -07:00
lorilee
e90f8e4d89
Added a title to the export page to show the current export mode (server/database/table)
2010-07-08 12:30:50 -07:00
lorilee
2a046d7b08
Removed inline css, added labels to form elements, modified file template message to make it less confusing
2010-07-08 11:57:59 -07:00
lorilee
2e3fad7456
Support for no javascript
2010-07-05 16:19:03 -07:00
lorilee
c9fa5b476e
<li> tags only shown when there is content in between them
2010-06-22 20:40:11 -04:00
lorilee
991d461e06
Fixed code indentation, added back Kanji encoding feature that I accidentally removed, modified the formatting to match the rest of the export form
2010-06-19 11:38:28 -04:00
lorilee
b967bd9169
Fixed XHTML syntax problems
2010-06-18 16:14:48 -04:00
lorilee
fe90e236cd
Quick export
2010-06-15 16:21:44 -04:00
lorilee
e850923677
Modified label text, removed inline javascript, modified formatting
2010-06-11 01:12:57 -04:00
lorilee
ea8062b375
Moved the plugin drop-down list down to just before the plugin-specific options
2010-06-08 23:04:22 -04:00
lorilee
de5013ae7a
The new export page
2010-06-08 10:57:31 -04:00
lorilee
b32bba64df
Revert "New export page"
...
This reverts commit f3dcd35025
2010-06-08 10:53:26 -04:00
lorilee
f3dcd35025
New export page
2010-06-08 10:52:38 -04:00
Marc Delisle
caa98445d8
conform to relational terminology regarding columns and rows
2010-05-31 14:33:21 -04:00
Michal Čihař
a04e9abd3f
Revert messages back to original form.
2010-05-24 10:51:54 +02:00
Michal Čihař
d47b913599
Adjust Kanji encoding feature to match look of the rest interface.
...
Move all options to single <fieldset>, now it looks at least consistent
with rest of the dialogs where it is being used.
2010-05-10 14:17:34 +02:00
Marc Delisle
632211d065
gettext conversion
2010-05-09 16:24:32 -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
sutharshan
9fda4bb515
Convert loading of export/import to jQuery ready event.
...
This way it is done after document is fully loaded and no race
conditions can appear as with inline js.
patch #2984337 , bug #2983446
2010-04-11 11:17:47 +02: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
7efb784901
patch #2961540 Do not export data of MERGE table
2010-03-05 12:44:34 +00:00
Marc Delisle
526dce65cb
3.3
2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4
3.3
2009-12-31 13:09:18 +00:00
Herman van Rink
195165c2ae
Code cleanup
2009-12-27 13:59:08 +00:00
Marc Delisle
f9c781a73f
bug #2883633 [export] Export of InnoDB table is incomplete
2009-10-23 16:50:39 +00:00
Marc Delisle
1419fcf3c2
remove deprecated parameter of PMA_Table::countRecords()
2009-10-23 10:02:09 +00:00
Michal Čihař
184934bb10
Escape special chars when displaying filename template cookies.
2009-03-24 08:55:07 +00:00
Michal Čihař
56941e509c
Adding @package, second part.
2008-11-24 11:05:40 +00:00
Marc Delisle
6208585d04
no longer useful since all lang files are UTF-8
2008-10-01 20:48:40 +00:00
Marc Delisle
2fff6e358f
bug #2080963 [charset] Clarify doc and improved code
2008-09-07 15:29:00 +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
Sebastian Mendel
26599a4fe2
fixed call to PMA_Message::addParam()
2007-10-18 07:24:04 +00:00
Sebastian Mendel
0f18e49843
make use of PMA_Message
2007-10-17 09:06:00 +00:00
Sebastian Mendel
1708f2ecdd
make use of new message object
2007-10-10 14:31:42 +00:00
Sebastian Mendel
ec7a30f4fd
make use of new third 'class' parameter for PMA_showMessage()
2007-10-09 12:16:10 +00:00
Sebastian Mendel
872cadf60d
make use of PMA_showHint() in more places
2007-10-05 14:06:27 +00:00
Sebastian Mendel
d0ac1f2bbb
XHTML standard: no language attribute in <script>
2007-04-01 11:13:46 +00:00
Sebastian Mendel
cfeb306526
coding standard: no spaces inside braces
2007-04-01 11:02:46 +00:00
Sebastian Mendel
adb39168cc
coding standard: no braces around include
2007-04-01 09:51:41 +00:00
Sebastian Mendel
b2f3ae5fcf
make $sql_query persistent (init it, never unset it, always assume it is set)
2007-04-01 09:26:14 +00:00
Sebastian Mendel
008734f8b0
do NEVER unset $table or $db;
...
no need to test for isset() on $db and $table;
always test with strlen() for valid $table or $db;
2007-03-30 09:12:05 +00:00
Sebastian Mendel
374abd5173
fixed/added page level docblock
2007-03-20 10:32:13 +00:00
Sebastian Mendel
817e790762
synced/fixed vim line
2007-03-19 17:55:39 +00:00
