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

1919 Commits

Author SHA1 Message Date
Michal Čihař
a7bcbbc35f Wrap long line 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:51:29 +02:00
Michal Čihař
20640592f0 Always use phpseclib for cookie encryption 
- it provides fallback in case mcrypt is not found
- we now use AES in both mcrypt and PHP code case
- cleanup the code by removing mcrypt conditials
- rename some methods and cookies so that they don't refer to
  implementation details
- switching encryption implementations no longer invalidates the
  credentials

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:39:52 +02:00
Michal Čihař
0652ca9ccd Merge remote-tracking branch 'origin/QA_4_2' 2014-06-12 10:19:00 +02:00
Michal Čihař
bc60315023 Adjust tests to new IV logic 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:18:45 +02:00
Marc Delisle
a83ca5d73b Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-10 12:43:07 -04:00
Chirayu Chiripal
ff688b18fb Bug-4448: Dump binary columns in hexadecimal notation not working and hex_for_blob -> hex_for_binary 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-10 19:00:16 +05:30
Chirayu Chiripal
33dfef377f RFE-759 Use aliases in SQL export for tables and columns 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-09 22:44:07 +05:30
Marc Delisle
44f01448d9 Fix test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-07 15:48:05 -04:00
Marc Delisle
efde179705 Fix test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-07 15:45:35 -04:00
Marc Delisle
060fb03afb Merge pull request #1206 from smita786/gsoc_central_columns_list 
Using central list of columns : pick a column from central list
 2014-06-07 15:37:42 -04:00
Smita Kumari
294e36bdb6 pick a column from central list 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

small bug fix

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

added own style

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

not display column name that already exist in tabl

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

added search to the pick column dialog

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

Fix coding style

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

check for central columns configuration relation

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

pagination in pick coulumn dialog

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

code cleanup

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

Fix coding style

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-07 22:06:05 +05:30
Marc Delisle
de6ad93d24 Merge pull request #1209 from ashutoshdhundhara/rfe_1145 
RFE#1145: Preview SQL instead of executing it.
 2014-06-07 06:39:32 -04:00
Ashutosh Dhundhara
99b9e8d83c RFE#1145: Preview SQL instead of executing it. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-07 00:27:39 +05:30
Michal Čihař
c9dc5611ee Fix type string for longtext 
It has to be checked before "long", otherwise it matches first.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 15:46:34 +02:00
Michal Čihař
dfacd8ad14 Check for correct return type 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 15:46:34 +02:00
Michal Čihař
8cc12d2969 Fix expected value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 15:07:09 +02:00
Michal Čihař
fbd5c4ff65 Share code for rendering storage engine subpages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 14:59:22 +02:00
Michal Čihař
21c6c2e79f Pass correct types in testsuite 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:13:48 +02:00
Michal Čihař
83073fe53c Remove duplicate variable initialization 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:12:51 +02:00
Michal Čihař
1cc4620d65 Pass correct types in testsuite 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:12:26 +02:00
Michal Čihař
666e302564 Fix indefined variables in test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:08:40 +02:00
Michal Čihař
3e4ef11ba1 Pass correct parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:07:48 +02:00
Michal Čihař
bfadec2f2b Pass correct parameter values 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:05:26 +02:00
Michal Čihař
3e4da830ee Correctly set static properties in testsuite 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:01:14 +02:00
Michal Čihař
dc825e82be Correctly document parameter types 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 12:58:50 +02:00
Marc Delisle
c8e33b2a96 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:59:55 -04: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
bd762244ec Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:27:02 -04:00
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