Piotr Przybylski
651b357f8a
Whitespace cleanup
2011-02-15 17:38:08 +01:00
Marc Delisle
89552c74c4
Merge branch 'QA_3_3'
2011-01-12 08:05:40 -05:00
Marc Delisle
31cd4bdd6a
bug #3155842 [core] Edit relational page and page number
2011-01-12 08:04:57 -05:00
Marc Delisle
45eb47fe14
Merge branch 'QA_3_3'
2011-01-08 13:45:40 -05:00
Marc Delisle
8244589813
Bug #3153409 [core] 0 row(s) affected
2011-01-08 13:44:28 -05:00
Marc Delisle
d1bebc67f6
fix merge conflicts
2010-10-03 09:42:40 -04:00
Marc Delisle
1623c7e065
Browsing a table containing geometry columns
2010-10-03 09:20:32 -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
9c34a0eec9
Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches
2010-08-28 01:53:52 +05:30
Michal Čihař
5c63cbd231
Merge branch 'QA_3_3'
...
Conflicts:
Documentation.html
README
libraries/Config.class.php
translators.html
2010-08-23 17:10:04 +02:00
Michal Čihař
a24e418527
Avoid PHP error when false is passed to PMA_DBI_getError.
...
This can be caused by controllink set to false.
2010-08-23 17:02:15 +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ř
41145feb12
Merge branch 'MAINT_3_3_5' into QA_3_3
...
Conflicts:
ChangeLog
libraries/common.lib.php
2010-08-20 13:36:49 +02:00
Michal Čihař
59b3b4916b
Escape error message coming from MySQL to avoid XSS on bad parameters.
2010-08-20 11:35:42 +02:00
ninadsp
95a8521f11
Merge remote branch 'origin/master'
2010-08-10 00:55:22 +05:30
Marc Delisle
fd65dcdcd1
Merge branch 'QA_3_3'
2010-08-05 13:00:24 -04:00
Will Palmer
158517d764
bug [mysqli] non-global $cfg referenced where $GLOBAL['cfg'] expected
2010-08-05 12:19:14 -04:00
ninadsp
a2f78a6d38
Resolve merge conflicts for upstream merge
2010-07-29 19:17:25 +05:30
Michal Čihař
bcc372b5c5
Merge branch 'QA_3_3'
2010-07-26 15:51:48 +02:00
Michal Čihař
83d458aa05
Revert "bug #3031705 [core] Do not use CONCAT for DECIMAL fields."
...
This reverts commit ef500cd23f
.
We probably need to use CONCAT still, just the other side should be
converted to string as well.
2010-07-26 15:45:36 +02:00
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ř
60b2d5a3a4
Merge branch 'QA_3_3'
...
Conflicts:
Documentation.html
README
libraries/Config.class.php
translators.html
2010-07-20 14:39:46 +02:00
Michal Čihař
ef500cd23f
bug #3031705 [core] Do not use CONCAT for DECIMAL fields.
2010-07-20 14:37:53 +02:00
Michal Čihař
318dc4b650
Drop @version tag from docblocks.
2010-07-20 13:59:17 +02:00
Michal Čihař
c9aa65668c
Fix comment.
2010-07-20 11:42:38 +02: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
2182098af6
strings to gettext, second batch
2010-05-04 20:07:19 -04:00
Michal Čihař
9bb35300eb
Port can not be string.
2010-04-20 08:19:55 +02: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
4fda8872e6
avoid going back to login page on slave configuration
2009-12-24 12:18:31 +00:00
Marc Delisle
6afa59946a
bug #2890443 [mysqli] "No index used in query" exception is reported
2009-11-02 17:35:36 +00:00
Marc Delisle
9ae329e4ad
in Synchronize, the connection problems detection no longer worked
2009-10-16 00:32:42 +00:00
Michal Čihař
158380c18a
Coding style.
2009-08-25 13:42:21 +00:00
Tomas Srnka
e325226e57
*Fixed bug with different port than 3306
...
*Fixed support for other server than localhost
*Added support for sockets
*Fixed GUI bugs - strings (localization), table, fieldset...
*new PNG transparent icon.16x16
2009-08-24 18:10:45 +00:00
Marc Delisle
15441ded5d
do not try to display a tab that was not built
2009-08-22 11:22:50 +00:00
Michal Čihař
49036e6003
rfe #1694104 Allow logging of user status with Apache.
2009-03-03 16:20:41 +00:00
Michal Čihař
9561f56875
Fix some phpdoc errors.
2008-11-24 09:55:30 +00:00
Michal Čihař
610cc27c57
Some more phpdoc fixes (adding packages, ignoring some symbols,...).
2008-11-24 09:31:30 +00:00
Marc Delisle
e6db29ed88
headwords for sorted column
2008-07-26 15:18:59 +00:00
Marc Delisle
14e5a97890
remove one wrapper for data fetch
2008-07-25 15:57:23 +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
ba6a58c1c0
bug #1964643 wrong content displayed (dev version)
2008-05-16 13:30:29 +00:00
Sebastian Mendel
b294b2d647
do not display class twice in query trace
2008-05-09 10:42:13 +00:00
Sebastian Mendel
91007aa3d6
include trace of executed queries
2008-05-08 06:07:00 +00:00
Marc Delisle
c8cfea6fd9
bug #1910621 [display] part 1: do not display a TEXT utf8_bin as BLOB (fixed for mysqli extension only)
2008-04-28 16:47:31 +00:00
Marc Delisle
cce08fc068
[dbi] Incorrect interpretation for some mysqli field flags
2008-04-27 15:45:50 +00:00
Marc Delisle
e8c15e7e85
bug 1926357, last part of the fix
2008-04-06 12:52:53 +00:00