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
Michal Čihař
6d1bd82939
Factor out error message formatting
2011-10-24 17:42:07 +02:00
Michal Čihař
017ca0c22d
Coding style improvements
2011-10-24 17:37:30 +02:00
Michal Čihař
97f89e63c4
Coding style improvements
2011-10-24 17:34:52 +02:00
Michal Čihař
bea61e9f48
Coding style
2011-10-24 17:28:18 +02:00
Michal Čihař
2c1970b48b
Fix package
2011-10-24 17:25:16 +02:00
Michal Čihař
2518085d23
Wrap long line
2011-10-24 17:25:12 +02:00
Marc Delisle
cb19413253
Improve menu tab and page title
2011-10-24 09:50:39 -04:00
Michal Čihař
663958b564
Use same logic for printing SQL results as elsewhere
2011-10-24 14:17:02 +02:00
Michal Čihař
3dc06f4f70
Unify print button code and factor it out to function
2011-10-24 14:13:47 +02:00
Marc Delisle
a8a93c3e5a
3.4.7
2011-10-23 08:06:56 -04:00
Marc Delisle
a3132f6e91
3.4.8-dev
2011-10-19 16:58:10 -04:00
Marc Delisle
fd82f1d12c
3.4.7-rc1
2011-10-19 16:56:13 -04:00
Michal Čihař
88c5f90e53
Merge branch 'QA_3_4'
...
Conflicts:
libraries/core.lib.php
libraries/sanitizing.lib.php
2011-10-18 12:46:24 +02:00
Michal Čihař
8b9e7c1279
bug #3425184 [doc] Fix links to PHP documentation
2011-10-18 12:44:32 +02:00
Michal Čihař
246b37937b
PMA_linkURL can be used from fatal errors early in execution, where library is not yet loaded
2011-10-18 12:42:05 +02:00
Michal Čihař
75d1dce908
PMA_getPHPDocLink can be used from fatal errors early in execution, where gettext is not yet loaded
2011-10-18 12:41:42 +02:00
Michal Čihař
3535dcfec3
Merge remote-tracking branch 'origin/QA_3_4'
2011-10-18 11:53:40 +02:00
