webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity
97,478 Commits 12 Branches 481 Tags
8b2a516070db28362160c119ce825dfb1308e8b3
Commit Graph

341 Commits

Author SHA1 Message Date
Hugues Peccatte
19b9c893fc Fix #4593 Refresh navigation tree on manual select into SQL tab. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 22:01:17 +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
Madhura Jayaratne
0023d15cdb Merge branch 'master' into update 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-04 18:13:31 +05:30
Madhura Jayaratne
60079cd297 As of 1.9, the event name string "hover" is no longer supported as a synonym for "mouseenter mouseleave" 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-04 12:23:06 +05:30
Ann + J.M
9d13de4ead Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-12-02 20:10:55 +01:00
Madhura Jayaratne
410d1c32df .live() and .die() methods are deprecated. Use .on() and .off() methods instead 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-02 17:07:46 +05:30
Madhura Jayaratne
7e01f79fee ID is no longer used to facilitate multiple result sets 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-02 12:49:27 +05:30
Madhura Jayaratne
f2782eb957 Remove table_results ID field 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 15:25:22 +05:30
Madhura Jayaratne
a362667e3c Use class attribute instead of id for sqlqueryresults 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 10:44:36 +05:30
Madhura Jayaratne
4cf4e41dec Table filtering for multiquery 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 08:27:10 +05:30
Madhura Jayaratne
501a4c9c1f Use sqlqueryresultsouter to show USE or DROP query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 13:44:30 +05:30
Madhura Jayaratne
be9a324138 This is redundant 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 12:58:52 +05:30
Madhura Jayaratne
d21f37b3f1 Use class to identify bookmarkQueryForm 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 12:51:30 +05:30
Madhura Jayaratne
4327a98910 Use div id sqlqueryresultsouter in SQL tab since sqlqueryresults clashes with the results returned 2014-11-28 12:30:06 +05:30
Madhura Jayaratne
b1ab5e3e5b Avoid using #table_results for jQuery selections 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 20:43:59 +05:30
Madhura Jayaratne
ff393b207e Remove id field from displayOptionsForm 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 17:05:06 +05:30
Madhura Jayaratne
e528721543 Show messages for mulitquery 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 16:26:37 +05:30
Madhura Jayaratne
591fde9ed7 No longer need special handling since we are using the same div 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 15:30:10 +05:30
Madhura Jayaratne
36693cf6c3 Use the same div to show message when no rows are returned 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 15:27:18 +05:30
Madhura Jayaratne
183aae0c3f rfe #1556 Disabling Show all 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-13 12:42:16 +05:30
Madhura Jayaratne
52596698a7 Prompt to confirm on Show All 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-13 10:53:29 +05:30
Marc Delisle
4246606798 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-12 08:02:55 -05:00
Madhura Jayaratne
a8866653ec Fix merge error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 14:29:49 -08:00
Madhura Jayaratne
5b2fff405f Merge branch 'QA_4_2' 
Conflicts:
	js/sql.js

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 13:48:02 -08:00
Madhura Jayaratne
e4d5503bcf bug #4577 Additional fix for table structure page. Multi submits can be inputs as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 13:31:51 -08:00
Madhura Jayaratne
4d16273018 Merge branch 'QA_4_2' 
Conflicts:
	js/sql.js

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 13:04:06 -08:00
Madhura Jayaratne
eef8565b73 bug #4577 Multi row actions cause full page reloads 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-04 13:00:03 -08:00
Atul Pratap Singh
c70e109bd6 Feature#1546 Replace js sprintf library with a better one 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-10-03 17:08:25 +05:30
Atul Pratap Singh
50aa2df9c2 Merge branch 'QA_4_2' 2014-09-18 17:32:58 +05:30
Dean Moncaster
95911ff20f Sticky column headers were getting wrongly aligned, http://stackoverflow.com/questions/24635110/phpmyadmin-column-headers-move-in-table-when-you-scroll 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-09-18 17:22:18 +05:30
Marc Delisle
4def6c262b Merge branch 'QA_4_2' 2014-09-05 12:39:14 -04:00
Marc Delisle
efbf606a4d bug sql.js: str is undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-05 12:38:04 -04:00
Marc Delisle
861b0b0954 Merge branch 'QA_4_2' 2014-08-20 12:29:20 -04:00
Marc Delisle
4992cea190 bug #4520 sql.js: cannot read property 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-20 12:27:05 -04:00
Marc Delisle
38b8cd7a80 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 12:40:53 -04:00
Madhura Jayaratne
647c9d12e3 bug #4501 [security] XSS in table browse page 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 08:45:10 -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
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
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
Ann + J.M
43d1239583 Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-24 16:48:53 +02:00
Chirayu Chiripal
58dba3809f fixed browse foreign values copying description in input field 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-22 13:49:05 +05:30
Chirayu Chiripal
c3f2abe873 FR #1487: Browse Foreign Values should be modal dialog 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-14 17:30:11 +05:30
Marc Delisle
b0c1a01556 bug #4385 Grid edit on sorted columns fails 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-06 08:26:02 -04:00
Ashutosh Dhundhara
5ea6345adb Filter rows option on "Browse" table page. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Filter rows feature on "Browse" table page.

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

Included table filter plugin in tbl_select.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-31 17:52:48 +05:30
Marc Delisle
0fb3b29f72 Merge branch 'QA_4_1' 2014-02-20 06:49:09 -05:00
minhaz
2c7ba06ab7 bug fix #4292 
Signed-off-by: A V Minhaz <minhazav@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-20 06:45:14 -05:00
Atul Pratap Singh
e499344194 Enable hovering, marking of columns via sticky header also 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-04 17:45:40 +05:30
Atul Pratap Singh
2850e9f484 On resizing and rearranging columns, update sticky header 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-04 17:22:08 +05:30
Atul Pratap Singh
435739e95a Avoid error if event handler's teardown didn't happen 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2013-12-27 20:07:46 +05:30
Madhura Jayaratne
74a7e1c0a4 Merge branch 'QA_4_1' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2013-12-26 19:07:50 +05:30