Commit Graph

64 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
Dieter Adriaenssens
0ade69e84d use include() instead of require() when including file conditionally 2011-09-06 17:57:48 +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
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ř
304273961e Avoid composite messages 2011-08-05 10:52:03 +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ř
87c970b0f8 No need to load full columns here (need names only anyway) 2011-08-04 17:00:32 +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ř
d55306252b Replace tabs with spaces, cleanup identation 2011-07-22 10:15:08 +02:00
Piotr Przybylski
96c5c6dbc6 Add $column parameter to PMA_DBI_get_columns 2011-06-28 23:11:58 +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
1f10c9b961 Fix incorrect array key (non_unique -> Non_unique) in qbe 2011-06-18 00:04:35 +02:00
Marc Delisle
ae0af9e5c6 Remove author name 2011-05-28 08:29:38 -04:00
Piotr Przybylski
fe53e42d1d Remove deprecated function PMA_DBI_get_fields 2011-05-20 23:12:58 +02:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Marc Delisle
06d6b87e5b This message was never displayed 2011-05-05 06:31:15 -04:00
Marc Delisle
69646655d3 This message is not needed (and does not work anyway) 2011-05-05 06:21:47 -04:00
Marc Delisle
b2b1953db1 Start to replace warning level with error level 2011-05-03 18:52:37 -04:00
Marc Delisle
b0fb491c91 Use standard link 2011-03-07 17:34:31 -05:00
Michal Čihař
8252f8a4ca Offer switch to designer only if it is available. 2011-01-27 09:58:39 +01:00
Marc Delisle
79f320e951 remove author names 2010-12-04 06:41:10 -05:00
Marc Delisle
18f6882f89 do not show visual builder anchor if js is not enabled 2010-11-20 07:43:06 -05:00
Marc Delisle
13fe8b98e2 these should be translatable 2010-11-20 07:33:15 -05:00
Marc Delisle
eb83a062bd Merge remote branch 'ankitg/master' 2010-11-19 12:17:33 -05:00
Marc Delisle
98a5ba7317 misleading variable name 2010-09-04 07:01:30 -04: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
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Michal Čihař
3910ce6121 Remove explicit inclusion of Table.class.php as it is included in common.inc anyway. 2010-07-26 16:35:52 +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
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
ankitg
58a2724c31 link in query tab 2010-06-09 22:49:29 +05:30
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
Marc Delisle
b4598190d0 style is already in theme CSS 2010-05-23 08:44:58 -04: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
7925c03896 gettext conversion 2010-05-11 13:05:43 -04:00
Marc Delisle
2586524b03 gettext conversion; clarify code 2010-05-06 07:48:38 -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ř
4692e81e24 Correct type. 2010-04-29 14:35:42 +02:00
Marc Delisle
a63410cfbf Use input field instead of textarea for additional criteria 2010-04-10 09:41:40 -04:00
Marc Delisle
1419fcf3c2 remove deprecated parameter of PMA_Table::countRecords() 2009-10-23 10:02:09 +00:00
Marc Delisle
bd3595f7cb patch #2498350 [cleanup] XHTML cleanup 2009-01-13 22:55:44 +00:00
Michal Čihař
ebeb0c319f Adding @package, first part. 2008-11-24 10:32:56 +00:00
Marc Delisle
994555d79f more room for query in multi-table query generator 2008-08-21 16:32:39 +00:00
Marc Delisle
480cd6126a adding/removing criteria columns did not work 2008-08-21 16:25:23 +00:00
Marc Delisle
4670ada84b JOIN generation did not work in 3.0 for multi-table queries 2008-08-21 12:42:48 +00:00