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

713 Commits

Author SHA1 Message Date
Marc Delisle
20b2a3a707 Merge commit '28074d2' 2014-05-23 10:22:51 -04:00
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
28074d27f4 Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 21:22:12 +02: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
146b204a0b failing test fix 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-21 00:09:55 +05:30
Ann + J.M
6743e78ea4 PMA_Bookmark_delete: Drop unnecessary $db param 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:04:22 +02:00
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
b9b06845ff Merge commit '7f445f9' 2014-05-16 07:53:38 -04:00
Chirayu Chiripal
7f445f99e3 Bug fix #4411 Protect Binary when set to no in settings still does not allow insert binary data 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>

test case fix

Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-15 20:05:52 +05:30
Chirayu Chiripal
c3f2abe873 FR #1487: Browse Foreign Values should be modal dialog 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-14 17:30:11 +05:30
Marc Delisle
c3723d975c Merge commit '9154902' 2014-05-12 07:53:53 -04:00
Michal Čihař
8496dfde6c Correctly pass empty parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 17:23:07 +02: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ř
f420f1bcfd Document possible bug in test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:57:10 +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
Michal Čihař
ebefbfa126 Fix return type 
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
Marc Delisle
e57088ef79 Remove unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-08 16:16:52 +02:00
Marc Delisle
519cdacf50 Fix test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-04 13:09:56 -04:00
Madhura Jayaratne
68761dad91 Update tests to reflect the changes in PMA_GIS_modifyQuery function 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-04 19:39:20 +05:30
Michal Čihař
662d20f3a8 Fix mocked DBI in tests to match recent changes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-30 09:50:03 +02:00
Hugues Peccatte
7193726c9a Fix PHPCS issues. 
Update PHPDoc.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-26 19:26:19 +02:00
Michal Čihař
a3e05a32ef Add test for double call of PMA_arrayWalkRecursive 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-10 13:30:44 +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
Ann + J.M
50ce95f974 Fix failing test PMA_ConfigFile_Test::testGetServerDSN after b870612 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-03-29 21:47:32 +01: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
Michal Čihař
824fd5f1dd Merge pull request #1091 from ashutoshdhundhara/feature_1329_rev_2 
Feature Request: #1329 Can't rename column with foreign key constraint.
 2014-03-28 14:47:15 +01:00
Michal Čihař
084cf775d9 Fix test condition 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-27 18:40:08 +01:00
Ashutosh Dhundhara
4346955b45 Feature Request: #1329 Can't rename column with foreign key constraint. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed tests.

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

Fixed coding style conventions.

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

Again fixed some coding conventions.

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

Ripped trailing white spaces in relation.lib.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-27 14:36:23 +05:30
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
Hugues Peccatte
3f5f8eac71 Fix test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 11:54:32 +01:00
Hugues Peccatte
c38b78defb PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 11:46:16 +01:00
Michal Čihař
40f9df6fcc Merge pull request #1067 from jeffchan/fix-tests 
Fix unit test running individually by file
 2014-03-15 08:26:49 +01:00
Michal Čihař
bb280c8cc1 Merge pull request #1068 from jeffchan/fix-config-generator-test 
Cache date in ConfigGenerator unit test
 2014-03-15 08:26:31 +01:00
Hugues Peccatte
9b1f025fb7 PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-14 23:06:46 +01:00
Hugues Peccatte
15afc7f9e6 PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-14 22:47:29 +01:00
Jeff Chan
694daa01dd Cache date in ConfigGenerator unit test 
Occasionally we run into timing issues. For example, if the config
is generated at 12:00:59PM and the assertion is at 12:01:00PM, then
the test will fail. This should bring the expected $date closer to
when the config is generated.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 20:00:19 +00:00
Hugues Peccatte
9290c6857e PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-14 20:58:33 +01:00
Jeff Chan
719babd2c6 Import dependencies to make tests friendlier to running independently 
The HHVM test runner runs the unit tests in parallel. Currently some tests
fail because not all the dependencies are properly included.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 18:59:18 +00:00
Jeff Chan
69e2f227ab Move slow tests in HHVM to medium group 
Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 18:59:13 +00:00
Hugues Peccatte
a5f396147b PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-14 19:23:56 +01:00
Jeff Chan
c9948e9cde Import dependencies to make unit tests friendlier to running independently 
The HHVM test runner runs the unit tests in parallel. Currently some tests
fail because not all the dependencies are properly included.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 04:45:08 +00:00
Michal Čihař
ad931a1c05 Merge pull request #1060 from jeffchan/fix-tests 
Move slow test in HHVM to group medium
 2014-03-13 23:35:56 +01:00
Jeff Chan
013a9a3395 Move slow test in HHVM to group medium 
These tests were failing on HHVM because of the default 3 second timeout.
Yes, HHVM is supposed to be faster, but there's a "warmup" time for scripts
in JIT mode (which is on by default). I suspect that's why they're failing.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-13 20:52:13 +00:00
Hugues Peccatte
db23a9bf8a PHPCS and PHPdoc updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-13 21:40:39 +01:00
Marc Delisle
50738aa639 Merge pull request #1049 from D-storm/FR-1501 
Feature Request #1501 add maxlength by field with length-spec
 2014-03-13 13:14:18 -04:00