webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-11-01 23:14:58 +03:00
Code Activity
98,935 Commits 12 Branches 481 Tags
bbd581a9068ccb5da6637f7a6bbbb25de386eef8
Commit Graph

234 Commits

Author SHA1 Message Date
Marc Delisle
0d94439eda Improve a message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-30 08:31:35 -04:00
Madhura Jayaratne
f6dd7c2cd4 Pass local_import_file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-30 16:14:59 +05:30
Madhura Jayaratne
4c0b0f9687 bug #4821 Timed-out import fails to restart when file represented 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-30 16:01:51 +05:30
Marc Delisle
44c28bd5a2 Merge branch 'QA_4_3' into QA_4_4 2015-03-11 15:59:28 -04:00
Dan Ungureanu
446d35f859 Bug #4784 Incomplete bookmark saving 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-03-11 15:58:07 -04:00
Marc Delisle
535db88e47 Merge branch 'QA_4_3' 2015-01-20 12:48:58 -05:00
RAKESH KUMAR
915f209ca1 BugFix#4714 
Signed-off-by: RAKESH KUMAR <rakeshkumar4294@gmail.com>
 2015-01-20 19:34:12 +05:30
Marc Delisle
629e08cbc4 Code cleanup: $disp_mode was always empty at this point 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-28 09:48:04 -05:00
Madhura Jayaratne
3621900b96 Merge branch 'QA_4_3' 2014-12-22 17:10:35 +05:30
Madhura Jayaratne
fbe587ce73 bug #4661 Drag and drop file import always fails 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-22 17:09:10 +05:30
Hugues Peccatte
603498a6fc Fix #4593 Manual SELECT doesn't change active table 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 14:01:55 +01:00
Hugues Peccatte
eda24da12e Fix #4593 Manual SELECT doesn't change active table 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 00:57:38 +01:00
Marc Delisle
47b1f9e6b2 Merge pull request #1397 from madhuracj/multiquery 
Multiquery
 2014-11-22 07:28:54 -05:00
Madhura Jayaratne
fc340c3e87 Use variable 'bookmark_variable' directly from REQUEST 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-14 12:41:47 +05:30
Madhura Jayaratne
83a4a2d896 action_bookmark_all was never added to GLOBALS, use from REQUEST directly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-14 12:38:42 +05:30
Madhura Jayaratne
f9248d3ee2 Use request params directly, 'id_bookmark' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-14 12:34:58 +05:30
Madhura Jayaratne
303dfd7fec User request params directly, 'action_bookimark' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-14 12:31:32 +05:30
Madhura Jayaratne
89158e98a7 Use request data directly for 'allow_interrupt' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-14 12:21:36 +05:30
Madhura Jayaratne
2352809dae Use query execution and results display mechanism multiple time for multi queries 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-12 12:58:54 +05:30
Madhura Jayaratne
ff5e32553e Executing multiple SQLs - add missing parameter 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-12 10:54:44 +05:30
Madhura Jayaratne
52e0087b0e Long messages wrapped 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-11 17:45:59 +05:30
Hugues Peccatte
037a034b43 Minor coding style modifications. 
Fix typos.
PHPDoc and JSDoc updates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:04:35 +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
Marc Delisle
62d04772ed Merge commit '2b4ed22' 2014-10-28 15:53:38 -04:00
Marc Delisle
2b4ed22505 bug #4572 missing trailing slash (import and open_basedir) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-28 15:51:10 -04: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
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
8a3bf5af9f Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-20 13:14:05 -04:00
Ann + J.M
b1a7039ae3 Convert PMA_URL_getCommon calls to new style 
Rewritten tests need validation
Signed-Off-By: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:29 +02:00
Hugues Peccatte
49ababac08 Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-04 10:09:06 +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
Hugues Peccatte
f9dd601397 Coding style modifications. 
Refactoring.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-14 16:16:47 +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
Hugues Peccatte
30e0dc70cc Coding style modifications. 
Remove unused variables.
PHPDoc update.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-08-09 23:11:36 +02:00
Marc Delisle
65ab32fc7b Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-02 08:22:30 -04:00
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
Marc Delisle
4711be3952 Simplify test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-28 10:19:51 -04:00
Marc Delisle
00fc921ebd Fix execution path notice 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-28 08:40:20 -04:00
Marc Delisle
605381469f Clarify variable's origin 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-25 11:54:56 -04:00
Atul Pratap Singh
7731971f9e Merge branch 'QA_4_2' 2014-07-08 20:34:08 +05:30
Atul Pratap Singh
2e76e83408 Fix bug 4483/4440: selflink was disappearing in certain cases 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-07-08 20:05:46 +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
Ann + J.M
a995e28258 Fix coding style in import.php 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-07-02 22:30:12 +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
Ashutosh Dhundhara
04d7be1b06 RFE#869: Run SQL query: Allow rollback for InnoDB tables. 
Rollback support for other Transactional engines other than InnoDB.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-22 22:41:23 +05:30
Ann + J.M
6b778e09d9 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-22 16:34:34 +02: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
Marc Delisle
052eb0ecac Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-13 07:44:39 -04:00
Marc Delisle
531fff09fe bug #4405 Cannot import (open_basedir): fix another case 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-13 07:42:14 -04:00