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
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
Rouslan Placella
75a7e6f50b
Generate the "floating_menubar" element in PHP to avoid firing it's JS handler in the navi frame
2011-11-05 14:05:13 +00:00
Marc Delisle
02d5799893
Fix merge conflicts
2011-11-05 10:00:50 -04:00
Robert Scheck
8170d03d3c
Patch by Robert Scheck <robert@fedoraproject.org>
...
for phpMyAdmin >= 3.4.7, which makes the php-gettext
library that is used configurable, which is helpful or even required for
some vendors or downstreams. The default is the internal library to keep
backward compatibility. More details can be found at SourceForge:
https://sourceforge.net/tracker/?func=detail&aid=3433770&group_id=23067&atid=377410
2011-11-05 09:57:28 -04:00
Rouslan Placella
15b25f93e9
Fixed incorrect display of breadcrumbs in RTL mode
2011-11-04 14:43:25 +00:00
Marc Delisle
7ea269797d
Typo
2011-11-02 15:29:12 -04:00
Marc Delisle
8d3bb76d26
Typo
2011-11-02 15:25:58 -04:00
Marc Delisle
4e2533f506
Typo
2011-11-02 15:17:48 -04:00
Marc Delisle
4c123bc560
Change to a similar message
2011-11-02 15:03:30 -04:00
Marc Delisle
0b16d690d2
Fix merge conflicts
2011-11-02 12:41:13 -04:00
Marc Delisle
d22fae4201
bug #3428065 [parser] TRUE not recognized by parser
2011-11-02 12:39:43 -04:00
Marc Delisle
00576dc1bb
Fix merge conflicts
2011-10-31 12:36:45 -04:00
Marc Delisle
a691fce64c
bug #3428627 [import] ODS import ignores memory limits
2011-10-31 12:35:02 -04:00
Marc Delisle
6f7ca79218
patch #3410688 [interface] Improving field size for character columns
2011-10-30 05:35:00 -04:00
Marc Delisle
c380102816
Setup for controlhost
2011-10-29 08:24:11 -04:00
Marc Delisle
46ce1d765e
Default values for controlhost
2011-10-29 08:07:44 -04:00
Marc Delisle
991cbfcc97
Provide for the case when controlhost is not defined
2011-10-29 07:58:40 -04:00
Marco Gergele
af8a61f73c
patch #3428376 [pmadb] pmadb on a different MySQL server
2011-10-29 07:55:39 -04:00
Marc Delisle
21ebf72d9e
Missing ending for documentation anchor
2011-10-27 15:27:58 -04:00
Rouslan Placella
1fd7a96135
Merge branch 'enum'
...
Conflicts:
enum_editor.php
2011-10-26 16:29:10 +01:00
Rouslan Placella
f6d2da769b
Integrated the ENUM/SET editor with the Routines editor
2011-10-26 16:26:15 +01:00
Rouslan Placella
93686fd47a
Improved ENUM/SET editor
2011-10-26 16:01:24 +01:00
Michal Čihař
999e85b505
Coding style, documentation
2011-10-25 11:17:56 +02:00
Michal Čihař
b7c1742809
Coding style improvements, mostly in docblocks
2011-10-25 11:12:37 +02: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
Michal Čihař
c673bf42c5
Make messages look like sentences, avoid mentioning server type
2011-10-24 17:47:12 +02:00
Michal Čihař
833cfec332
Avoid message concatenation in this case
2011-10-24 17:43:17 +02:00
