gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,918 Commits 12 Branches 481 Tags 2.4 GiB
QA_4_7
Commit Graph

341 Commits

Author SHA1 Message Date
Michal Čihař
d0ab548f76 Fixed inline editing of hex values 
Fixes #13387

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-17 16:56:43 +02:00
Michal Čihař
6a3d51e084 Make hex inline editor accept 0x at the begining 
Issue #13387

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-17 16:52:49 +02:00
Isaac Bennetch
e1276e8eb4 Fix merge conflicts removing dead code 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-17 14:13:07 -05:00
Isaac Bennetch
f1375a26a3 Remove dead code related to 4a2695c 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-17 14:10:24 -05:00
Isaac Bennetch
9f2b39258a Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-17 11:06:52 -05:00
Shreyas Sinha
4a2695cf5b Row coloring issue and incorrect table code 
Fixes issue #12831

Signed-off-by: Shreyas Sinha <shreyas.sinha14@gmail.com>
 2017-01-17 10:51:47 -05:00
Michal Čihař
308c9d7951 Simplify Response object handling 
- always use use and short name
- avoid calling getInstance() several times in one script

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 18:17:59 +01:00
Patric Gustafsson
1bd5fe709d Merge remote-tracking branch 'upstream/master' 2016-11-15 18:08:24 +02:00
Michal Čihař
dad93483c1 Merge branch 'QA_4_6' 2016-11-10 11:08:36 +01:00
Michal Čihař
c9348b682e Merge remote-tracking branch 'origin/pull/12564' into QA_4_6 2016-11-10 10:59:33 +01:00
Michal Čihař
fb279cbd22 Merge branch 'QA_4_6' 2016-11-10 10:56:46 +01:00
Roger Walt
32a381d0a5 Fixes #12322, no default function selected for foreignkey fields 
Signed-off-by: Roger Walt <roger.walt@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-10 10:52:51 +01:00
Deven Bansod
f14cffdbe7 Properly escape strings in MySQL statement values 
Use *_real_escape string functions provided by connectors to escape strings while exporting

Fix #12453

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	libraries/server_privileges.lib.php
 2016-10-29 10:45:12 +05:30
Deven Bansod
02eeb21df8 Add missing Doc comment 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-26 21:51:22 +05:30
Michal Čihař
61d8dc4791 Merge branch 'QA_4_6' 2016-09-19 10:47:31 +02:00
Michal Čihař
3546bed47e Avoid using mb_strlen for checking whether string is empty 
Using strlen produces same results here, just way faster.

Fixes #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 10:29:21 +02:00
Deven Bansod
a52597f048 Include explaning statements near related code 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:56:15 +05:30
Deven Bansod
023ced3552 Don't use PMA_DROP_IMPORT on Table insert if it has Blob field 
If we force PMA_DROP_IMPORT on all pages, users can't use Chrome's drag-drop-files feature
on Table Insert page with blob field

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:55:46 +05:30
Patric Gustafsson
0bae7f99ed Merge remote-tracking branch 'upstream/master' 2016-08-19 13:31:53 +03:00
Michal Čihař
d3222bd925 Merge branch 'QA_4_6' 2016-08-17 11:22:07 +02:00
Patric Gustafsson
038242d6f1 Remove odd CSS class logic from PHP code 
Odd class is no longer needed as it's now done with pure CSS.

Signed-off-by: Patric Gustafsson <patricjgustafsson@outlook.com>
 2016-08-16 15:32:58 +03:00
Pavel Rochnyack
c660c627f0 When editing table records, display readonly inputs for fields without write access . 
Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-08-14 19:51:51 +01:00
Pavel Rochnyack
c274f193a1 Revert "fixed checking of user rights to make it look for database privileges" 
This reverts commit df137f2410.

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-08-14 18:14:34 +01:00
Michal Čihař
a7cd193554 Make it clear whether addMessages expects string or Message object 
With this, it's way easier to anaylize code for potential problems with
escaping.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:56:41 +02:00
Isaac Bennetch
e6db8e18ee Fix some CodeSniffer warnings and errors 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-12 23:12:23 -04:00
sfobiwahn
df137f2410 fixed checking of user rights to make it look for database privileges 
Signed-off-by: Florian Steenblock <florian.steenblock@gmail.com>
 2016-05-26 17:10:57 +02:00
