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

341 Commits

Author SHA1 Message Date
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
Michal Čihař
e6517db98a More javascript cleanup, more fixes of === / !=== 2013-04-15 13:25:50 +02:00
Michal Čihař
020a3e1ce4 Use type cast safe comparison 
The values like true, '' or 0 could compare to lot of other stuff with
type casting.
 2013-04-15 12:03:11 +02:00
Atul Pratap Singh
f3aa2a3d33 Fix bug 3842: create, alter, drop queries were not shown after execution 2013-03-21 11:13:43 +05:30
ayushchd
14af610aa8 Contest-2 Variable Name Fix 
Changed the variable name from ajax_reload_nav to ajax_reload
 2013-02-25 17:06:50 +05:30
ayushchd
69b73a44b0 Bug fix #3818 After "Rename table ... to ..." left menu doesn't reflect changes 
The left navigationa and the other places where the old table name was
showing up, now updates if the table is renamed.
 2013-02-25 14:28:27 +05:30
Atul Pratap Singh
b9c61c7dc1 Fix bug:3829 Enabling query profiling crashes javascript based navigation 2013-02-22 15:08:14 +05:30
Gemorroj
fc51a91713 many some minor fixes (sorry, see diff) 2013-01-26 15:35:29 +03:00
Marc Delisle
2723495a4f Removed the AjaxEnable directive 2012-12-21 16:04:57 -05:00
Marc Delisle
ab75961279 js cleanup: space after "if" 2012-12-20 05:53:55 -05:00
Rouslan Placella
e9310bf995 Ajaxification for the "Delete row" action 2012-10-30 20:07:02 +00:00
Rouslan Placella
cc895e5c47 Dropped ajaxification of pagination fo SQL results 2012-10-30 20:07:02 +00:00
Rouslan Placella
03c904bcf3 Ajaxification for "Bookamrk this SQL query" form 2012-10-30 20:07:02 +00:00
Rouslan Placella
3ca7d34240 Destroy registered jQuery events on page tear down 2012-10-30 20:07:01 +00:00
Rouslan Placella
5838a44339 Use AJAX.registerOnload() instead of $(document).ready() 2012-10-30 20:07:01 +00:00
Rouslan Placella
a16e723048 Dropped PMA_ajaxResponse() 2012-06-11 17:58:35 +01:00
Rouslan Placella
971db49c11 Expect JSON for every ajax request in JavaScript 2012-06-11 14:06:05 +01:00
Marc Delisle
5c53fb643a Fix merge conflicts 2012-05-24 12:34:15 -04:00
Marc Delisle
8b7b8a8ffe Server status queries chart, with jqplot 
Fix needed: legend wrongly displayed over the right border
 2012-05-11 15:38:35 -04:00
Marc Delisle
a44ee59093 jqPlot for profiling chart 2012-05-11 14:28:08 -04:00
J.M
236cbc8307 Merge branch 'QA_3_5' 2012-05-02 20:15:41 +02:00
J.M
41fd60e8fc Fix regression added in 8147dee: Switching query result pages using arrow buttons did not work 2012-05-02 20:11:46 +02:00
Marc Delisle
0d7465884e Merge branch 'QA_3_5' 2012-05-02 11:12:00 -04:00
Marc Delisle
c888fe462a Message is shown too early 2012-05-02 11:11:52 -04:00
Marc Delisle
5006c7c07a Merge branch 'QA_3_5' 2012-05-02 10:54:42 -04:00
Marc Delisle
8147dee382 bug #3522930 [browse] Missing validation in Ajax mode 2012-05-02 10:54:27 -04:00
Madhura Jayaratne
68a4c2b240 remove() the dialog properly. Now closing the dialog with the X have the same effect as closing it with buttons. 2012-04-29 22:28:34 +05:30
Michal Čihař
e6cca75875 Cleanup spacing after @param 2012-04-27 11:32:47 +02:00
Michal Čihař
a5839a3813 Fix spacing before tags 2012-04-27 11:25:37 +02:00
Rouslan Placella
ff66fdbdf9 Remove stray trailing whitespaces 2012-04-22 00:12:30 +01:00
Jo Michael
13644d8591 Short-hand notation for jQuery document.ready event 2012-04-21 02:44:18 +02:00
Madhura Jayaratne
e118098133 Merge branch 'QA_3_5' 
Conflicts:
	ChangeLog
 2012-04-11 23:05:23 +05:30
