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

229 Commits

Author SHA1 Message Date
lorilee
8fa03264e4 Added comments 2010-08-14 15:14:45 -07:00
lorilee
03fdce14c4 Checks if value is a string before calling urldecode() 2010-08-14 14:10:18 -07:00
lorilee
4482228f66 Back button on export.php page 2010-08-10 22:11:57 -07:00
lorilee
c41d4be0b1 This code got deleted somehow from a previous commit 2010-08-02 13:48:06 -07:00
Crack
53e8d75c0f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/db_links.inc.php
	libraries/tbl_links.inc.php
 2010-08-01 23:19:21 +02:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
lorilee
1faaa80b51 Fixing HTML markup 2010-07-28 15:00:36 -07:00
Marc Delisle
d0fc397fe1 new database format string 2010-07-28 13:05:24 -04:00
lorilee
428053bef5 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-26 13:44:30 -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ř
3910ce6121 Remove explicit inclusion of Table.class.php as it is included in common.inc anyway. 2010-07-26 16:35:52 +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
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
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
38171b9e23 Move documentation link to better place. 2010-07-21 10:08:48 +02:00
Michal Čihař
906d7bc632 By default use new format strings. 2010-07-21 10:06:16 +02:00
lorilee
db9527b4c6 Merging with master 2010-07-20 15:30:36 -07:00
lorilee
d621c84dbf Merging from master 2010-07-20 15:28:21 -07: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
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
Crack
fab6eb09ea Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-20 12:30:03 +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
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
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
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
38ac78e3ba merging changes from origin 2010-05-24 18:32:42 +05:30
Michal Čihař
a04e9abd3f Revert messages back to original form. 2010-05-24 10:51:54 +02: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ř
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
Marc Delisle
00f6e5b4b7 bug #1607282, add warning for loss of auto_increment due to a bug in older MySQL 2006-12-13 13:02:42 +00:00
Michal Čihař
8e64e6e39a Reinclude table selection (bug #1477226). 2006-04-26 20:59:09 +00:00
Michal Čihař
19d0390e8c Fix selecting of default export. 2006-04-26 16:55:12 +00:00
Michal Čihař
6e17c995fb Convert export to plugin architecture, so that plugins are independant piece of code (RFE #1325937). 2006-04-26 16:33:59 +00:00
Marc Delisle
e91fcb271d bug #1401864, DROP VIEW instead of DROP TABLE 2006-03-25 10:10:44 +00:00
Marc Delisle
9c993cdacd bug #1401864, preparing for possible DROP VIEW clauses 2006-03-23 18:01:43 +00:00
Michal Čihař
30bbf58924 Improve compatibility modes function, thanks to Sebastian. 2006-02-22 11:49:44 +00:00
Michal Čihař
99e5d3478b Use new function for SQL compatibility modes. 2006-02-22 10:16:45 +00:00
Sebastian Mendel
cd340d8496 moved PMA_generateFieldSpec(), PMA_tableIsView(), PMA_countRecords(), PMA_generateAlterTable() into class PMA_Table 2006-02-21 11:07:46 +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
Sebastian Mendel
e7fc64d285 'fixed' layout of export screen for buggy safari and opera 2006-01-14 20:20:13 +00:00
Sebastian Mendel
2833e1537e no name attribute for sup tag 2005-12-06 10:13:26 +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ř
f9293a28b3 Better description for filename format (RFE #1362423). 2005-11-23 19:49:16 +00:00
Sebastian Mendel
c9a50c006c use superscript tag for comment 2005-11-18 18:03:43 +00:00
Michal Čihař
2a9f434d87 Support for user specific upload and save directories (RFE #1260039). 2005-10-18 19:55:11 +00:00
Sebastian Mendel
2287fd9927 XHTML compliance, introduced fieldsets 2005-10-13 15:31:22 +00:00
Michal Čihař
4166977846 Add ability to limit maximal size of extended insert query, defaults to 50 KB (RFE #1015378). 2005-10-09 08:16:57 +00:00
Michal Čihař
ce05d7f446 Use same formatting for all options. 2005-10-08 08:49:06 +00:00
Michal Čihař
ea707775d2 Fix auto increment export (bug #1309257). 2005-09-30 18:38:14 +00:00
Michal Čihař
64bd56dfba Support for browsing selected columns (RFE #1275909). 2005-09-26 19:03:11 +00:00
Michal Čihař
39ea0b8557 Default charset for export is now configurable (RFE #1263772). 2005-08-22 21:41:20 +00:00
Michal Čihař
c6f540be72 Configurable file name templates (RFE #1226941). 2005-06-24 12:17:07 +00:00
Michal Čihař
baff8bc0de fix javascript logic controlling checking of structure/data (thanks to rabus) 2005-03-06 21:18:29 +00:00
Michal Čihař
a3d769e73d Word export now can contain table structure and better handles more tables/databases export. 2005-03-06 14:54:15 +00:00
Michal Čihař
d5f9ad07b7 Added Microsoft Word and Excel 2000 export (RFE #1155122). 2005-03-06 12:52:20 +00:00
Marc Delisle
e430651d24 native comments 2005-03-06 12:33:19 +00:00
Michal Čihař
de484bfce1 Do not offer modes not available in current MySQL version, do not fail on error when setting SQL_MODE (bug #1155209). 2005-03-02 21:17:24 +00:00
Michal Čihař
f1f39b8ed1 added infou about UFPDF to documentation 2004-12-29 14:16:51 +00:00
Garvin Hicking
9392a58483 removed superfluous spaces, introduced more CSS ID attributes 2004-10-08 11:14:08 +00:00
Garvin Hicking
9a1b11c82e fix label spacing 2004-09-16 10:59:26 +00:00
Michal Čihař
09a20e6dfc Updated texts to fit Excel 2003 behaviour (bug #1018457). 2004-09-03 11:38:39 +00:00
Michal Čihař
e9f19691b9 No options text should not be bold red (bug #1010759). 2004-08-17 14:58:50 +00:00
Michal Čihař
ca5b16f654 Change look of adding fields into table (bug #991095). 
I again did some XHTML validation, so removed few of most obvious errors, but there are still many, mostly missing alt attributtes for images and wrongly nested tags.
 2004-08-12 15:13:20 +00:00
Michal Čihař
1cef835c05 Display SQL export after saving file on server (bug #989657). 2004-07-15 14:09:23 +00:00
Marc Delisle
0e8e84d8c0 bug 981359 optional hex for binary 2004-07-01 01:30:37 +00:00
Marc Delisle
a04115157f style alignment for lost option 2004-06-25 11:38:05 +00:00
Michal Čihař
bbfead0066 Add back key checking disabling. 2004-06-25 10:51:20 +00:00
Marc Delisle
919bfd6646 redesign phase 4 2004-06-18 20:02:27 +00:00
Michal Čihař
9b243b2f0d fix export display 2004-06-15 13:25:12 +00:00
Marc Delisle
d9a21610d1 redesign part 3 2004-06-13 21:39:08 +00:00
Michal Čihař
d9cc90927c Add FOREIGN_KEY_CHECKS=0 to export (RFE #966038). 2004-06-08 09:21:48 +00:00
Michal Čihař
3b16b66659 add missing @ 2004-06-07 16:06: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ř
928a8b33db Be valid XHTML 2004-04-27 12:36:12 +00:00
Michal Čihař
7dbba54afd Support for enclosing SQL export in transaction (RFE #930827). 2004-04-14 13:31:26 +00:00
Michal Čihař
fc0c608d82 Add support for IF NOT EXISTS in CREATE TABLE export (RFE #913421). 2004-03-10 13:13:27 +00:00
Michal Čihař
b6f8cbd8e5 Add support for INSERT IGNORE and UPDATE IGNORE. 2004-03-10 11:51:18 +00:00
Michal Čihař
0914c72f15 Can add custom text to SQL export headers (RFE #874361). 2004-03-09 16:21:37 +00:00
Alexander M. Turek
37d50c1822 Huge set of optimizations, please test! 2003-11-26 22:52:25 +00:00
Garvin Hicking
f0da471ec3 /libraries cleanup hopefully done. Double-Checked every change, my installation still works. ;) 
Will continue working on remaining files tomorrow and hope to make it to the end of the next day.
 2003-11-20 16:31:51 +00:00
Michal Čihař
6884f9701a no more support for php3 2003-11-18 15:20:45 +00:00