Commit Graph

141 Commits

Author SHA1 Message Date
Michal Čihař
34dce1d3b4 Various coding style improvements 2013-06-11 16:27:31 +02:00
Madhura Jayaratne
31d448e7e6 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-11 17:08:05 +05:30
Madhura Jayaratne
0dee9a7789 Wrap a long line 2013-06-11 16:58:55 +05:30
Michal Čihař
0ee0d8e8c5 bug #3962 Proper escaping of JSON export
We now use json_encode instead of home made encoder. Also we now
generate JSON data on the fly, what reduces memory usage.
2013-06-11 11:49:02 +02:00
Marc Delisle
47652894f7 Merge branch 'QA_4_0' 2013-06-10 13:01:22 -04:00
Kari Söderholm
0181fa9400 Fix regression: Missing removeCRLF option in ExportCsv and ExportExcel plugins. 2013-06-10 12:57:27 -04:00
Madhura Jayaratne
3dd99512f0 These constants are better as a part of DatabaseInterface class 2013-05-26 21:15:24 +05:30
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Marc Delisle
140eb64350 Merge commit '078da8d' 2013-05-23 02:57:02 -04:00
Marc Delisle
078da8d57f bug #3933 Do not translate "Open Document" in export settings 2013-05-23 02:54:47 -04:00
Marc Delisle
a51604e226 Merge branch 'QA_4_0' 2013-05-20 08:11:28 -04:00
Marc Delisle
e72f1a0daa Merge pull request #395 from ayusun/exportsqlupdate
creating database while exporting at database level
2013-05-20 05:08:21 -07:00
ayusun
d8b9a0b28c creating database while exporting at database level 2013-05-16 20:52:50 +05:30
Marc Delisle
d44367e4db Fix merge conflicts 2013-05-15 13:07:22 -04:00
Marc Delisle
920d827c37 Merge pull request #379 from mynetx/bug-3907
Fix most analysis results discovered in bug 3907
2013-05-15 09:52:03 -07:00
Madhura Jayaratne
77e31ceeb6 Use single indentation (4 spaces) 2013-05-14 23:54:05 +05:30
Marc Delisle
ef62569540 Fix merge conflict 2013-05-14 14:13:32 -04:00
ayusun
25e71b71da Bug fix #3910 with updated code indentation 2013-05-14 22:40:39 +05:30
ayusun
44dd0e8405 Bug fix 3910. Updated Export plugin to support zero rows 2013-05-13 15:16:46 +05:30
J.M
529903e0dd Fix bug #3907 undefined variables, function parameter problems
Thanks Rasmus Lerdorf for analyzing!
2013-05-13 11:27:56 +02:00
Michal Čihař
325d423abc Drop compatibility with older TCPDF using empty_string 2013-05-10 09:27:48 +02:00
Kasun Chathuranga
413123bd74 PMA_DBI_field_flags --> PMA_DBI_fieldFlags 2013-05-04 08:46:53 +05:30
Kasun Chathuranga
c5673e6177 PMA_DBI_field_name --> PMA_DBI_fieldName 2013-05-04 08:46:06 +05:30
Kasun Chathuranga
a0543cf6c8 PMA_DBI_num_fields --> PMA_DBI_numFields 2013-05-04 08:44:26 +05:30
Kasun Chathuranga
2f0d55b708 PMA_DBI_get_fields_meta --> PMA_DBI_getFieldsMeta 2013-05-04 08:43:23 +05:30
Kasun Chathuranga
556bcb9f9d PMA_DBI_num_rows --> PMA_DBI_numRows 2013-05-04 08:39:43 +05:30
Kasun Chathuranga
1c884f0cca PMA_DBI_free_result --> PMA_DBI_freeResult 2013-05-04 08:33:49 +05:30
Kasun Chathuranga
a242ed1ae5 PMA_DBI_fetch_row --> PMA_DBI_fetchRow 2013-05-04 08:31:22 +05:30
Kasun Chathuranga
5bcc32999f PMA_DBI_fetch_assoc --> PMA_DBI_fetchAssoc 2013-05-04 08:30:12 +05:30
Kasun Chathuranga
42256b2d0c PMA_DBI_select_db --> PMA_DBI_selectDb 2013-05-04 08:26:27 +05:30
Kasun Chathuranga
6b1f6ae046 Merge branch 'master' into DBI_naming_cleanUp
Conflicts:
	libraries/database_interface.lib.php
	libraries/db_table_exists.lib.php
	libraries/relation.lib.php
	libraries/rte/rte_triggers.lib.php
	libraries/schema/Dia_Relation_Schema.class.php
	libraries/schema/Visio_Relation_Schema.class.php
	tbl_addfield.php
2013-05-01 00:51:15 +05:30
Kasun Chathuranga
77bb53dcf8 PMA_DBI_get_table_indexes --> PMA_DBI_getTableIndexes 2013-05-01 00:15:48 +05:30
Kasun Chathuranga
b8c764a86e PMA_DBI_get_triggers --> PMA_DBI_getTriggers 2013-05-01 00:09:36 +05:30
Kasun Chathuranga
4f4853ce1e PMA_DBI_get_definition --> PMA_DBI_getDefinition 2013-05-01 00:08:44 +05:30
Kasun Chathuranga
5d55cf1975 PMA_DBI_get_procedures_or_functions --> PMA_DBI_getProceduresOrFunctions 2013-05-01 00:07:43 +05:30
Kasun Chathuranga
fbe4438628 PMA_DBI_fetch_result --> PMA_DBI_fetchResult 2013-05-01 00:05:16 +05:30
Kasun Chathuranga
7f56c8504d PMA_DBI_fetch_single_row --> PMA_DBI_fetchSingleRow 2013-05-01 00:03:03 +05:30
Kasun Chathuranga
bc4bfaa6d5 PMA_DBI_fetch_value --> PMA_DBI_fetchValue 2013-05-01 00:02:00 +05:30
Kasun Chathuranga
8260a2f0b5 PMA_DBI_get_column_names --> PMA_DBI_getColumnNames 2013-04-30 23:39:18 +05:30
Kasun Chathuranga
32e6c06324 PMA_DBI_get_columns --> PMA_DBI_getColumns 2013-04-30 23:36:47 +05:30
Kasun Chathuranga
2becd65b1d PMA_DBI_get_columns_full --> PMA_DBI_getColumnsFull 2013-04-30 23:33:00 +05:30
Kasun Chathuranga
d933575811 PMA_DBI_try_query --> PMA_DBI_tryQuery 2013-04-30 23:05:18 +05:30
Michal Čihař
5954fe55a8 Consistent usage of colon on export pages
All other export formats include colon in text fields description.
2013-04-25 14:33:58 +02:00
Michal Čihař
2fbb4cee0d Consistently include colon in strings to translate
In some languages this makes difference in translating, so it's better
to give translators full context.
2013-04-25 14:22:31 +02:00
Marc Delisle
303c0aaa5d Merge branch 'QA_4_0' 2013-04-24 14:42:13 -04:00
Marc Delisle
ac65210a28 Typo in input field name 2013-04-24 14:41:57 -04:00
Madhura Jayaratne
466a7645c7 PHP keywords must be lowercase 2013-04-12 21:45:02 +05:30
Michal Čihař
b3a317da78 bug #3519 [export] Prevent infinite recursion in PDF export. 2013-02-07 12:16:13 +01:00
Michal Čihař
22dfaaf622 bug #2951 [export] Correctly export decimal fields. 2013-02-07 11:49:43 +01:00
Dieter Adriaenssens
688642560d use 'self' when calling static methods 2013-01-26 00:20:57 +01:00