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

247 Commits

Author SHA1 Message Date
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