gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,872 Commits 12 Branches 481 Tags 2.4 GiB
d248f77458
Commit Graph

315 Commits

Author SHA1 Message Date
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
Crack
7db978de3f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/config.values.php
 2010-07-26 20:24:57 +02: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
Crack
2d67cb58c4 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/relation.lib.php
 2010-07-24 18:34:52 +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
Crack
fab6eb09ea Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-20 12:30:03 +02:00
Crack
52550eff13 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Resolved conflicts:
	setup/lib/forms.inc.php
	setup/lib/messages.inc.php
 2010-07-20 12:19:21 +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
Crack
68d9c40113 moved Import by LOAD DATA settings to CSV category 
moved PMA_array_* functions to core.lib.php
moved PMA_read_userprefs_fieldnames() to user_preferences.lib.php
server/database/table filename templates are saved to pmadb when "remember template" is checked
 2010-07-04 21:56:46 +02: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
Sebastian Mendel
e9d16d4a38 make use of new message object 2007-10-10 15:39:39 +00:00
Sebastian Mendel
40b3ce9fd1 use array to define included JavaScript libraries 2007-10-04 09:22:50 +00:00
Marc Delisle
db6063a770 old PHP4 code 2007-08-18 20:01:14 +00:00
Marc Delisle
e33c249de2 bug #1722502 DROP TABLE in export view structure 2007-05-21 17:13:49 +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
Marc Delisle
6fd4ffda97 test condition has to be reversed for this to work 2007-03-21 17:18:16 +00:00
Marc Delisle
43d0461651 undefined onserver 2007-03-21 16:59:45 +00:00
Sebastian Mendel
d0facc3d4f splitted common.lib.php into common.inc.php, core.lib.php and common.lib.php 2007-03-20 14:16:18 +00:00
Sebastian Mendel
a53ccda75c fixed NOTICES introduced by commit(bug #1682044 Export file even if file not selected) 2007-03-19 15:24:36 +00:00
Sebastian Mendel
5d3c12c5bd bug #1682044 Export file even if file not selected 2007-03-19 13:43:57 +00:00
Marc Delisle
b0588d3570 bug #1621280, support VIEW dependencies during export 2006-12-26 16:10:47 +00:00
Marc Delisle
ac5be0261a set local_query only if we are exporting data 2006-12-26 14:07:02 +00:00
Michal Čihař
fb9a3a598e Check before commit! 2006-11-17 08:49:30 +00:00
Michal Čihař
cac4247057 Rename db_* files to drop useless _details part. 2006-10-25 12:25:01 +00:00
Michal Čihař
ad06b4a991 Rename tbl_* files to drop useless _properties part. 2006-10-25 10:55:20 +00:00
Marc Delisle
3cd881c9e3 export nothing if no tables are selected 2006-10-17 17:10:40 +00:00
Marc Delisle
e1e1fdc6bd bug #1541189, views not displayed in export list 2006-10-14 23:17:58 +00:00
Sebastian Mendel
45b04ab15d replaced $dblist with new PMA_List_Database class 2006-09-20 11:15:56 +00:00
Michal Čihař
1159c2ca78 Increase magic contstant to avoid problems with compression of some specific data (bug #1477029). 2006-05-15 22:01:55 +00:00
Michal Čihař
ab4ed43683 better error message for user 2006-04-26 19:26:30 +00:00
Michal Čihař
0afc370aa7 Allow forcing of export to file, it makes no sense to display PDF in textarea ;-). 2006-04-26 19:16:52 +00:00
Michal Čihař
9199199219 Use plugins for extension and MIME type. 2006-04-26 17:49:47 +00:00
Marc Delisle
5aa902dc0e bug #1443004, VIEW and export 2006-04-13 08:24:23 +00:00
Marc Delisle
2cba19241c correct function call 2006-04-13 08:01:35 +00:00
Marc Delisle
61c509d559 bug 1443004 part 1: do not generate INSERT for an exported VIEW 2006-04-12 21:00:12 +00:00
Marc Delisle
3368571ee8 bug #1410078, error exporting query ending with semicolon 2006-01-20 12:24:16 +00:00
Sebastian Mendel
0ae8842353 (not complete) PEAR coding standard 2006-01-17 17:03:02 +00:00
Sebastian Mendel
7358f5a712 allow 0 as name for database, table collumn, alias and index 2006-01-14 23:17:17 +00:00
Michal Čihař
8c6b3995d1 Configurable memory limit (RFE #1373904). 2005-12-16 13:57:32 +00:00
Michal Čihař
5b8329b473 Check for correct parameters. 2005-12-05 10:09:00 +00:00
Michal Čihař
75a16f45f8 Use same script tag, use CDATA for scripts (RFE #995065). 2005-12-04 23:14:41 +00:00
Marc Delisle
dc5cd6d778 PDF export 2005-12-03 19:28:22 +00:00
Michal Čihař
6aeabf44d1 Move footer.inc.php, header.inc.php and header_printview.inc.php to libraries folder as it does not require direct access. 2005-11-24 09:12:17 +00:00
Sebastian Mendel
fcf387bc70 common.lib.php should REALLY REALLY and ALWAYS be the first include 2005-11-18 12:50:49 +00:00
Michal Čihař
2a9f434d87 Support for user specific upload and save directories (RFE #1260039). 2005-10-18 19:55:11 +00:00
Michal Čihař
64bd56dfba Support for browsing selected columns (RFE #1275909). 2005-09-26 19:03:11 +00:00
Michal Čihař
d9977e23ae Show error header on error to make clear that something bad has happened. 2005-08-04 13:52:51 +00:00
Michal Čihař
c585360d8a Use actual MIME type for CSV. 2005-07-26 14:28:06 +00:00
Marc Delisle
a3cc57896d bug #1116026, export under IE 6 (XP SP2) 2005-07-12 20:31:36 +00:00
Marc Delisle
0ab8b74a58 bug #1193442, 8 extra spaces at end of export area 2005-05-18 10:29:26 +00:00
Marc Delisle
40e3d502af bug #1123284, avoid double compression when zlib.output_compression is On 2005-05-02 16:39:40 +00:00
Michal Čihař
a9aedbe951 Unified cookie path handling, added / to end of path (bug #1155373). 2005-03-06 21:10:53 +00:00
Michal Čihař
d5f9ad07b7 Added Microsoft Word and Excel 2000 export (RFE #1155122). 2005-03-06 12:52:20 +00:00
Michal Čihař
f07464e5c3 Fix export of SQL for Safari (bug #1113015). 2005-02-08 15:12:47 +00:00
Michal Čihař
db02f14672 Back to Content-Type application/x-bzip2 on bzip2 export (bug #1106652). 2005-01-23 23:24:33 +00:00
Michal Čihař
5ad4d83958 Use standardised mime types and use content encoding for gzip/bzip2. I hope this will fix double gzip compression as in bug #1094649. 2005-01-03 13:38:30 +00:00
Michal Čihař
fcdfa25a14 Use just \n for SQL exports (bug #1042521). 2004-10-19 11:58:05 +00:00
Marc Delisle
89ecfb83c5 bug 1038804 - insufficient space to save 2004-10-02 12:56:44 +00:00
Marc Delisle
032126281e remove auto-select of exported textarea 2004-06-24 20:45:12 +00:00
Marc Delisle
ab543c6ac5 PMA_securePath 2004-06-15 16:32:40 +00:00
Marc Delisle
d9a21610d1 redesign part 3 2004-06-13 21:39:08 +00:00
Michal Čihař
08db25e5a6 EXPERIMENTAL native MS Excel export support, using PEAR module Spreadsheet_Excel_Writer (RFE #968110). 2004-06-07 14:11:54 +00:00
Michal Čihař
1aaa89fa54 Little code reorganistaion (RFE #957308), removed some remaining php3 compatibility code in SQL parser. 2004-05-20 16:14:13 +00:00
Michal Čihař
7dbba54afd Support for enclosing SQL export in transaction (RFE #930827). 2004-04-14 13:31:26 +00:00
Michal Čihař
f28ddb784f Correctly report error when export fails. 2004-03-10 10:06:55 +00:00
Michal Čihař
382283de19 minor export fixes 2004-03-09 15:27:34 +00:00
Marc Delisle
2526d8ae79 bug 899610 2004-02-18 16:19:49 +00:00
Marc Delisle
cf8d1d330f security fix 2004-02-02 17:07:55 +00:00
Alexander M. Turek
2915b5c3ce Added MySQLi library; Removed calls to old mysql_wrappers library. 2004-01-22 02:13:48 +00:00
Marc Delisle
b0cc4dbb23 use PMA_DBI function 2004-01-20 19:53:53 +00:00
Garvin Hicking
e984acb7af fixed regex 2003-12-12 11:16:59 +00:00
Alexander M. Turek
37d50c1822 Huge set of optimizations, please test! 2003-11-26 22:52:25 +00:00
Garvin Hicking
c2b46ac945 Final batch of PHP3-Compatibility fixes. Please test. :-) 2003-11-22 20:57:48 +00:00
Michal Čihař
6884f9701a no more support for php3 2003-11-18 15:20:45 +00:00