Marc Delisle
200dce3a25
Messages not under gettext
2010-12-28 15:34:19 -05:00
Marc Delisle
5b4938bae5
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2010-12-27 08:30:15 -05:00
Marc Delisle
ab393d3f82
Bug #3141327 (Foreign key input options)
2010-12-27 08:29:31 -05:00
Michal Čihař
8a8986d9da
Update php-gettext to 1.0.11.
...
There are two changes:
- fix possible wrong result of npgettext
- cosmetical renaming of some variables
2010-12-27 14:20:35 +01:00
Marc Delisle
a1ad4b295c
Message was not under gettext
2010-12-27 07:14:10 -05:00
Marc Delisle
7d9313245b
rfe #3141330 [relation] When displaying results, show a link to the foreign table even when phpMyAdmin configuration storage is not active
2010-12-25 15:41:37 -05:00
Marc Delisle
ef8687b5de
Missing question mark
2010-12-23 13:07:32 -05:00
Marc Delisle
fc37859b42
RFE 3141334: Reload icon
...
New icon by Michael Keck
and move it with other navi frame icons
2010-12-23 13:02:53 -05:00
Dieter Adriaenssens
eee76d640b
Merge branch 'QA_3_3'
2010-12-22 16:01:02 +01:00
Aamir Khan
1ceccbd50c
fix typo
2010-12-22 15:59:44 +01:00
Marc Delisle
a4c225ebd4
Reduce the name of this class
2010-12-20 12:59:00 -05:00
Marc Delisle
2dd20b23d8
Vertical column highlighing did not work in all cases
2010-12-20 12:51:33 -05:00
Marc Delisle
45ec0da621
Problems with latest fix and SET columns
2010-12-17 09:31:42 -05:00
Marc Delisle
4a71a1e5f1
bug #3138572 "Continue insertion" problems
2010-12-16 11:37:24 -05:00
Marc Delisle
55c2dcb664
bug #3137351 User preferences and hide_db
2010-12-14 12:30:40 -05:00
Dieter Adriaenssens
5d915f1ff6
Merge branch 'QA_3_3'
...
Conflicts:
libraries/sqlparser.lib.php
2010-12-13 21:36:51 +01:00
Dieter Adriaenssens
8afdcbe2b8
bug #3127904 , Close all opened round brackets indents
2010-12-13 21:18:33 +01:00
Marc Delisle
b36fb9e8bf
Fix merge conflicts
2010-12-11 08:19:42 -05:00
Marc Delisle
b6f717a602
bug #3125606 [parser] Query for table "level" causes strange display
2010-12-11 08:03:50 -05:00
Marc Delisle
e66884f576
3.4.0-beta1
2010-12-11 06:33:56 -05:00
Adnan
f88189366d
fixed: bugID = 3112614
2010-12-09 16:53:38 +05:00
Marc Delisle
013f57b0ae
English improvements
2010-12-07 09:46:36 -05:00
Michal Čihař
aa6fec0532
Remove error.php
...
Redirecting to other script introduces possibility of inject custom
messages to it. Though there is no clear security issue in this, it
might confuse users and mistake them to go to external site as it allows
to include links.
2010-12-07 12:24:21 +01:00
Marc Delisle
ce9b1f0b96
typo; improve message
2010-12-07 05:59:00 -05:00
Marc Delisle
9d9507c42b
remove author names
2010-12-06 12:50:15 -05:00
Marc Delisle
f30125fcd3
Continue insertion did not work if the form had special controls like file upload from client, file upload from server or BLOB streaming upload
2010-12-06 12:49:08 -05:00
Marc Delisle
e9e7c3b805
clarify comments and variable names
2010-12-05 07:33:39 -05:00
Marc Delisle
2d68ee8974
clarify variable name
2010-12-05 07:14:52 -05:00
Marc Delisle
621d851c5f
zend.ze1_compatibility_mode removed in PHP 5.3
2010-12-04 07:02:06 -05:00
Marc Delisle
79f320e951
remove author names
2010-12-04 06:41:10 -05:00
Michal Čihař
89f03ef81b
bug #3123433 [interface] Avoid double escaping of MySQL errors.
...
The PMA_DBI_getError function already does escaping, so there is no need
to escape that string again on displaying.
2010-12-02 17:14:59 +01:00
Michal Čihař
219f5a4fb9
Whitespace cleanup.
2010-12-02 17:13:47 +01:00
Michal Čihař
a480379bae
Remove not used variable.
2010-12-02 17:05:57 +01:00
Herman van Rink
8017a61253
patch #3055886 [config] update, changed boolean to integer for more precise control
2010-12-02 16:31:49 +01:00
Marc Delisle
a93399b8a4
the goal of master is currently to stabilize 3.4.0
2010-12-02 07:37:12 -05:00
Marc Delisle
0d6cc8ca55
bug #3119884 , path not found (in case the kit is English-only)
2010-11-28 07:43:01 -05:00
Marc Delisle
586279a0af
missing title
2010-11-26 12:48:03 -05:00
Herman van Rink
6d3b66059a
bug #3115519 : fixed XSS on search
2010-11-26 09:12:01 -05:00
Herman van Rink
f805097b86
bug #3115519 : fixed XSS on search
2010-11-26 09:06:09 -05:00
Marc Delisle
9c8514fb97
3.5.0-dev
2010-11-22 13:23:08 -05:00
Marc Delisle
b2d7a78012
rfe #3111455 [interface] Column highlighting and marking in table view
2010-11-18 17:11:04 -05:00
Marc Delisle
60890fe042
use standard term for this
2010-11-18 06:20:38 -05:00
Dieter Adriaenssens
57c5abf579
Merge branch 'QA_3_3'
2010-11-14 18:28:10 +01:00
Marc Delisle
e1f019b2dc
Clarify the option about INSERT IGNORE
2010-11-10 05:50:59 -05:00
Marc Delisle
5f4604c9bb
bug #3103853 [js] Double quotes were not escaped in generated js; I think this only applies to 3.3.x
2010-11-06 07:51:06 -04:00
Marc Delisle
9f4dc04691
no need to have a separate file for this
2010-11-05 06:30:21 -04:00
Marc Delisle
6ffa3e7f9c
The second word should not start with uppercase
2010-11-03 07:57:52 -04:00
Michal Čihař
0430c92b76
Better error message.
2010-11-01 14:46:36 +01:00
Michal Čihař
101fd96200
Fix error handling when no tables are found.
2010-11-01 14:41:40 +01:00
Michal Čihař
1947baa1ac
Merge branch 'QA_3_3'
2010-11-01 10:03:27 +01:00