Madhura Jayaratne
605650e11e bug #3516761 [edit] Query error after search 2012-04-11 22:56:56 +05:30
Rouslan Placella
6ae5cafb46 Drop @uses tags from JS files 2012-04-10 21:50:34 +01:00
Rouslan Placella
9c16704968 Speed-up selectors 2012-04-10 21:50:34 +01:00
Gemorroj
c3747a56e5 some code standards fixes 2012-04-07 17:10:32 +03:00
Gemorroj
8bdca339f6 Better compatibility with newer versions of jQuery. 
Method of "attr" changed to "prop", method of "removeAttr" changed to "removeProp", attr("value" is replaced by the method of "val".
 2012-04-07 14:27:28 +03:00
Alex Marin
f25ce4c3f8 bug 3464377 Cannot press enter on the VARIABLE field of a bookmark 2012-01-23 12:56:21 -05:00
Marc Delisle
e5323864b7 Make message and field name more consistent with existing interface (query box) 2012-01-07 07:05:25 -05:00
Gareth Pursehouse
73edcc1511 patch #3303195 [interface] Checkbox to have SQL input remain 2012-01-07 07:00:56 -05:00
Eric Krona
87ce60251b Fix for bug #3364150 - feedback in sql query window on insert/updates 2012-01-05 22:36:06 +05:30
Rouslan Placella
0d7b3a5877 Globally prevent AJAX requests from being cached 2011-12-19 20:16:54 +00:00
Rouslan Placella
12eacbffea Error notifications should not time out 2011-11-28 13:47:06 +00:00
Piotr Przybylski
16875ecd70 Followup of Rouslan's recent commit - form field selection should never be based on language strings 2011-11-16 21:21:12 +01:00
Marc Delisle
4336ffca2b As suggested by Tyron Madlener: 
Display the input field for the default value only after "As defined:"
is selected, and also focus it automatically once it's selected so the user
can type immediately
 2011-10-16 09:10:48 -04:00
Madhura Jayaratne
cecf7f9fea typo 2011-09-25 22:21:57 +05:30
Marc Delisle
4c56367ecd Incorrect messages were shown 2011-09-23 08:43:10 -04:00
Marc Delisle
3fc3194bce - Bug #3383572 Cannot execute saved query 
- Remove bookmark from the list after deletion (Ajax)
 2011-09-23 08:14:42 -04:00
Marc Delisle
ff56cbf5d9 Fix bug 3411523 (SQL query tab broken) which was introduced when 
applying the fix for bug #3383572 (Cannot execute saved query), which
works for the 3.4 branch.
 2011-09-22 10:48:29 -04:00
Madhura Jayaratne
2de2e87af7 Adding missing semicolons 2011-09-21 10:05:32 +05:30
Madhura Jayaratne
ddd80be1cb Typo 2011-09-21 10:00:47 +05:30
Marc Delisle
369c9c550a Ajax and bookmark delete 2011-09-20 12:45:19 -04:00
Marc Delisle
516891a6b8 View only bookmark did not work with CodeMirror 2011-09-20 08:47:18 -04:00
Marc Delisle
5e83631469 Fix merge conflicts 2011-09-18 08:26:47 -04:00
Marc Delisle
6ac29b4791 bug #3383572 [interface] Cannot execute saved query 
When the Go button related to the "Run SQL query" section is pressed,
avoid transmitting the value of id_bookmark from the "Bookmarked SQL
query" section; otherwise import.php would think that it needs to
do a bookmark action instead of executing the query.
 2011-09-18 08:11:15 -04:00
Herman van Rink
2f28ce9c80 [security] Fixed XSS in Inline Edit on save action 2011-09-02 13:00:33 -04:00
Madhura Jayaratne
7d7dd02e8c Merge branch 'master' into OpenGIS 
Conflicts:
	tbl_select.php
 2011-08-13 14:12:46 +05:30
Aris Feryanto
ba5598a190 Refactor makegrid.js 2011-08-11 13:35:51 +08:00
Aris Feryanto
a9cd487f0f Fix merge conflict with origin/master 2011-08-10 21:27:31 +08:00
Aris Feryanto
ba7913a260 Remove inline edit feature 2011-08-08 14:07:59 +08:00
Madhura Jayaratne
0e84927693 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/common.lib.php
 2011-08-08 07:45:53 +05:30
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Aris Feryanto
28a18c1727 Grid edit: fix bug - not working if AjaxEnable set to false 2011-08-03 11:58:56 +08:00
Rouslan Placella
c17add38ed Fixed bug #3374802 - Comment on a column breaks inline editing 2011-08-02 16:15:39 +02:00
Madhura Jayaratne
516557716a Remove the content when AJAX dialog closes 2011-07-31 16:10:51 +05:30
Aris Feryanto
1e2f73c6e9 Fix bug: PMA_urlencode didn't encode space character correctly 2011-07-29 16:14:06 +08:00
Michal Čihař
f34dfda0fe Merge remote-tracking branch 'tyron/master' 
Conflicts:
	js/functions.js
	js/server_status.js
	js/sql.js
	libraries/common.lib.php
	server_status.php
	themes/pmahomme/css/theme_left.css.php
 2011-07-25 11:32:22 +02:00
Tyron Madlener
ace73f25bb - Added missing CSS Sprites, Icon sprites now also for PMA_linkOrButton() 
- Rewrote PMA_linkOrButton() to rely on Javascript, making the code way less complicated
- Removed legacy support of Javascript 1.1 or lower
- Fixed a bug in cases where PMA_linkOrButton() creates a form, which when clicked required a js confirm, the confirm is being displayed a second time after the form is submitted.
 2011-07-23 09:23:18 +03:00
Tyron Madlener
9f343e6ead Merge remote-tracking branch 'origin/master' 
Conflicts:
	js/functions.js
	libraries/common.lib.php
	libraries/header.inc.php
	server_status.php
 2011-07-21 17:41:06 +03:00
Michal Čihař
ba395f545e Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-21 16:14:47 +02:00
Michal Čihař
4720ed20fd Whitespace cleanup 2011-07-21 16:05:23 +02:00
Michal Čihař
0f9de30479 Coding style 2011-07-21 16:05:18 +02:00
Marc Delisle
47dd2a0143 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-21 09:54:28 -04:00