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

320 Commits

Author SHA1 Message Date
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
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ř
c9348b682e Merge remote-tracking branch 'origin/pull/12564' into QA_4_6 2016-11-10 10:59:33 +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
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
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
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
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
Madhura Jayaratne
c21377d2da Fix #10307 Replication broken when using cross-database master/slave config and phpmyadmin 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-29 08:29:25 +05:30
Dan Ungureanu
cb9cc68fe9 Fixed more issues. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-25 19:39:33 +03:00
Madhura Jayaratne
05dca3d776 More column types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-21 13:58:03 +05:30
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:38 +03:00
Dan Ungureanu
c34cf9ff29 More refactoring. 
Updated sql-parser library.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:16 +03:00
Madhura Jayaratne
926e310a59 Workaround for column privileges for Drizzle 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 11:58:17 +05:30
Madhura Jayaratne
ff1592483a rfe #689 Column privileges and update 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 11:51:29 +05:30
Jason
cb771052c8 Finish refactoring tbl_*.lib.php 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-06-17 01:14:27 +08:00
Marc Delisle
0740c4b2b6 Clarify variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-10 08:41:48 -04:00
Marc Delisle
0eb78a8ff2 Use strict comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-09 17:22:34 -04:00
Marc Delisle
37df4b7715 Fix loose comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-09 17:08:14 -04:00
Madhura Jayaratne
758ec7b5ae Performance improvements: Avoid expensive PMA_Table::analyzeStructure() call 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-05 20:20:02 +05:30
Madhura Jayaratne
096535fa8a Remove trailing white spaces 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 21:09:41 +05:30
Marc Delisle
375f6cb954 Clarify variable name and doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 13:31:48 -04:00
Marc Delisle
468346df20 Merge branch 'QA_4_4' 2015-05-05 14:33:03 -04:00
Marc Delisle
65277b2ebb phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-05 14:32:29 -04:00
Madhura Jayaratne
3d85296d79 Spaces around assignments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:06:36 +05:30
Madhura Jayaratne
2e48c6f1f5 Pass additional variables to input transformations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 15:33:04 +05:30
Madhura Jayaratne
6ee59b7eec rfe CodeMirror based SQL editor as an input transformation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-19 13:20:32 +05:30
Madhura Jayaratne
be237a7b51 rfe #954 Allow SALT in ENCRYPT function 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-02 12:26:47 +05:30
Marc Delisle
dcf93b71e1 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-27 15:03:30 -05:00