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
95,206 Commits 12 Branches 481 Tags
b5bceca386aac516943a514bdd0f75fbb4c323cd
Commit Graph

313 Commits

Author SHA1 Message Date
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
Madhura Jayaratne
9ab62d5e17 bug #4200 Missing syntax highlighting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2013-12-26 19:03:17 +05:30
Atul Pratap Singh
b7bef8471a Add some docblocks 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2013-12-26 14:28:11 +05:30
Atul Pratap Singh
635c5fc641 Feature#1478 Make Column Headings Sticky 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2013-12-26 14:27:37 +05:30
Madhura Jayaratne
491059843f bug #4187 SQL query inline edit doesn't post changes on the first run 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2013-12-22 15:11:44 +05:30
Marc Delisle
9e8a9f8d5c Fix merge conflicts 2013-11-13 07:13:52 -05:00
Spun Nakandala
cff55cd200 removed to fix bug 4141 2013-11-13 15:50:46 +05:30
Marc Delisle
5aee1c8f64 Fix merge conflicts 2013-11-12 07:03:02 -05:00
Spun Nakandala
f5fc4e0ae8 removed to fix bug 4141 2013-11-12 01:20:43 +05:30
Madhura Jayaratne
531950b73a Fix duplicate IDs. Remove bookmark section when there are no bookmarks 2013-10-18 10:44:40 +05:30
Kasun Chathuranga
8d70cd4dec Merge branch 'QA_4_0' into merge. Resolved conflicts. 2013-09-03 14:13:02 +05:30
Kasun Chathuranga
9c8267a9a8 Properly open and select database when "Use <db>" command is issued 2013-08-31 12:42:45 +05:30
Atul Pratap Singh
f7e298bbf4 Remove multiple navigation reloads, fix autoexpand on use query 2013-08-27 17:34:45 +05:30
Atul Pratap Singh
ccecfcf345 Merge branch 'QA_4_0' 2013-08-26 18:20:13 +05:30
Atul Pratap Singh
f0b063400c fix autoexpand on use query 2013-08-25 18:45:11 +05:30
Michal Čihař
43988b3201 Various coding style improvements 2013-07-30 14:36:43 +02:00
Marc Delisle
f5639ca63d Clarify comments 2013-07-22 15:28:31 -04:00
Spun Nakandala
a025fe1781 typo corrected 2013-07-23 00:26:02 +05:30
Spun Nakandala
96836745c4 error coorected 2013-07-23 00:17:52 +05:30
Spun Nakandala
d80fa9452e taken care by sql.js in client side 2013-07-22 22:50:50 +05:30
Spun Nakandala
178cb59362 error of deleting a row after searching corrected 2013-07-06 12:37:32 +05:30
Marc Delisle
38115f6efd Merge pull request #399 from nijel/codemirror-highlight 
Codemirror highlight
 2013-05-25 11:18:31 -07:00
Michal Čihař
31cfc4e34e Hook SQL highlighter to more places 
Unfortunately there are quite many places where SQL query might appear,
hopefully I've made it correctly.
 2013-05-24 09:59:38 +02:00
Brad Jorgensen
c56e42bc22 typo fix 2013-05-15 09:57:40 -05:00
Brad Jorgensen
4d79fabac3 implementation of feature request #1363 2013-05-15 09:54:18 -05:00
Michal Čihař
27b213431c Reference javascript messages by dot notation instead of using ['strFoo'] 2013-04-16 13:32:51 +02:00
Michal Čihař
e2571c5628 Various javascript spacing fixes 2013-04-15 16:20:04 +02:00
Michal Čihař
a1b6f206b2 Various spacing and identation fixes 2013-04-15 15:13:14 +02:00
Michal Čihař
c935413fcc Various javascript fixes 
- missing ;
- confusing !
 2013-04-15 14:10:53 +02:00