Commit Graph

103 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ř
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
Michal Čihař
b24a566eba Export uses same expanding as title. 2010-07-21 09:36:28 +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
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
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
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