Commit Graph

207 Commits

Author SHA1 Message Date
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
Michal Čihař
47b1b31f49 Need to encode whole string here 2014-02-02 10:13:31 +01:00
Michal Čihař
8eaaad4826 Do not use HTML entities for quotes inside translatable messages
First of all there is no reason to HTML encode them, if the string
should be encoded, it has to be done after getting the translation from
gettext as they can contain something to quote as well.

Also using HTML entities is sometimes confusing for translators.
2014-02-02 10:06:23 +01:00
Madhura Jayaratne
cdd53ace21 Merge branch 'QA_4_1'
Conflicts:
	libraries/Util.class.php
	test/libraries/PMA_insert_edit_test.php
2014-01-29 23:30:33 +05:30
Madhura Jayaratne
c1c50b5944 Revert e8fa9e5335, ea0ad9d41c and f36fbfd4c6
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-29 23:06:43 +05:30
Marc Delisle
8cdb92be5a Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-29 08:10:23 -05:00
Marc Delisle
f36fbfd4c6 Bug #4258 Grid editing broken
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-29 07:58:19 -05:00
Marc Delisle
8ba4548146 Merge commit 'e8fa9e5' 2014-01-27 12:45:29 -05:00
Sampath Liyanage
e8fa9e5335 bug 4245 fix with minimum changes
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
2014-01-27 21:29:27 +05:30
Marc Delisle
66963f6d06 Merge branch 'QA_4_1' 2014-01-22 13:29:56 -05:00
Marc Delisle
704107c3b7 bug #3579 NOW() function incorrectly selected (regression)
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-22 13:28:34 -05:00
Atul Pratap Singh
0cc9230bd3 fix headers already sent warnings when using session_start()
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-01-22 20:16:47 +05:30