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

177 Commits

Author SHA1 Message Date
Madhura Jayaratne
bcc069626c Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 15:06:53 +05:30
Madhura Jayaratne
ac2b21475d Fix spacing after do comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 11:06:51 +05:30
Madhura Jayaratne
a22bb26d7e Remove extra space after doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 10:42:21 +05:30
Madhura Jayaratne
12165c8d9e Remove duplicate tag 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:22:42 +05:30
Madhura Jayaratne
f6b7f98322 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-23 10:43:54 -05:00
Madhura Jayaratne
8d9054f732 Use class attribute to select result_query div 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 16:49:17 +05:30
Madhura Jayaratne
aff4046fdd Update getCheckbox to add id field. Remove id field from profiling checkbox 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 16:58:20 +05:30
Hugues Peccatte
7ecbd977e6 Minor code style modifications. 
PHPDoc updates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-31 22:47:40 +01:00
Madhura Jayaratne
3ac46455cf Revert "The DisableIS directive is removed" 
This reverts commit d8fd82a9f5.

Conflicts:
	ChangeLog
	doc/config.rst
	libraries/config.default.php
	libraries/config/messages.inc.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:29:55 +05:30
Madhura Jayaratne
8d8135893d Function name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 15:07:55 +05:30
Marc Delisle
9ab4ade266 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-15 11:34:32 -04:00
Hugues Peccatte
8558047094 Coding style modifications. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-08-09 23:21:13 +02:00
Marc Delisle
84f135d048 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:40:21 -04:00
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ř
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ř
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
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ř
084cf775d9 Fix test condition 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-27 18:40:08 +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
Hugues Peccatte
c38b78defb PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 11:46:16 +01:00
Hugues Peccatte
9290c6857e PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-14 20:58:33 +01: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
0216a5a4a1 Move slow tests 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 05:20:31 +00: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
Dhananjay
0a18d86059 Fix for bug#4237. 
Signed-off-by: Dhananjay <dhananjaynakrani@gmail.com>
 2014-02-07 11:56:46 +05:30
Hugues Peccatte
f7d5da319e Fix coding style. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-01-09 18:22:11 +01:00
Marc Delisle
bf35e2cd0f Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-11 06:23:22 -05:00
ptarjan
840f7b1215 Make unit tests friendlier to running independently 2013-11-20 14:43:55 -08:00
Marc Delisle
d8fd82a9f5 The DisableIS directive is removed 2013-11-05 12:44:04 -05:00
Madhura Jayaratne
f1a461d7bf Remove trailing white spaces 2013-11-04 22:09:15 +05:30
Madhura Jayaratne
17e4f9eb39 Fix syntax highlighting. Use PMA_Util::formatSql() for SQL formatting 2013-10-19 10:56:47 +05:30
Marc Delisle
ffd3a06811 Merge branch 'QA_4_0' 2013-10-09 10:08:24 -04:00
Marc Delisle
4fb5088f86 bug #3678 Does not display or manipulate bit(64) fields appropriately 2013-10-09 10:06:47 -04:00
Michal Čihař
32b33a9e26 Incorporate truncating into PMA_Util::formatSql 
It is used quite often as well.
 2013-08-06 12:29:27 +02:00
Michal Čihař
cb413506a6 As PMA_Util::formatSql is now trivial, the test can be as well 2013-08-06 12:24:28 +02:00
Michal Čihař
99af0cbc7e Remove unused parameter from PMA_Util::formatSql 
We no longer need parsed SQL here.
 2013-08-06 12:24:28 +02:00
Michal Čihař
959644445d PMA_Util::formatSql now requires unparsed query as well 
In most cases we just need to output it as is, formatting is done in
javascript.
 2013-08-06 12:04:14 +02:00
Michal Čihař
6bb21aec66 Do not try to add documentation links with disabled docs 2013-08-06 11:56:37 +02:00
Michal Čihař
574f520b1a Use new shared runkit detection 2013-07-15 10:51:43 +02:00
Michal Čihař
bebba32337 Merge remote-tracking branch 'origin/QA_4_0' 
Conflicts:
	libraries/config.values.php
	libraries/sql_query_form.lib.php
	server_binlog.php
	server_databases.php
	tbl_structure.php
	test/classes/PMA_DisplayResults_test.php
 2013-06-24 10:41:54 +02:00
Marc Delisle
d4d5a03766 Bug #3960 NavigationBarIconic config not honored 2013-06-21 10:00:41 -04:00
Michal Čihař
8b9fa8aa36 Do not set language in every test 2013-06-11 14:02:49 +02:00
Michal Čihař
ba9cff2736 Set token in single place for all tests 2013-06-11 13:53:31 +02:00
Marc Delisle
5fffdca3aa Parser: remove the color (html) mode 2013-05-30 07:54:05 -04:00
Spun Nakandala
22ba2d8147 Bug #3919 PropertiesIconic not honored fixed 
(cherry picked from commit 01c57f71ca)
 2013-05-14 11:51:29 +02:00
Michal Čihař
a1e711b919 Merge pull request #361 from scnakandala/Bug_3919 
Bug #3919 PropertiesIconic not honored fixed
 2013-05-13 14:58:22 -07:00