Commit Graph

218 Commits

Author SHA1 Message Date
Marc Delisle
f152146abe [security] XSS with malicious ENUM values
Signed-off-by: Marc Delisle <marc@infomarc.info>

Conflicts:
	libraries/Util.class.php
2014-10-01 08:31:07 -04:00
Michal Čihař
e27b287387 Merge remote-tracking branch 'origin/QA_4_2'
Conflicts:
	libraries/Util.class.php
2014-09-22 11:39:57 +02:00
Michal Čihař
d2fcf01213 Apply fixup for documentation anchor as well
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-09-22 11:39:11 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-06 10:44:03 +02:00
Marc Delisle
79896a1c20 Fix parameter type
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-23 08:07:21 -04:00
Ashutosh Dhundhara
35dab58bf5 RFE#1492: Remove the distinct query window.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-08-12 01:47:20 +05:30
Marc Delisle
f0e1dd8406 Merge pull request #1104 from madhuracj/nav
Add 'collapse all' and 'link with main panel' buttons to navigation
2014-08-03 07:37:00 -04:00
Madhura Jayaratne
dfe8dc283a Add 'collapse all' and 'link with main panel' buttons to navigation
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-07-28 09:58:24 +05:30
Chirayu Chiripal
04a3a7073b RFE-1488/781: User privilege tab not shown in all relevant cases
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-07-18 00:13:08 +05:30
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations)
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-07-12 01:52:32 +05:30
Ann + J.M
6b778e09d9 Fix coding style
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-06-22 16:34:34 +02:00
Michal Čihař
2d489d3bc7 Add missing space
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-09 10:23:46 +02:00
Michal Čihař
564fb8ef93 Wrap long lines
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-06 15:14:33 +02:00
Michal Čihař
2e2a667b1d Fix types documentation
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-06 14:59:22 +02:00
Michal Čihař
93c110bdeb If this returns, it returns string
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-06 14:59:22 +02:00
Michal Čihař
8c0ba0ceb3 Simplify params passed to pow
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-06 14:59:22 +02:00
Marc Delisle
3d668e6ae0 Merge pull request #1198 from smita786/gsoc_central_columns_list
Gsoc central columns list
2014-06-02 12:32:32 -04:00
Smita Kumari
175b69b72b central columns management page basic
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

central columns management page edit/delete

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added column length to central columns table

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix edit issu

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

remove logging and alert statement

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

delete an entry fixed

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

col_length default to 0 + filter rows

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix menu tab test case

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix col_length datatype plus menu tst case fix

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added cancel button

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

sprite regenerate for adding cntral columns icon

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

removing default value from col_length of type text

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

message format

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

search fix plus uitablfilter plugin modify to take elements to limit search to

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

refactoring db_cntral_columns.php plus file description in db_cntral_columns.js

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added table sorting

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix js error for empty central columns

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

refactoring of code plus adding option to add a column to central list

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

removing trailing white spaces

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

