Commit Graph

96 Commits

Author SHA1 Message Date
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
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
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
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
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
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