Madhura Jayaratne
6b84c576c7 Merge branch 'QA_4_6' 
Conflicts:
	ChangeLog
	README
	doc/conf.py
	libraries/Config.php
 2016-03-24 17:54:22 +11:00
Madhura Jayaratne
7a444c2f17 Fix #12120 PMA_Util not found in insert_edit.lib.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-24 17:47:47 +11:00
Durgesh
6650f7b07d Refactor text sanitization and javascript escaping, Issue #11989, #11988 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:45:19 +05:30
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:36:41 +05:30
Madhura Jayaratne
f1dbd56798 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 19:43:25 +11:00
Madhura Jayaratne
04181fb2b9 Fix #11911 Inserts via tbl_change.php in VARBINARY columns does not allow using HEX() and MD5() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-12 19:32:52 +11:00
Madhura Jayaratne
59342451ab Fix #11909 Can't insert row into table that contains generated column 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>

Conflicts:
	ChangeLog
 2016-02-11 21:11:16 +11:00
Madhura Jayaratne
cab738cbed Fix #11909 Can't insert row into table that contains generated column 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-11 21:02:33 +11:00
Michal Čihař
4a3f055527 Free result only if it exists 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 09:12:19 +01:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls 
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 16:35:28 +01:00
Hugues Peccatte
eda2816c70 Replace font tags by span. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:04:12 +01:00
Hugues Peccatte
08cdf6f2fd Merge branch 'master' into psr1_master 2015-11-08 16:16:05 +01:00
Hugues Peccatte
c3e1c981c0 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 16:05:25 +01:00
Hugues Peccatte
f9d582bd09 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 15:58:48 +01:00
Hugues Peccatte
dffc8c34e9 Remove logic code in declaration files. 
Move declaration out of logic file.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-27 18:56:39 +01:00
Michal Čihař
1169c0ef9e Be a bit more consistent in using full stop 
Move full stop to end of sentence or add it to sentences where it is
missing. This just fixes common places where translators tend to use
sentence with full stop but we don't.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-10-15 11:46:33 +02:00
Hugues Peccatte
857c8a92cf Move abstract transformation plugins to abs folder. 
Update templates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-12 14:13:31 +02:00
Hugues Peccatte
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +02:00
Madhura Jayaratne
93bfdbe371 Remove more references to Drizzle 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:06:58 +10:00
Hugues Peccatte
178a6edd38 Add namespace on part of plugins classes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-05 00:33:42 +02:00
Hugues Peccatte
f0ba28fc1d Set namespace on Advisor, Config, Console and Util classes. 
Set namespace on DbQbe.
Set namespace to 'DbSearch'.
Split Advisor.class.php file.
Change Advisor namespace.
Rename DbQbe class and file.
Set namespace on DisplayResults.
Set namespace on Error.
Use namespace for ErrorHandler.
Add class autoloader.
Change ErrorHandler filename.
Remove some require.
Update Config namespace path.
Update PMA_Util to PMA\libraries\Util.
Rename Font and File classes files.
Use namespace for Footer.
Set namespace in all libraries classes.
Namespace OutputBuffering.
Export SubPartition.
Rename Partition file.
Namespace PDF.
Namespace RecentFavoriteTable.
Replace PMA_Response by Response and PMA_Message by Message.
Update uses and calls.
Fix unit tests.
Fix SqlParser autoload.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:22:52 +02:00
Marc Delisle
16c5137ee7 Remove unneeded code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-30 08:25:09 -04:00
Hugues Peccatte
bd707b871d Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 23:34:50 +02:00
Madhura Jayaratne
0a5163826f Remove the hidden field having the same name as the enum select 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-11 15:49:02 +05:30