Commit Graph

306 Commits

Author SHA1 Message Date
Nisarg Jhaveri
7a1c989b43 Fix bug 4635
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
2014-12-10 07:58:58 -05:00
Madhura Jayaratne
b69bb37361 bug #4627 "file_get_contents(examples/create_tables.sql): failed to open stream" after update
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-08 14:12:03 +05:30
Marc Delisle
bd2a8b501c Fix other undefined index notices in PMA_getDiagMessageForFeature()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-04 09:15:18 -05:00
Madhura Jayaratne
10b958c1ba Merge branch 'QA_4_2' into QA_4_3 2014-11-27 10:27:34 +05:30
Madhura Jayaratne
19802ca9f9 bug #4608 SELECT permission issues with relations and restricted access
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-27 10:25:42 +05:30
Marc Delisle
11b1dd67fb Merge branch 'QA_4_2' into QA_4_3 2014-11-22 07:14:17 -05:00
Marc Delisle
1110d08743 bug #4604 Query history not being deleted
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-22 07:13:41 -05:00
Michal Čihař
4d151b6e89 Fix encoding of relation.lib.php
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-11-20 09:57:04 +01:00
Madhura Jayaratne
a0b60e0901 Merge branch 'QA_4_2' into QA_4_3
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-20 08:37:28 +05:30
Madhura Jayaratne
bfc61051b7 bug #4603 Field disabled when internal relations used
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-20 08:27:03 +05:30
Madhura Jayaratne
88089a76a7 Merge branch 'master' into Performance
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-03 05:06:49 +05:30
Hugues Peccatte
bdb5f333d7 Fix PHPCS issues.
PHPDoc updates.
Minor coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-01 22:07:18 +01:00
Hugues Peccatte
80ced5fe8f Fix PHPCS issues.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-30 18:37:49 +01:00
Hugues Peccatte
e17de11c74 Improve multibytes string manipulation performances.
Review SQL import process.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-30 17:40:09 +01:00
Hugues Peccatte
80869ba0ec Merge branch 'master' into stringFunctions_useStandardFunctions_master 2014-10-25 17:08:48 +02:00
Ann + J.M
29ec69c849 Merge branch 'master' into ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-10-22 16:58:00 +02:00
Madhura Jayaratne
ef33a839fb Avoid accessing undefined indexes
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-21 21:05:06 +05:30
Madhura Jayaratne
e277e4d80f Get child references for the whole table at once.
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-21 12:15:32 +05:30
Madhura Jayaratne
2abae135e6 Get foreigners just once for table and use it for all columns
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-21 10:48:52 +05:30
Madhura Jayaratne
5a4d8a3855 Disable finding child referenced when DisableIS is false.
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-21 10:30:12 +05:30
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
Ann + J.M
a540e6ba87 More fixes to new PMA_URL_getCommon style
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-10-18 19:42:39 +02: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
Hugues Peccatte
920f83da2d Fix #4471: Undefined index warning with referenced column.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-06-26 21:03:17 +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