gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,546 Commits 12 Branches 481 Tags 2.4 GiB
3363f10880
Commit Graph

284 Commits

Author SHA1 Message Date
Hugues Peccatte
74f0beda8f Fix syntax error. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 20:56:12 +02:00
Marc Delisle
9680410019 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-19 10:13:07 -04:00
Hugues Peccatte
48bd3b8ee5 Remove unused $pmaString. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-05 10:42:44 +02:00
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls. 
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 20:53:01 +02:00
Marc Delisle
25cbe79a53 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-16 08:10:33 -04:00
Hugues Peccatte
5985894160 Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-07 00:31:45 +02:00
Hugues Peccatte
767b45380c Merge branch 'master' into securityStringSquash 2014-09-06 11:48:24 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
Marc Delisle
afd2abbe3c Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-01 09:04:33 -04:00
Marc Delisle
b7cec730f3 Improve message and make it translatable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-16 07:06:51 -04:00
Marc Delisle
83fb0545a8 bug Incorrect link to documentation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-15 13:08:26 -04:00
Marc Delisle
0aafd71c9f Merge pull request #1324 from ashutoshdhundhara/bug_qbe 
Bug#4511: QBE fails to generate LEFT join for InnoDB foreign keys in absence of configuration storage.
 2014-08-11 12:18:42 -04:00
Ashutosh Dhundhara
7a9569f6b5 RFE#1123: Zeroconf PMA tables support. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-11 18:33:59 +05:30
Ashutosh Dhundhara
9191c1aa4e Bug#4511: QBE fails to generate LEFT join for InnoDB foreign keys in absence of configuration storage. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-11 03:58:19 +05:30
Ashutosh Dhundhara
b3583d4cba RFE#1491: Support InnoDB for database Query by example. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

FAQ entry should remain.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-04 23:55:53 +05:30
Ashutosh Dhundhara
508f0a752b RFE#919: Multiple-column foreign key relation. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix missing master column.

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

Fix failing test.

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

Fix coding styles.

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

Fix function doc.

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

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-01 19:50:12 +05:30
Edward Cheng
54000aa117 [Console]Second commit 
Console changes:
+ Ajax global callback
+ Support disable Codemirror
+ Global AJAX callback
+ XSS issues slove
+ JSON response bug fix
+ Selection query Explain and Profiling
+ Translation improvement
+ Bookmark creation and deletion
+ Codemirror wrong font-size under Firefox
+ Options card input elements value bug
+ Etc

Removal:
- Rollback query execution support

Other changes:
+ Unify query history behavior

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-07-29 19:20:38 +08:00
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-12 01:52:32 +05:30
Ann + J.M
f5a9a60382 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-07-03 20:27:39 +02:00
Hugues Peccatte
929dccb9a3 Cherry-pick dd5ba23: Fix #4471: Undefined index warning with referenced column. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-28 19:09:20 +02:00
Edward Cheng
fb14e92d62 PMA console, history and bookmarks. 
Modified: resizer of navigation bar: whole-time-bind events removed.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-06-25 21:22:33 +08:00
Madhura Jayaratne
521a77d8bd Merge pull request #1232 from kb-yashodha/multipages1 
Complete multipages functionality in designer
 2014-06-16 15:22:13 +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
Marc Delisle
673fce8145 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:33:25 -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
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
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
Marc Delisle
eebac0cd0f Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-21 12:21:23 -04:00
Marc Delisle
f027527c51 Merge branch 'QA_4_2' 2014-05-20 08:22:00 -04:00
Marc Delisle
fda047361d Fix notice 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-20 08:21:27 -04:00
Ann + J.M
d9bd81a2a1 Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:40:24 +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
Michal Čihař
d0aeb9e342 Use fetchValue directly as we do not need the query anyway 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-13 15:27:26 +02:00
Marc Delisle
517b55f5ed Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-01 17:28:30 -04: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
Hugues Peccatte
02afab96fb Add config help for saved QBE searches. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-02-26 20:50:03 +01:00
Hugues Peccatte
8b84cf0d91 Feature #569 Load/Save Query By Example 
Implement possibility to save/load/delete a QBE on a DB.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-02-23 14:52:48 +01:00
Hugues Peccatte
6b01f835cb Rename too short variables. 
Remove useless initializations.
Rename too long variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-01-04 20:46:18 +01:00
Marc Delisle
b4285eb7ca Merge branch 'QA_4_1' 2013-12-21 11:57:45 -05:00
Marc Delisle
5360a84a55 bug #2961 Relations settings not updated on config change 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-21 11:56:33 -05:00
Marc Delisle
9a5c81b5ca Merge branch 'QA_4_1' 2013-12-21 10:25:03 -05:00
Marc Delisle
0d7eeadba7 Revert "bug #2961 Relations settings not updated on config change" 
This reverts commit 1cc3e27308.
 2013-12-21 10:23:54 -05:00
Marc Delisle
fa73a324ee Merge branch 'QA_4_1' 2013-12-21 10:10:49 -05:00
Marc Delisle
1cc3e27308 bug #2961 Relations settings not updated on config change 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-21 10:09:55 -05:00
Hugues Peccatte
7bd1bf23d3 Fix PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-11 22:13:10 +01:00
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Michal Čihař
d3432b7f73 End sentence with stop 2013-08-23 09:30:36 +02:00
Michal Čihař
6df3c0adb5 Merge pull request #543 from madhuracj/pma_string 
Pma string
 2013-07-27 12:50:24 -07:00
Isaac Bennetch
1a41ce1f59 Merge branch 'hideTables' of git://github.com/kasunchathuranga/phpmyadmin into kasunchathuranga-hideTables 
Conflicts:
	ChangeLog
 2013-07-27 14:01:35 -04:00