Commit Graph

6293 Commits

Author SHA1 Message Date
Yuichiro
ad5ae4ceb0 Add gettext 2011-12-12 14:03:46 +01:00
Rouslan Placella
628a0c6469 Speed up PMA_getImage() 2011-12-11 23:01:03 +00:00
Madhura Jayaratne
84b8281c1a Coding style improvements 2011-12-11 14:58:35 +05:30
Madhura Jayaratne
173e5926a0 More coding style improvements 2011-12-08 00:01:02 +05:30
Madhura Jayaratne
35b18e57a2 Coding style improvements - Multiline assignments 2011-12-07 23:28:50 +05:30
Madhura Jayaratne
a7c00f719f Coding style improvements - Control structures 2011-12-07 22:45:13 +05:30
Madhura Jayaratne
7ac39c04c2 Merge branch 'QA_3_4'
Conflicts:
	libraries/Table.class.php
2011-12-07 08:53:13 +05:30
Madhura Jayaratne
6e0a10494f bug #3452506 [edit] Unable to move tables with triggers 2011-12-07 08:33:28 +05:30
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
63ffeebcf8 Merge branch 'QA_3_4' 2011-12-05 11:04:28 -05:00
Marc Delisle
d68c8bb8ed bug #3398788 [session] No feedback when result is empty (signon auth_type) 2011-12-05 11:04:16 -05:00
Dieter Adriaenssens
04a26c3cfd typo 2011-11-30 16:48:57 +01:00
Dieter Adriaenssens
e82584aaee coding style : use lower case constant false 2011-11-30 16:36:37 +01:00
Michal Čihař
e448774704 Improve description of MaxTableUiprefs 2011-11-30 14:17:39 +01:00
Dieter Adriaenssens
b4b9b34ec5 clarify function descriptions 2011-11-29 21:40:42 +01:00
Marc Delisle
3dce618b7b Merge branch 'QA_3_4' 2011-11-26 06:54:49 -05:00
Marc Delisle
5e61730157 bug #3438420 [core] Magic quotes removed in PHP 5.4 2011-11-26 06:54:40 -05:00
Marc Delisle
277b6a96fa Merge branch 'QA_3_4' 2011-11-26 06:17:16 -05:00
Marc Delisle
dddcddbf38 bug #3442004 [interface] DB suggestion not correct for user with underscore 2011-11-26 06:17:08 -05:00
Madhura Jayaratne
bbc44c410c Merge branch 'QA_3_4'
Conflicts:
	ChangeLog
	Documentation.html
	README
	libraries/Config.class.php
	libraries/display_tbl.lib.php
2011-11-25 18:25:13 +05:30
Madhura Jayaratne
9c278d020c bug #3442028 [edit] Inline editing enum fields with null shows no dropdown 2011-11-25 18:12:53 +05:30
Marc Delisle
c43babad7c 3.4.9-dev 2011-11-24 17:05:44 -05:00
Marc Delisle
96dd071a5f Fix merge conflicts 2011-11-24 16:54:25 -05:00
Dieter Adriaenssens
f62c4a1809 coding style : control structures 2011-11-24 15:32:30 +01:00
Dieter Adriaenssens
90bd76540c coding style : correct use of includeonce() 2011-11-24 14:47:45 +01:00
Dieter Adriaenssens
077c10020e [security] Self-XSS on invalid query (table overview), see PMASA-2011-18 2011-11-22 21:59:19 +01:00
Marc Delisle
b289fe0824 [security] Self-XSS on database names (Synchronize), see PMASA-2011-18 2011-11-21 17:53:10 -05:00
Marc Delisle
29e658a1f7 Merge branch 'QA_3_4' 2011-11-21 12:42:07 -05:00
Marc Delisle
e2b6af5a99 Avoid showing the password in phpinfo()'s output 2011-11-21 12:41:13 -05:00
Madhura Jayaratne
8fa909da78 Merge branch 'QA_3_4'
Conflicts:
	libraries/server_synchronize.lib.php
2011-11-20 22:33:02 +05:30
Madhura Jayaratne
81f6766f96 bug #3439292 [core] Fail to synchronize column with name of keyword 2011-11-20 22:18:55 +05:30
Madhura Jayaratne
b5c45d0d35 White space cleanup 2011-11-20 21:52:22 +05:30
Madhura Jayaratne
7d2718801e Coding style improvements 2011-11-20 18:30:56 +05:30
Rouslan Placella
46fbe36b6b Wrapped the "Indexes" and "Information" sections from tbl_structure.php in fieldsets 2011-11-19 14:43:52 +00:00
Rouslan Placella
f8e6631dfd "No index" or "duplicate indexes" on a column are not errors 2011-11-19 14:43:52 +00: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
Marc Delisle
584fa4d2c8 Merge branch 'QA_3_4' 2011-11-15 12:48:29 -05:00
Remi COLLET
ac430ea21d patch #3437354 [core] Notice: Array to string conversion in PHP 5.4 2011-11-15 12:47:28 -05:00
Marc Delisle
3142c0caf1 See bug #3418579. In commit f2fe4db5f1
this global definition was removed, causing the bug.
2011-11-12 11:00:37 -05:00
Marc Delisle
979209c4cc Code cleanup 2011-11-12 10:18:35 -05:00
Thomas Hergenhahn
7cd6894257 patch #3432835 [interface] Add useful intermediate pages to pageselector 2011-11-12 10:15:12 -05:00
Michal Čihař
c672292268 rfe #1632106 [interface] Improved error handling 2011-11-10 15:44:00 +01:00
Marc Delisle
839c0d493a Merge branch 'QA_3_4' 2011-11-10 09:00:13 -05:00
Marc Delisle
edea25b07b Merge branch 'MAINT_3_4_7' into QA_3_4 2011-11-10 08:56:39 -05:00
Michal Čihař
34d99de000 Disable XML loading plugins on old PHP
When libxml_disable_entity_loader is not available, we can not guarantee
safe handling of XML data.
2011-11-07 15:18:10 +01:00
Michal Čihař
f496bc9f1f Better error message 2011-11-07 15:16:47 +01:00
Michal Čihař
a5e206fbd2 Disable loading of external XML entities when loading XML
Fixes CVE-2011-4107
2011-11-07 14:47:54 +01:00
Rouslan Placella
a00fc340f9 Merge branch 'menubar' 2011-11-05 14:36:08 +00:00