handle condition if central list is empty

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-06-02 01:57:50 +05:30
Marc Delisle
9373e1b204 Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-23 10:21:37 -04:00
Ann + J.M
5ddd0c1990 Code style fixes
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-21 20:56:01 +02:00
Chirayu Chiripal
85390a7169 rfe-982: Support for editing binary fields in hexadecimal
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-05-21 21:42:21 +05:30
Chirayu Chiripal
fed689c7e1 documentation & coding style issues fix
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-05-18 12:38:49 +05:30
Marc Delisle
c3723d975c Merge commit '9154902' 2014-05-12 07:53:53 -04:00
Chirayu Chiripal
9154902f6d Bug #4390: Data type changing by itself
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-05-10 17:37:20 +05:30
Michal Čihař
e984b2a609 The ini_set function takes string, not booleans or integers
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-10 11:57:10 +02:00
Madhura Jayaratne
aa3b6bf2b8 Fix some coding style violations
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-05-10 11:19:32 +02:00
Madhura Jayaratne
0dc03cad1e Check whether message is set
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-05-10 10:49:26 +02:00
Michal Čihař
1d6e2e9479 Remove unused code
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-09 15:47:44 +02:00
Michal Čihař
82b4549176 Remove unused parameter of PMA_Util::cacheUnset
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-09 14:21:12 +02:00
Hugues Peccatte
5306fcc9c6 Minor coding style fixes.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-05-08 21:51:24 +02:00
Michal Čihař
25bfa05e1b This is actually a string
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-08 18:04:07 +02:00
Michal Čihař
eb29ddeba8 Remove never used parameter of cacheSet
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-08 17:37:40 +02:00
Michal Čihař
283ee59316 Remove never used parameter of cacheExists
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-08 17:37:40 +02:00
Michal Čihař
79bcd54610 Remove never used parameter of cacheGet
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-08 17:37:40 +02:00
Michal Čihař
aba07a933b Remove not needed declaration
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-08 14:06:18 +02:00
Michal Čihař
d9d359fea9 Remove not needed parsing of query
It was needed when we highlighted the SQL query in PHP, but it's not the
case anymore.

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-08 13:59:03 +02:00
Michal Čihař
ad8c3d8c6f Remove unused parameter
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-08 13:57:19 +02:00
Hugues Peccatte
6fb15d8a41 Use PMA_String class to substr multi-bytes.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-04-27 17:30:58 +02:00
Hugues Peccatte
520872da74 Fix 'phpmyadmin refuses to show tables with enums containing special data' bug #4380
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>

Conflicts:
	ChangeLog
2014-04-27 17:30:19 +02:00
Michal Čihař
7233657d4d Remove support for SQL validator
The SOAP service seems to be down for quite some time and it is not
mentioned anywhere on Mimer website.

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-04-02 12:10:52 +02:00
Ashutosh Dhundhara
514a24e4aa Minor Bug for favorite icon.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-03-29 01:58:26 +05:30
Raimund Meyer
1f21e3f746 fix bug #4341 When using translation, header of mo-file is displayed DB
-> Structure view 

Signed-off-by: Raimund Meyer <ray@raimundmeyer.de>
2014-03-27 17:21:39 +01:00
Marc Delisle
e4224bf18d Merge pull request #1095 from ashutoshdhundhara/favourite_tables_icon_only
Feature request: #1476 Favorite tables select box.
2014-03-26 17:01:18 -04:00
Ashutosh Dhundhara
8bc21b7876 Feature request: #1476 Favourite tables select box.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Changes in "create_tables.sql".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Minor fix in structure.lib.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Ripped Trailing White spaces.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Removed irrelevant comments from "FavouriteTable.class.php".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed Table Summary colspan.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Changed Favourite to Favorite

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed failing test.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Feature request: #1476 Favourite tables select box. (Icon only)

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Gray and Golden Icons.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Removed unwanted icon from "img".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed error in PMA_buildActionTitles_test.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Re-positioned star icon and added tooltip to it.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Ripped trailing spaces from "structure.lib.php" and "db_structure.js".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-03-26 23:37:19 +05:30
Marc Delisle
a1183ec0ec Replace tabs with correct indentation
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-03-19 12:54:47 -04:00
Bartek Fabiszewski
068c3422ea Fix for missing 'Trigger' menu for older MySQL versions
Signed-off-by: Bartek Fabiszewski <github@fabiszewski.net>
2014-03-19 15:53:20 +01:00
Marc Delisle
5641638897 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-03-14 12:32:49 -04:00
Edward Cheng
7efd0bd3c9 Fix clear-float location
Signed-off-by: Edward Cheng <c4150221@gmail.com>
2014-03-05 19:50:04 +08:00
Jeff Chan
9a5603f908 Cast unit size value for formatByteDown to float to avoid overflow.
Add another test case to formatByteDown which fails on HHVM 2.4

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
2014-02-10 18:25:54 +00:00
Michal Čihař
767fc8c997 Correct punctuation for sentences
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-02 11:38:49 +01:00