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

431 Commits

Author SHA1 Message Date
Piotr Przybylski
e7a4453406 More code formatting changes 2011-07-13 14:02:43 +02:00
Piotr Przybylski
bf9469ec18 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 12:25:06 +02:00
Piotr Przybylski
2c0d2aca16 Use PMA_MYSQL_STR_VERSION instead of reconstructing it from PMA_MYSQL_INT_VERSION 2011-07-12 18:16:01 +02:00
Piotr Przybylski
ced22c9c22 Remove unused function from most export plugins: PMA_exportComment 
It's used only locally in SQL export
 2011-07-12 17:50:46 +02:00
Piotr Przybylski
f14a4e567f Unify comments for export plugins 2011-07-12 17:50:46 +02:00
Piotr Przybylski
3bde595666 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-27 23:55:32 +02:00
Michal Čihař
12348ee826 Fix escaping on LIKE queries 
All these need special variant of PMA_sqlAddSlashes.
 2011-06-27 14:50:16 +02:00
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Piotr Przybylski
c734e1fd14 Workaround for brokwn ROW_FORMAT in SHOW CREATE TABLE (Drizzle) 2011-06-26 21:26:49 +02:00
Piotr Przybylski
3eaff6afb6 A few Drizzle-related changes to db operations tab 2011-06-26 18:38:36 +02:00
Piotr Przybylski
e38b5cd4ff Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/common.lib.php
	libraries/database_interface.lib.php
	tbl_structure.php
 2011-06-23 14:02:58 +02:00
Michal Čihař
18527251e7 Fix syntax error 2011-06-21 15:03:26 +02:00
Michal Čihař
76d4046858 Use subpackages for export formats 2011-06-21 11:39:21 +02:00
Michal Čihař
40ddb5031e Docblocks and whitespace cleanup in export modules 2011-06-21 11:31:42 +02:00
Piotr Przybylski
2e01d01b32 Change all calls of SHOW KEYS/INDEX that use MySQL-specific fields to use query generation function 2011-06-18 00:15:43 +02:00
Piotr Przybylski
12f70e8938 Replace all SHOW FIELDS calls with PMA_DBI_get_columns() or PMA_DBI_get_columns_sql() 
Fix PMA_DBI_get_columns() in Drizzle when $full == false
 2011-06-17 00:22:25 +02:00
Michal Čihař
f2fe4db5f1 Remove not used code 2011-06-06 14:12:58 +02:00
Michal Čihař
d14e49f827 Simplify code 2011-06-06 13:47:00 +02:00
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false. 
At least this seems to be the coding standard, so make all files
compliant.
 2011-06-06 11:55:09 +02:00
Michal Čihař
754cc88c39 Wrap a bit long lines 2011-06-06 11:31:27 +02:00
Michal Čihař
bbbf2c49ed Drop $GLOBALS['charset']. 
It was anyway always set to utf-8 so it does not make sense to keep it
as a variable.
 2011-06-03 14:04:29 +02:00
