Commit Graph

52 Commits

Author SHA1 Message Date
Marc Delisle
6a786a859e Merge branch 'QA_3_4' 2011-12-05 14:14:26 -05:00
Marc Delisle
b02f4eec07 bug #3384035 [display] Problems regarding ShowTooltipAliasTB 2011-12-05 14:14:13 -05:00
Marc Delisle
c2a8246bc8 Merge branch 'QA_3_4' 2011-11-19 07:03:12 -05:00
Marc Delisle
8219f7c544 When ShowTooltipAliasTB is true, VIEW is wrongly shown as the view name in main panel db Structure page 2011-11-19 07:02:54 -05:00
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
9bcb83af03 File is being conditionally included; use "include" instead 2011-09-23 10:56:30 +05:30
Marc Delisle
f1fbb2bb8c Merge branch 'QA_3_4' 2011-09-07 07:37:23 -04:00
Isaac Bennetch
0bdbde8c90 Patch #3404173 InnoDB comment display with tooltips/aliases 2011-09-07 07:36:00 -04:00
Piotr Przybylski
8cd8760256 Create PMA_is_system_schema() function which checks whether current database server treats it as a system schema 2011-08-23 22:48:14 +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ř
219ec73d69 Spacing around if 2011-07-22 09:10:37 +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ř
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +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ř
c6ec73963f Use PMA_sqlAddSlashes for database queries instead of addslashes.
Should fix bug#3323066
2011-06-21 17:41:47 +02:00
Piotr Przybylski
80485250f0 Make sure I_S and D_D from Drizzle get the same treatment as MySQL I_S 2011-05-09 19:46:30 +02:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -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
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Michal Čihař
862e3ca2a7 Merge branch 'QA_3_3'
Conflicts:
	libraries/core.lib.php
	server_databases.php
	server_privileges.php
2010-08-20 13:40:37 +02:00
Michal Čihař
48e9096600 Properly check validity of sort parameter. 2010-08-18 12:31:54 +02:00
ninadsp
0b2b21712e Added documentation to PHP files 2010-08-15 01:50:47 +05:30
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
3e57a8eca9 No @uses __('Something'). 2010-07-20 15:06:34 +02:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
ninadsp
505884174b Removed inline call to confirmLink() for 'Delete Tracking action'. 2010-07-11 03:14:02 +05:30
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
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
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
38fea0cc9e in SESSION, userconf renamed to tmp_user_values to avoid confusion with the future db-based user preferences 2009-06-20 16:36:58 +00:00
Marc Delisle
06d6fc75ae patch #2356575 part 5 2008-12-16 17:13:12 +00:00
Marc Delisle
ec4549f994 patch #2356575 [display] Sortable database columns 2008-12-15 17:27:43 +00:00
Michal Čihař
ebeb0c319f Adding @package, first part. 2008-11-24 10:32:56 +00:00
Marc Delisle
c4c683bb64 bug #2113848 [navi] Page number after database switching 2008-09-21 13:02:41 +00:00
Marc Delisle
afbb2a9dc2 protection against XSS when register_globals is on and .htaccess has no effect 2008-06-21 15:01:27 +00:00
Marc Delisle
d85d7f82ef bug #1977046, no table pagination; revert of revision 11247 2008-05-29 16:41:20 +00:00
Sebastian Mendel
c53238a89e no need to fetch tables twice 2008-05-08 06:02:08 +00:00
Marc Delisle
618cb07b26 should go to ['userconf'] 2008-01-05 15:12:30 +00:00
Sebastian Mendel
1f6d6d419b removed MySQL < 5 code 2007-10-02 09:11:40 +00:00
Marc Delisle
3623ccbc73 make previous modif work in all cases 2007-08-01 19:16:05 +00:00
Marc Delisle
18df1b0fd2 do not obey MaxTableList on the db export page 2007-08-01 16:44:32 +00:00
Marc Delisle
09b1ea0646 Navigator for the table list in the content panel 2007-06-25 14:00:35 +00:00
Sebastian Mendel
042f0c11f3 source-documentation, -format, -cleanup 2007-03-21 09:35:42 +00:00
Sebastian Mendel
d0facc3d4f splitted common.lib.php into common.inc.php, core.lib.php and common.lib.php 2007-03-20 14:16:18 +00:00
Sebastian Mendel
374abd5173 fixed/added page level docblock 2007-03-20 10:32:13 +00:00
Sebastian Mendel
817e790762 synced/fixed vim line 2007-03-19 17:55:39 +00:00