ninadsp
c9253c0a0e
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
lorilee
948abf11d4
Added back button on the top of the page as well
2010-08-14 14:09:09 -07:00
lorilee
4b4374d8b3
Check if variable exists before calling
2010-08-11 13:27:08 -07:00
lorilee
030cad2cb6
Removed unneeded commented out code
2010-08-10 22:22:09 -07:00
lorilee
4482228f66
Back button on export.php page
2010-08-10 22:11:57 -07: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ř
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
Marc Delisle
084c0dbcf5
functions.js included automatically
2010-07-24 08:11:48 -04:00
lorilee
89b0a3082e
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
...
Conflicts:
libraries/display_export.lib.php
2010-07-23 21:06:46 -07:00
lorilee
723a71c014
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
...
Conflicts:
libraries/export/latex.php
themes/darkblue_orange/css/theme_right.css.php
themes/original/css/theme_right.css.php
2010-07-23 20:43:35 -07:00
ninadsp
e646a2760c
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
Michal Čihař
b24a566eba
Export uses same expanding as title.
2010-07-21 09:36:28 +02:00
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
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
Michal Čihař
765e9021e4
No need to handle convcharset here.
2010-07-20 11:41:21 +02:00
lorilee
5b8c603124
If the user already appended the file extension, don't add it again
2010-07-12 19:10:11 -07:00
lorilee
e3f4e4a776
Quick export
...
Fixes table export
2010-06-15 16:19:27 -04:00
lorilee
b1c812422d
Updated variable checks for structure and data to reflect new form field names
2010-06-08 22:40:02 -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
7925c03896
gettext conversion
2010-05-11 13:05:43 -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
Marc Delisle
7efb784901
patch #2961540 Do not export data of MERGE table
2010-03-05 12:44:34 +00:00
Marc Delisle
d47fce3ee3
patch #2961540 Do not export data of MERGE table
2010-03-05 12:44:34 +00:00
Michal Čihař
94c2f864ae
[core] Remove config data from session as it brings chicken-egg problem.
...
Configuration data stores PmaAbsoluteUri, which should be accessible
before initiating session. Otherwise there is no way to make
PmaAbsoluteUri work. PmaAbsoluteUri is needed at least for reverse
proxy setups, for example http webserver running behind https proxy.
2010-01-21 11:18:18 +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
Marc Delisle
f9c781a73f
bug #2883633 [export] Export of InnoDB table is incomplete
2009-10-23 16:50:39 +00:00
Marc Delisle
f038959b4f
bug #2839548 [export] Triggers order on export
2009-08-30 12:43:07 +00:00
Marc Delisle
0214a6fe9d
patch #2773818 [export] Invalid "Content-Encoding" header
2009-05-03 17:03:47 +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
91ae7b67bd
various code improvements, thanks to Piotr Przybylski
2008-08-16 12:17:52 +00:00
Marc Delisle
9ff701560f
bug #2032707 [core] PMA does not start if ini_set() is disabled
2008-08-01 19:15:01 +00:00
Marc Delisle
7146b10226
this header should not harm other browsers
2008-07-21 14:41:56 +00:00
Marc Delisle
6e38a22283
patch #2020630 [export] Safari and timedate
2008-07-18 17:42:52 +00:00
Marc Delisle
4e76dc40a3
improved fix for bug 1996943
2008-06-20 17:53:30 +00:00
Marc Delisle
667300c989
typo
2008-06-19 12:32:07 +00:00
Marc Delisle
be10c2988f
bug #1996943 [export] Firefox 3 and .sql.gz (corrupted)
2008-06-19 12:29:48 +00:00
Marc Delisle
6554e9893a
bug #1981043 [export] HTML in exports getting corrupted
2008-06-01 12:15:23 +00:00
Sebastian Mendel
fa21fe3ea5
make the database list more magic:
...
load/fetch only if really required
use SPL ArrayObject to behave like an array
2008-05-09 10:41:16 +00:00
Marc Delisle
aa0a464f10
bug #1804081 [export] export on server does not obey AllowAnyWhereRecoding
2007-11-10 15:20:59 +00:00
Sebastian Mendel
6ee1069a9c
make use of PMA_Message
2007-10-17 10:08:21 +00:00
Sebastian Mendel
107fc46ad9
make use of PMA_Message
2007-10-16 12:14:19 +00:00
