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

11663 Commits

Author SHA1 Message Date
Bimal Yashodha
e2af75781f Fix id of the input 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-18 08:53:09 +05:30
Bimal Yashodha
a7814b39ba Pass $db as a parameter 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-18 08:48:38 +05:30
Bimal Yashodha
53bea7bb22 Duplicate code 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-18 08:40:45 +05:30
Bimal Yashodha
56494730a4 Improve queries 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-18 08:11:04 +05:30
Bimal Yashodha
c8e375defc Indent properly 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-18 07:59:14 +05:30
Bimal Yashodha
3f39847e1b Remove unused function 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-18 07:50:03 +05:30
Bimal Yashodha
2180f08135 Fix tests 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-16 12:34:25 +05:30
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
Bimal Yashodha
70b48eefc2 Pass constraints for hidden tables also 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-16 07:34:05 +05:30
Bimal Yashodha
a71ed52bb8 Show only visible tables 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-16 07:01:10 +05:30
Bimal Yashodha
e04f56a04f Commit for review - multiple pages in designer 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-12 18:10:17 +05:30
Madhura Jayaratne
2a5a816753 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-05-30 22:13:47 +05:30
Madhura Jayaratne
cc0fa75cce rfe #1527 Charts for data in <x-axis, series, value> format 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-30 22:12:23 +05:30
Marc Delisle
49c9dd3ecb Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-30 12:20:32 -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
93f49ab1f8 Unused code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-29 12:24:33 -04:00
Marc Delisle
4627be8968 Clarify message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-28 08:21:06 -04:00
Marc Delisle
5f12a95d25 Fix undefined variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-27 12:29:43 -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
Marc Delisle
7aa5dfdb6b Define variable for one possible execution path 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-26 10:09:55 -04:00
Ann + J.M
ddf78c212b Re-merge b3dbec1...9207203, changes got lost on original merge from QA_4_2 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-26 10:39:50 +02: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
b7b7e25fe0 Replace edit input for text fields. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-24 23:33:56 +02:00
Marc Delisle
68eca169a8 Merge commit '60fca63' 2014-05-24 09:07:19 -04:00
Marc Delisle
60fca63630 Missing message for /setup 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-24 09:05:10 -04:00
Marc Delisle
decbcdfeee Merge commit '524e82e' 2014-05-23 10:24:35 -04:00
Marc Delisle
e50b0d2b71 Merge commit 'daaf70b' 2014-05-23 10:23:51 -04:00
Marc Delisle
7630006be2 Merge commit 'd666ed6' 2014-05-23 10:23:31 -04:00
Marc Delisle
9373e1b204 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-23 10:21:37 -04:00
Marc Delisle
1acfaf4a7f Merge commit 'ddbe5ae' 2014-05-23 10:15:49 -04:00
Marc Delisle
e98a9a7bdb Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-23 10:03:39 -04:00
Chirayu Chiripal
58dba3809f fixed browse foreign values copying description in input field 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-22 13:49:05 +05:30
Ann + J.M
5facff36bd Add missing break in # comment detection switch 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 21:43:20 +02:00
Ann + J.M
524e82e33c Extrace query cache total blocks value correctly 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 21:34:21 +02:00
Ann + J.M
daaf70bca2 Rename OptionsPropertyOneItem::$_force overwritten from parent 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 21:29:51 +02:00
Ann + J.M
d666ed61af Comment that missing break statement is intended 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 21:25:44 +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
Ann + J.M
ddbe5aed27 DBQbe::_getInsDelAndOrCell: Fix PHPDoc param type 2014-05-21 20:19:23 +02:00
Ann + J.M
9f186aae7d ini_set: Use string for param 2 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 20:19:17 +02:00
Marc Delisle
6e7c8439c0 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-05-21 12:52:09 -04:00
Isaac Bennetch
02c4e352c5 Merge pull request #1189 from D-storm/FR-982 
rfe-982: Support for editing binary fields in hexadecimal
 2014-05-21 12:52:02 -04:00
Marc Delisle
0db68db620 Merge branch 'QA_4_2' 2014-05-21 12:51:03 -04:00
Marc Delisle
c2d719b4eb bug #4423 Moving fields not working 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-21 12:49:55 -04:00
Marc Delisle
eebac0cd0f Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-21 12:21:23 -04: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
Marc Delisle
634307329e 4.2.3-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-20 08:28:42 -04:00
Marc Delisle
f027527c51 Merge branch 'QA_4_2' 2014-05-20 08:22:00 -04:00