Commit Graph

416 Commits

Author SHA1 Message Date
Michal Čihař
e56949f160 Use package name PhpMyAdmin
Needed to match phpdoc rules as package name must begin with upper case.
2011-10-25 10:13:17 +02:00
Madhura Jayaratne
299da6d047 More style errors fixed 2011-09-23 11:36:14 +05:30
Madhura Jayaratne
13adb5adf7 Use lower case for true, false and null 2011-09-23 11:11:41 +05:30
Madhura Jayaratne
9bcb83af03 File is being conditionally included; use "include" instead 2011-09-23 10:56:30 +05:30
Marc Delisle
47463352c4 Not field but column 2011-09-13 12:28:29 -04:00
Piotr Przybylski
bd3b7d28d4 Whitespace cleanup 2011-08-25 13:16:06 +02:00
Piotr Przybylski
f678a45cd2 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/database_interface.lib.php
2011-08-24 21:40:52 +02:00
Piotr Przybylski
e13aab1087 Condition excluding XML output from server export was broken 2011-08-24 21:34:08 +02:00
Piotr Przybylski
5ab5afd506 Use PMA_Table::isView() instead of PMA_isView() 2011-08-24 21:16:04 +02:00
Piotr Przybylski
3e0af18434 Fix indentation broken by past merges 2011-08-24 13:24:21 +02:00
Piotr Przybylski
57bea0630a Use PMA_DBI_get_table_indexes_sql() only when really needed, in all other cases use PMA_DBI_get_table_indexes() 2011-08-23 22:14:15 +02:00
Piotr Przybylski
f578d0dadc Merge remote-tracking branch 'origin/master' into drizzle 2011-08-16 19:58:16 +02:00
Piotr Przybylski
5cd731b232 Make this usage of $sql_backquotes less cryptic 2011-08-16 19:33:09 +02:00
Piotr Przybylski
a7c0c55c7f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	js/server_status.js
	libraries/common.lib.php
	tbl_printview.php
	tbl_select.php
	tbl_structure.php
2011-08-12 22:02:40 +02:00
Dieter Adriaenssens
45aac8dbf4 coding style 2011-08-11 21:37:36 +02:00
Dieter Adriaenssens
e4bb7fdcdd fix description 2011-08-10 21:12:08 +02:00
Dieter Adriaenssens
fd383934af Merge branch 'QA_3_4' 2011-08-10 20:58:45 +02:00
Dieter Adriaenssens
556636457a Remove library PHPExcel, due to license issues
Remove native Excel exportand import modules (xls and xlsx formats)
2011-08-10 20:53:51 +02:00
Michal Čihař
0d7d007995 Unify code for PDF footer 2011-08-10 14:29:22 +02:00
Michal Čihař
17cbe29592 Start base class for all PDF output 2011-08-10 14:24:22 +02:00
Piotr Przybylski
7f1fa1bab0 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	js/server_status.js
	libraries/database_interface.lib.php
	libraries/mysql_charsets.lib.php
2011-08-05 17:17:47 +02:00
Michal Čihař
81aadb883f Better error message 2011-08-05 10:49:49 +02:00
Michal Čihař
21b5b87c92 Escape only parts which need it, not translated string 2011-08-05 10:32:34 +02:00
Michal Čihař
dd2dc3a5a7 Shortcut when export can not work 2011-08-05 08:19:18 +02:00
Michal Čihař
872a2e6079 Remove unused variable 2011-08-05 08:17:08 +02:00
Michal Čihař
d7e0002af6 Fix variable name 2011-08-05 08:17:00 +02:00
Piotr Przybylski
66665f326a Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	db_qbe.php
	js/server_status.js
	libraries/export/xml.php
	libraries/schema/Pdf_Relation_Schema.class.php
	tbl_printview.php
	tbl_structure.php
2011-08-04 20:19:43 +02:00
Michal Čihař
4c62a5fed6 Another typo 2011-08-04 17:41:30 +02:00
Michal Čihař
83d3c0d2fd Move attribute processing to PMA_extractFieldSpec 2011-08-04 17:08:49 +02:00
Michal Čihař
f646fc8a55 Use PMA_extractFieldSpec instead of own code 2011-08-04 17:04:12 +02:00
Michal Čihař
822a863690 Reintroduce mistakenly removed code 2011-08-04 16:47:47 +02:00
Michal Čihař
b7b7fe3920 Properly handle special cases 2011-08-04 16:46:45 +02:00
Michal Čihař
d29cf3227d Use PMA_extractFieldSpec instead of own code in export plugins 2011-08-04 16:41:30 +02:00
Michal Čihař
5e2a467f6f $GLOBALS[use_backquotes] is apparently not set anywhere 2011-08-04 15:30:02 +02:00
Michal Čihař
1045c8f085 Wrap export options 2011-08-04 15:28:02 +02:00
Piotr Przybylski
ce7e6feaf5 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/export/htmlword.php
	libraries/export/latex.php
	libraries/export/odt.php
	libraries/export/sql.php
	libraries/export/texytext.php
	libraries/export/xml.php
2011-08-03 00:25:43 +02:00
Michal Čihař
3769b849aa Forgot to reindent some files 2011-08-02 15:53:19 +02:00
Michal Čihař
7e7be00f84 Forgot to reindent this one 2011-08-02 15:50:44 +02:00
Michal Čihař
8cb1f3a1cc Fix indentation 2011-08-02 15:25:27 +02:00
Piotr Przybylski
3586bb992f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	db_structure.php
	libraries/database_interface.lib.php
	libraries/server_synchronize.lib.php
	server_status.php
	sql.php
2011-07-22 11:07:04 +02:00
Michal Čihař
9405dbb82a Fix spacing after @param 2011-07-22 09:21:55 +02:00
Michal Čihař
25bda8e991 Fix spacing on opening code block 2011-07-22 09:18:02 +02:00
Piotr Przybylski
a28beb9c1f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/server_synchronize.lib.php
	server_status.php
2011-07-21 15:25:52 +02:00
Michal Čihař
dd641ef164 Wrap some long lines 2011-07-21 14:49:25 +02:00
Michal Čihař
7986ea8f35 Free result once we do not need it 2011-07-21 14:36:01 +02:00
Michal Čihař
dafefcd275 More replacement of double quotes 2011-07-21 14:35:43 +02:00
Michal Čihař
008b96aaec Coding style
Wrap ling lines, add missing {} around for and if.
2011-07-21 14:31:50 +02:00
Michal Čihař
c03c7bbc69 Better formatting for code 2011-07-21 14:25:31 +02:00
Michal Čihař
7f629c66ff Remove method used only in single place as a function 2011-07-21 14:22:01 +02:00
Michal Čihař
b349356a83 Avoid storing table data when we don't need it 2011-07-21 14:20:11 +02:00