Marc Delisle
ae0af9e5c6 Remove author name 2011-05-28 08:29:38 -04:00
Rouslan Placella
6adfdb3b44 Feature Request #3163355 - Skip dumping data comment if table is empty. 2011-03-28 14:18:10 +02:00
Michal Čihař
03d347c1a6 Correctly set font for PDF footer (bug #3168749). 2011-02-15 19:18:35 +01:00
Marc Delisle
1484ca6c00 Procedures and functions should be exported also when entering Export on a single db 2011-02-13 14:00:14 -05:00
Marc Delisle
708638e1dd Bug #3179715 Procedure and functions are not exported in Server export mode 2011-02-13 08:03:36 -05:00
Madhura Jayaratne
e3870e938e Avoid current page being reset to initial page when an empty table is encountered. 2011-01-25 08:10:54 +05:30
Madhura Jayaratne
dec8229eae bug #3164338 [pdf] Exporting database to PDF incomplete 2011-01-24 08:41:29 +05:30
madhuracj
ca55e59e6b TCPDF upgraded to version 5.9 2011-01-19 17:55:41 +05:30
Michal Čihař
eeea3d6845 [export] Better handling of export to PHP array. 
There is no need for own logic here, we can use var_export.
 2011-01-13 13:42:24 +01:00
Michal Čihař
bf3da02992 Merge branch 'QA_3_3' 2011-01-13 13:28:07 +01:00
Jacob Middag
df97b1d2c0 Changed yaml export to double quotes for strings 2011-01-13 13:27:21 +01:00
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
Marc Delisle
82acbb2ba3 fix merge conflicts 2010-08-21 07:46:57 -04:00
Crack
e344696016 account for changes introduced when merging lori/gsoc branch 2010-08-19 16:36:41 +02:00
Michal Čihař
6aefc832ad Fixes for JSON plugin. 2010-08-19 14:05:04 +02:00
Michal Čihař
c7815a8650 Fix typo. 2010-08-19 11:47:39 +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
Michal Čihař
c5a3288396 Merge remote branch 'lori/gsoc' 2010-08-19 11:11:51 +02:00
Michal Čihař
1f248cc254 Simplify code to use native tcpdf functions. 2010-08-18 13:58:52 +02:00
lorilee
90c0e573f7 Fixed formatting 2010-08-10 20:43:57 -07:00
lorilee
1c0b81d477 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-08-09 13:36:31 -07:00
lorilee
6f833918e9 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-08-09 13:35:27 -07:00
ninadsp
a458147969 Merge from upstream. Resolved a conflict in js/functions.js 2010-08-05 23:51:14 +05:30
Marc Delisle
a8852c5dc9 JSON exported file extension should be .json 2010-08-03 13:10:31 -04:00
Hauke Henningsen
5675555d5a patch #3038312 [export] JSON export 2010-08-03 13:08:21 -04:00
lorilee
765bfb6f40 Should be closing a group, not a subgroup 2010-08-02 13:14:41 -07: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ř
e5e340e525 Proper propagating of overrided values. 2010-07-21 10:16:30 +02:00
Michal Čihař
cb6716c481 Documentation in LaTeX format strings. 2010-07-21 10:11:35 +02:00
Michal Čihař
906d7bc632 By default use new format strings. 2010-07-21 10:06:16 +02:00
Michal Čihař
9b2aa3c40d Indentation. 2010-07-21 09:55:13 +02:00
Michal Čihař
715f2f04f6 Move messages to place where they are used. 2010-07-21 09:54:04 +02:00
Michal Čihař
7415caa4e4 LaTeX export uses PMA_expandUserString. 2010-07-21 09:51:24 +02: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
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
8397112a67 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee 2010-07-16 16:54:59 -07:00
ninadsp
9dd93987ca Reverted po files changes. 2010-07-15 00:17:49 +05:30
lorilee
5fab0e993c Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-14 11:33:45 -07:00
Marc Delisle
6ea41018b2 Merge branch 'QA_3_3' 2010-07-12 09:01:05 -04:00
Marc Delisle
768de14815 typo 2010-07-12 09:00:39 -04:00
Marc Delisle
f6ef0c87a8 Merge branch 'QA_3_3' 2010-07-12 08:57:05 -04:00
Marc Delisle
cda9df7101 bug [export] CSV for MS Excel (Windows) should have semi-colon as separator 2010-07-12 08:56:30 -04:00
lorilee
0900dc1b0b Fixed a formatting bug 2010-07-08 14:07:36 -07:00
lorilee
a62cc4d464 Changed "columns terminated with" to "columns separated with" 2010-07-08 13:40:50 -07: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
b43cea6007 Modified label text and formatting 2010-06-11 01:26:35 -04:00
lorilee
fde6380f0c Updated hidden structure/data field name, Modified label text, Modified formatting 2010-06-11 01:26:34 -04:00
lorilee
5eb6321e4e Updated hidden structure/data field name, Modified label text, Modified formatting 2010-06-11 01:26:34 -04:00
lorilee
83a7e12283 Updated hidden structure/data field name, Modified label text, Modified formatting 2010-06-11 01:26:34 -04:00
lorilee
140007579f Updated hidden structure/data field name, Modified label text 2010-06-11 01:26:34 -04:00
lorilee
7fdcd05dcb Updated hidden structure/data field name, Modified label text 2010-06-11 01:26:34 -04:00
lorilee
4a4cdb3f26 Updated hidden structure/data field name 
Modified label text
 2010-06-11 01:26:33 -04:00
lorilee
a318f41805 Modified form fields, formatting and organization 2010-06-11 01:26:33 -04:00
lorilee
133c204ee8 Modified label text and formatting 2010-06-11 01:16:22 -04:00
lorilee
25fe9dcc43 Updated hidden structure/data field name, Modified label text, Modified formatting 2010-06-09 20:32:21 -04:00
lorilee
8238111537 Updated hidden structure/data field name, Modified label text, Modified formatting 2010-06-09 20:29:44 -04:00
lorilee
1ed8542945 Updated hidden structure/data field name, Modified label text, Modified formatting 2010-06-09 20:27:58 -04:00
lorilee
696617b4e4 Updated hidden structure/data field name, Modified label text 2010-06-09 20:27:14 -04:00
lorilee
af861fba90 Updated hidden structure/data field name, Modified label text 2010-06-09 20:26:41 -04:00
lorilee
43c6fbedea Updated hidden structure/data field name 
Modified label text
 2010-06-09 20:26:04 -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
f55823f47f strings to gettext, first batch 2010-05-03 12:57:46 -04:00
Michal Čihař
73c75aacd2 There is no need to duplicate this message. 2010-05-03 14:00:06 +02:00
Michal Čihař
bd4e0b83d8 Fix mermissions. 2010-04-26 14:33:05 +02:00
Michal Čihař
e5ceb497df Revert part of eb5e03880e. 
XLSX writer does not have setTempDir method.
 2010-04-09 15:27:25 +02:00
Michal Čihař
62c149e38d Revert part of eb5e03880e. 
XLSX writer does not have setTempDir method.
 2010-04-09 15:26:37 +02:00
Michal Čihař
251403e617 Merge branch 'QA_3_3' 2010-03-31 14:32:37 +02:00
Björn Wiberg
eb5e03880e bug #2973280 [export] Proper handling of temporary directory in XLS export. 2010-03-31 14:32:16 +02:00
Marc Delisle
91ab521480 Merge branch 'QA_3_3' 2010-03-30 12:56:17 -04:00
Victor Volkov
bb0ad40413 Patch #2977725 XML export wrongly encoded 2010-03-30 12:56:06 -04:00
Michal Čihař
9c73fec8a0 Fix permissions. 2010-03-08 14:23:06 +00: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
d63ed916fc code cleanup 2009-12-30 13:46:17 +00:00
Marc Delisle
0a217b9b62 undefined variables 2009-12-29 17:58:07 +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
Derek Schaefer
300ff173db MediaWiki display name now uses localization. 2009-09-14 22:16:24 +00:00
Derek Schaefer
dde6838ad6 Added MediaWiki export module. Feature request #2838642 2009-09-14 22:11:03 +00:00
Derek Schaefer
6e26b05999 Improved ODS date/time/datetime export format. Patch #2856664 2009-09-14 06:21:04 +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
Marc Delisle
d9c6e3b345 patch #2816713, fix for PHP array export: NULL values not correctly dumped 2009-07-06 12:18:39 +00:00
Marc Delisle
e428843f80 patch #2805828 [export] PHP array export plugin 2009-06-27 18:31:34 +00:00
Marc Delisle
81b5cfbc51 undefined variable 2009-06-27 11:57:11 +00:00
Herman van Rink
35609969af Renamed misleading label escapeCRLF to removeCRLF 2009-05-25 08:11:32 +00:00
Marc Delisle
c2c260b79e patch #2739001 [export] XML does not allow spaces in element names 2009-04-19 12:24:45 +00:00
Herman van Rink
5f4f2e8f3f bug #2687046 [export] Structure export: Null always YES 2009-04-14 13:34:20 +00:00
Marc Delisle
a9c77afa54 patch #2715142 [export] (rfe 2416960, escape new line in CSV export) 2009-03-30 23:08:54 +00:00
Michal Čihař
c32bc4ed86 bug #2609346 [operations] Fix copying views. 2009-03-03 10:12:17 +00:00
Marc Delisle
5a8d192fea bug #2445213 [export] Commas for CSV Excel 2008 for Mac 2008-12-25 14:52:28 +00:00
Marc Delisle
398feb40fd patch #2407785 [cleanup] ereg*() deprecated in PHP 5.3 2008-12-14 13:58:06 +00:00
Marc Delisle
2500001427 bug #1963184 [export] YAML export improvement 2008-12-12 13:03:43 +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ř
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Michal Čihař
ebeb0c319f Adding @package, first part. 2008-11-24 10:32:56 +00:00
Michal Čihař
9561f56875 Fix some phpdoc errors. 2008-11-24 09:55:30 +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