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

1892 Commits

Author SHA1 Message Date
Bimal Yashodha
48dd4f354d Remove references to designer_coords and designerwork 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-16 11:39:39 +05:30
Marc Delisle
f9a0e1e8e9 Unused code or parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-29 12:39:36 -04:00
Marc Delisle
93ce1a69de Merge pull request #1195 from smita786/gsoc_central_columns_list 
Gsoc central columns list
 2014-05-26 15:14:04 -04:00
Smita Kumari
200737bcce gsoc:central list of columns, added sync and remove column list on db_structure page 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fixing indentation in mult_submits.inc.php

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

naming convention,typos, indentaion fix and removed unnecessory file db_sync_central_columns.php

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

check if central columns storage is configured, if not configured don't show the option to sync/remove

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

add/remove columns to central list of columns from tbl_structure page

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

added icon image for central columns add/delete

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

add/remove of columns option in tbl_structure page in columns rows depending upon if column is already present in central columns or not

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

fixed php notices, apporiprate message when a non existing column is removed and when a existing column is added to cenral list

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

documentation added for central_columns configuration

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

regenerated sprite

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

changed central_columns table structure + modified functions to add to central column as per new tbl def

updated delete and other function as per new db structure

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

remove notices

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

sprintf for variable message

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

fix unit test failure errors

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

fixed whitespace issues plus function definition

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

refactoring code plus fixing coding style issues

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-05-26 23:13:03 +05:30
Marc Delisle
95ab00dd76 Remove unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-26 10:18:34 -04:00
Ashutosh Dhundhara
51b6fc08f3 Fix merge conflict. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Conflicts:
	ChangeLog
 2014-05-25 19:27:10 +05:30
Ashutosh Dhundhara
d8134c9116 RFE#706: Multi-db privileges adding. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-05-25 19:25:36 +05:30
Hugues Peccatte
d5b53ae9b8 Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-25 12:21:20 +02:00
Marc Delisle
1a32869ba1 Merge commit 'ec29a0c' 2014-05-23 10:29:13 -04:00
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
ec29a0c59d Add missing ) 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 21:46:54 +02: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
49f1bdd822 Merge commit '0ee881d' 2014-05-16 12:20:52 -04:00
Marc Delisle
0ee881da71 bug #4395 BLOB link transformation is broken 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 09:56:47 -04:00
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
Michal Čihař
329deddbfd Let's have just one PMA_mimeDefaultFunction 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 14:53:49 +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ř
71c0eba99f Add test for NavigationTree::renderPath 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 12:48:16 +02:00
Madhura Jayaratne
d0fd5acc0f Revert 33a30ad7ae. Those funcitons are infact used. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 12:04:36 +02:00
Madhura Jayaratne
33a30ad7ae These functions do not seem to be used anywhere, removing... 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 11:51:03 +02:00
Michal Čihař
72d180afd8 Add basic test for navigation tree 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:23:33 +02:00
Michal Čihař
725073709c Use token directly for session 
There is no need to have intermediate global variable to store the token
once we have it in the session data.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:23:33 +02:00
Michal Čihař
3eccb9eb26 Improve signon-script example 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 18:07:39 +02:00
Michal Čihař
b1915bade0 The storeResult needs mysqli lin parameter to operate 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:29:56 +02:00
Michal Čihař
8bc5e560e8 Uset errno before testing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:19:59 +02:00
Michal Čihař
2a66d750a4 Use correct mock value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:11:30 +02:00
Michal Čihař
0f39a811ce The DBI->getError is no longer called twice 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:03:00 +02:00
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ř
514e1c6356 Include missing parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:08:58 +02:00
Michal Čihař
1f669982f8 Adjust test to new API 
Also mark as incomplete tests which really did not test anything.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 12:46:22 +02:00
Michal Čihař
1590e23868 We no longer need to mock the dbi object 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 11:56:45 +02:00
Michal Čihař
302bda9961 Fix typo in method name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 11:27:55 +02:00
Michal Čihař
4631131cbc We default to TCP connection, so I believe this is correct value here 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:33:02 +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ř
6e6c513eed Fix typo in type name 
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