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

3467 Commits

Author SHA1 Message Date
Chirayu Chiripal
32511719b1 RFE-1490 Dynamic process list 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-24 19:13:21 +05:30
Ashutosh Dhundhara
2a7cdbdb75 RFE#654: Range Search Capability. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-24 16:47:34 +05:30
Hugues Peccatte
6e118dadea Merge pull request #1244 from Tithugues/QA_4_2_fixEmptySQL 
Fix error when clicking 'Go' and having an empty textarea in SQL tab. (bug #4470)
 2014-06-22 16:48:15 +02:00
Hugues Peccatte
09a8a40300 Merge pull request #1240 from Tithugues/scrutinizer 
Fix some Scrutinizer issues
 2014-06-22 16:38:59 +02:00
Hugues Peccatte
876d029549 Fix error when clicking 'Go' and having an empty textarea in SQL tab. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-20 23:22:42 +02:00
Hugues Peccatte
40def1a7a2 Fix 'function declaration in loop' scrutinizer errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-19 21:42:59 +02:00
Isaac Bennetch
30de95fc0a Merge pull request #1239 from D-storm/scrutinizer 
scrutinizer issues fix
 2014-06-19 12:45:42 -04:00
Marc Delisle
0fed3cf40e Merge pull request #1237 from ashutoshdhundhara/simulate_query 
RFE#861: Simulate UPDATE queries.
 2014-06-19 12:00:49 -04:00
Ashutosh Dhundhara
8a46508bd0 RFE#861: Simulate UPDATE queries. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Show 'Simulate query' button only in case of UPDATE and DELETE.

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

Fix code style.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-19 21:16:13 +05:30
Chirayu Chiripal
c8a6ea0467 scrutinizer issues fix 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-19 17:10:55 +05:30
Marc Delisle
ebd19293c6 Merge pull request #1233 from smita786/gsoc_central_columns_list 
add user defined column to central list
 2014-06-17 14:09:29 -04:00
Smita Kumari
e373a5a029 add user defined column to central list 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

using functions from tbl_columns_definition_form.lib.php to create the add column form

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

fix Coding styl

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

added unit test for new function PMA_getHTMLforAddNewColumn

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

bug fix: added function to get columns count in central list

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

using functions from tbl_columns_definition_form.lib.php to edit columns in central list

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

improved test

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

Bug/coding style fix

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

Fix delete issue

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

added missing doc element

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-17 22:45:23 +05:30
Chirayu Chiripal
3ea7d2b52d rfe-755: export with table/column name changes 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-16 22:41:50 +05:30
Madhura Jayaratne
521a77d8bd Merge pull request #1232 from kb-yashodha/multipages1 
Complete multipages functionality in designer
 2014-06-16 15:22:13 +05:30
Michal Čihař
e4cd090611 Improve some messags 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-16 11:15:02 +02:00
Michal Čihař
d78e41d737 Merge pull request #1219 from dhananjay92/dhananjay-gsoc-rebased 
Commits for review: Add php Error Reporting Functionality to PMA (Rebased)
 2014-06-16 11:11:13 +02:00
Michal Čihař
5600a8090f Merge pull request #1226 from WhaleWatching/update_cm 
Update codemirror, because cursor in old version had a wrong position.
 2014-06-16 10:54:59 +02:00
Bimal Yashodha
03b4e522e3 Close the dialog 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-16 13:05:38 +05:30
Dhananjay Nakrani
83d63d23ea Fix coding style issues. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:55 +05:30
Dhananjay Nakrani
68de01a99e Minor Interface improvements. Scroll down & show 'working' icon. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:55 +05:30
Dhananjay Nakrani
caaacefcbe Move inline JS to 'binded' JS. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:54 +05:30
Dhananjay Nakrani
bc76f04ce7 Remove trailing whitespaces. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:54 +05:30
Dhananjay Nakrani
e37616adba Fix coding style issues. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:54 +05:30
Dhananjay Nakrani
c83457fb8a Display appropriate msg while automatically submitting php error report. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:54 +05:30
Dhananjay Nakrani
0b9439a246 Make automatic php error report submission ('sendErrorReport'='always') aysnchronous. Stop infinite auto error reporting loop. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:54 +05:30
Dhananjay Nakrani
026209d51b Add appropriate msgs & js functions to handle user actions. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:52 +05:30
Dhananjay Nakrani
8bfa0be157 Add another parameter to existing js error reporting code. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:52 +05:30
Bimal Yashodha
fc729f4315 PDF pages are managed from designer 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-16 07:07:38 +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
Marc Delisle
1ee589fdb9 Function was used before it was defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-15 13:25:29 -04:00
Marc Delisle
0e5e0afc9a Merge pull request #1227 from D-storm/reset-bug 
fix: reset form button not resetting lock
 2014-06-14 10:56:41 -04:00
Marc Delisle
dcb4163369 Merge commit 'a33fcad' 2014-06-14 09:21:04 -04:00
Christian Simon
47709d414e Fix 'token mismatch' due to missing server parameter for some AJAX requests 
* server_privileges user duplicate request
* js error_reporting
* cf. https://sourceforge.net/p/phpmyadmin/bugs/3893

Signed-off-by: Christian Simon <simon@swine.de>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 09:16:53 -04:00
Chirayu Chiripal
967c8f641c fix: reset form button not resetting lock 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-14 12:15:54 +05:30
Edward Cheng
6eeedfaf37 Update codemirror, because cursor in old version had a wrong position. 
Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-06-14 12:52:02 +08:00
Chirayu Chiripal
b527dc74a1 bugfix-4415,4453,4452,4451: Complete makeover of rfe-1518 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-13 23:56:24 +05:30
Marc Delisle
f9d842fd72 Merge commit '0306e2b' 2014-06-13 07:43:11 -04:00
Atul Pratap Singh
0306e2bd88 Fix bug#4450 Query is duplicated on Ctrl+Enter 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-06-13 11:20:27 +05:30
Atul Pratap Singh
d909aa66b7 Fix bug#4450 Query is duplicated on Ctrl+Enter 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-06-13 11:10:23 +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
Marc Delisle
ceb77ce6d4 Function was used before it was defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-12 08:28:33 -04:00
Marc Delisle
08790597c7 Merge pull request #1220 from smita786/gsoc_central_columns_list 
security bug fixes
 2014-06-11 08:08:08 -04:00
Smita Kumari
b749a7b1d6 security bug fixes 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

Fix coding style

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

use existing escapeHtml function

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-11 17:31:36 +05:30
Marc Delisle
b3ce71f569 Improve English 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-10 08:47:07 -04:00
Michal Čihař
6751384d16 Merge remote-tracking branch 'origin/QA_4_2' 2014-06-10 09:17:47 +02:00
Marc Delisle
00bad7150b Merge pull request #1211 from smita786/gsoc_central_columns_list 
option to Make table consistent with central list of columns
 2014-06-09 12:27:40 -04:00
Smita Kumari
6b8575734c option to Make table consistent with central list of columns 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

make messages transtalable

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

Coding style fix

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

Make confirmation button options translatable

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-09 20:35:10 +05:30
Hugues Peccatte
b95aa6cdfd Remove trailing whitespaces. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-09 16:44:30 +02:00
Michal Čihař
2e20a01abe Fixed indentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-09 10:14:57 +02:00
Madhura Jayaratne
d99088e794 Merge branch 'QA_4_2' 2014-06-08 23:55:22 +05:30