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

3443 Commits

Author SHA1 Message Date
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
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
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
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
Madhura Jayaratne
8926c80837 Add a comment to explain the scenario 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-06-08 23:48:24 +05:30
Madhura Jayaratne
55e87fe8fe bug #4434 Unchecking 'Show SQL queries' results NaN 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-06-08 23:44:39 +05:30
Marc Delisle
d7a7d68df7 Improve a message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-07 15:41:37 -04:00
Marc Delisle
fd2f1919bf Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-07 15:38:41 -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
a6547d9693 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-07 06:40:42 -04:00
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
Madhura Jayaratne
d4b241e71d Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-06-06 12:07:36 +05:30
Madhura Jayaratne
0c159c56f2 Allow saving query charts as images 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-06-06 12:06:13 +05:30
Ashutosh Dhundhara
428f985070 Display loading icon while fetching real row count. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-03 13:09:33 +05:30
Marc Delisle
3d668e6ae0 Merge pull request #1198 from smita786/gsoc_central_columns_list 
Gsoc central columns list
 2014-06-02 12:32:32 -04:00
Smita Kumari
abdb92e290 fiixed Typs plus remove default from text field 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-02 21:00:17 +05:30
Smita Kumari
1ec1f2b7ab removing trailing whitespace 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-02 09:18:06 +05:30
Smita Kumari
175b69b72b central columns management page basic 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

central columns management page edit/delete

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

added column length to central columns table

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

fix edit issu

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

remove logging and alert statement

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

delete an entry fixed

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

col_length default to 0 + filter rows

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

fix menu tab test case

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

fix col_length datatype plus menu tst case fix

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

added cancel button

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

sprite regenerate for adding cntral columns icon

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

removing default value from col_length of type text

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

message format

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

search fix plus uitablfilter plugin modify to take elements to limit search to

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

refactoring db_cntral_columns.php plus file description in db_cntral_columns.js

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

added table sorting

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

fix js error for empty central columns

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

refactoring of code plus adding option to add a column to central list

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

removing trailing white spaces

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

handle condition if central list is empty

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-02 01:57:50 +05:30
Marc Delisle
a4cbabc533 Revert fix for bug #4415 that was not in this branch 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-01 13:34:41 -04:00
Marc Delisle
a7b6120b68 Merge commit 'f5ee17f' 2014-06-01 13:13:36 -04:00
Marc Delisle
d709c7313c Merge pull request #1202 from shivamdixit/bug_4415 
Fixed #4415 Displaying prompt when user navigates away from page
 2014-06-01 13:11:19 -04:00
Shivam Dixit
db2c3ef25a Added comments to bug fix #4415 
Signed-off-by: Shivam Dixit <shivamd001@gmail.com>
 2014-06-01 22:10:18 +05:30
Marc Delisle
48153344f4 Complete the bugfix 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-01 09:19:42 -04:00
Shivam Dixit
750f3d5f51 Fixed #4415 Show a prompt when user navigates away from insert page without saving 
Signed-off-by: Shivam Dixit <shivamd001@gmail.com>
 2014-06-01 17:22:24 +05:30
Marc Delisle
f28cc43b28 Merge commit '206f4f4' 2014-05-31 15:31:19 -04:00
Shivam Dixit
979adb9382 Fixed #4394 Drop table confirmation message when dropping a user 
Signed-off-by: Shivam Dixit <shivamd001@gmail.com>

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-31 15:27:10 -04:00