Dieter Adriaenssens
eee76d640b
Merge branch 'QA_3_3'
2010-12-22 16:01:02 +01:00
Aamir Khan
1ceccbd50c
fix typo
2010-12-22 15:59:44 +01:00
Dieter Adriaenssens
1fe6e59d73
Merge branch 'QA_3_3'
2010-09-28 20:07:00 +02:00
Dieter Adriaenssens
c0d1c7a2ae
export/copy procedures and routines before tables
2010-09-28 19:37:03 +02:00
Marc Delisle
598d3b898d
functions, procedures and events are missing from the export
2010-09-19 08:55:54 -04:00
Michal Čihař
dd2861350f
Better description.
2010-09-15 15:07:49 +02:00
Michal Čihař
d17fba309c
Fix permissions.
...
Most files were made executable somewhere in ninadsp tree, reverting
this.
2010-08-30 09:53:37 +02:00
ninadsp
9c34a0eec9
Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches
2010-08-28 01:53:52 +05:30
ninadsp
c9253c0a0e
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
Crack
e344696016
account for changes introduced when merging lori/gsoc branch
2010-08-19 16:36:41 +02:00
Michal Čihař
3f33397651
No need to translate SQL statements.
2010-08-19 11:31:28 +02:00
Michal Čihař
882892af23
Better translatable messages.
2010-08-19 11:30:44 +02:00
ninadsp
e646a2760c
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
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
ninadsp
bcbf327139
Merge remote branch 'origin/master'
2010-06-29 23:54:01 +05:30
lorilee
301e3c43e3
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
2010-06-28 20:50:26 -04:00
lorilee
f1a5ae3a9f
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2010-06-28 20:49:56 -04:00
Dieter Adriaenssens
16ed06531a
remove author names
2010-06-28 20:36:12 +02:00
lorilee
8984ffffbb
Modified label text, added "doc" links
2010-06-24 17:14:20 -04:00
lorilee
3ba5c8e0f4
Fixed XHTML syntax problems
2010-06-18 16:11:52 -04:00
lorilee
a318f41805
Modified form fields, formatting and organization
2010-06-11 01:26:33 -04:00
lorilee
3bfeaf8bd7
Modified form fields, formatting and organization
2010-06-08 22:49:47 -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ř
1a923fe9c6
Proper escaping.
2010-05-24 11:13:18 +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
Marc Delisle
b05a903dc3
gettext conversion
2010-05-14 07:47:50 -04:00
Marc Delisle
37f0d02a1e
avoid confusion with older $str variables
2010-05-05 15:34:53 -04:00
Marc Delisle
2182098af6
strings to gettext, second batch
2010-05-04 20:07:19 -04: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
Michal Čihař
1243d870e7
rfe #2420684 [export] Allow export of timestamps in UTC.
2010-01-21 11:10:33 +00:00
Marc Delisle
4e4e40188f
bug #2924357 [operations] Cannot rename a database that has foreign key constraints
2010-01-01 22:41:29 +00:00
Marc Delisle
d3892fdbff
bug #2924357 [operations] Cannot rename a database that has foreign key constraints
2010-01-01 22:41:29 +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
182c02c5e8
bug #2893221 [core] Statement may not be safe to log in statement format
2009-11-21 13:22:08 +00:00
Marc Delisle
f038959b4f
bug #2839548 [export] Triggers order on export
2009-08-30 12:43:07 +00:00
Marc Delisle
15441ded5d
do not try to display a tab that was not built
2009-08-22 11:22:50 +00:00
Michal Čihař
c32bc4ed86
bug #2609346 [operations] Fix copying views.
2009-03-03 10:12:17 +00:00
Michal Čihař
74fe4a0e13
bug #2280904 [export] do not include view name in export
2008-11-28 12:28:49 +00:00
Michal Čihař
5d010348da
Add phpdoc package header to some files.
2008-11-24 09:14:31 +00:00
Michal Čihař
04570f5eb7
rfe #1612724 [export] add option to export without comments
2008-09-03 16:08:14 +00:00
Michal Čihař
a7ab2b98ee
patch #2089240 [export] handle correctly switching SQL modes
2008-09-03 15:32:57 +00:00
Michal Čihař
181eb71fae
Add links to mysqldump documentation for some options.
2008-09-03 11:54:58 +00:00
Marc Delisle
33421a8e5b
bug #2037375 [export] DROP PROCEDURE needs IF EXISTS
2008-08-09 13:58:44 +00:00
Marc Delisle
1ded7cd77f
bug #2037381 [export] Export type "replace" does not work
2008-08-06 17:25:31 +00:00
Marc Delisle
e4f84a9bbb
PMA_getTableDef() is also called from Table.class.php
2008-06-27 14:27:18 +00:00
