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

724 Commits

Author SHA1 Message Date
Madhura Jayaratne
27224a88c5 Bug #3298581 - Row marking, null-checkbox of inline edit broken 2011-05-07 11:16:00 +05:30
Rouslan Placella
56fc953b57 Fixed issue #2 in bug #3291301 - Problems with inline edit link for sql query 2011-05-05 08:45:09 +02:00
Rouslan Placella
bacbe54a67 Fixed issue #1 from bug #3291301 (Problems with inline edit link for sql query) 2011-05-05 08:45:06 +02:00
Marc Delisle
73c57b099e Continue to replace warning level with error level 2011-05-03 19:05:24 -04:00
Piotr Przybylski
5c39c5511f Comments formatting and PHPDoc fixes 2011-05-02 20:50:16 +02:00
Marc Delisle
932b5c2c36 Improve variable name and formatting 2011-04-18 12:30:59 -04:00
onebighack
14395afa8d Patch #3276121 Inline link goes missing after table sort 2011-04-18 12:27:37 -04:00
Marc Delisle
29dbdde4ff Avoid displaying a Back link in a error message if we are in Ajax mode 2011-03-23 08:10:22 -04:00
Michal Čihař
24396fe024 There are no empty/drop tabs anymore 2011-03-18 14:52:08 +01:00
Michal Čihař
95bc3c92aa Allow to specify value parameter for PMA_buttonOrImage 2011-03-18 14:36:10 +01:00
Marc Delisle
419d067dc3 Extra line break generated when creating user via Ajax 2011-03-02 13:01:17 -05:00
Thilanka
a994e13c33 Ajaxify browse and delete criteria in DB search 2011-02-28 12:44:44 -05:00
Michal Čihař
d1a6410766 Edit is more appropriate here 2011-02-24 16:08:22 +01:00
Marc Delisle
984cf6dbad For bug 3168757: 
- Use jQuery to make the text look and behave like a link
 2011-02-24 06:04:49 -05:00
Marc Delisle
b78bd77e41 For bug 3168757: 
- Change default link length limit to 2000
- Add text next to the image
 2011-02-24 05:21:24 -05:00
Marc Delisle
019b9de9da For proper conversion of the Edit link to Inline Edit 2011-02-22 07:48:47 -05:00
Marc Delisle
67339bab2a Current code has problems with Ajax, for example when creating a user. 
There are missing headers and this commit is an attempt to fix this
situation.
 2011-02-19 07:49:49 -05:00
Michal Čihař
cf4d86532e Link to MySQL 5.5 documentation on servers running MySQL 5.5 2011-02-17 10:59:00 +01:00
Michal Čihař
4c18383524 Better context for documentation links 2011-02-17 10:55:14 +01:00
Michal Čihař
9ce8bb0e87 This function needs to be in core.lib as it uses it 2011-02-17 10:50:47 +01:00
Michal Čihař
42cf4f8660 Factor out code for getting PHP documentation link 2011-02-17 10:44:16 +01:00
Michal Čihař
20509753ef Display documentation for chosen PHP extension. 2011-02-17 10:31:42 +01:00
Michal Čihař
69c0a887fc bug #3177136 [interface] Indicate that bookmark is being used on browse. 2011-02-10 10:15:07 +01:00
Michal Čihař
cd74e9fa5d bug #3175227 [auth] Reset user cache on login. 2011-02-08 13:15:01 +01:00
Michal Čihař
d296a5222b Avoid new lines between elements as this can lead to spaces 2011-02-02 22:55:10 +01:00
Michal Čihař
a0d08a3321 Move javascript for sliders to functions.js. 2011-02-02 16:04:22 +01:00
Michal Čihař
3cb9916d8b Do not go to the anchor after expanding slider. 2011-02-02 15:36:41 +01:00
Michal Čihař
599492943d This should clear possible floats 2011-02-02 14:12:54 +01:00
Michal Čihař
67e4994490 Single place to handle redirection. 2011-01-31 15:22:25 +01:00
Michal Čihař
dc0c6938b2 [security] Redirect external links to avoid Referer leakage. 2011-01-28 13:22:41 +01:00
Marc Delisle
5464b54e17 Start implementing conditional Ajax (in results page) 2011-01-22 09:50:12 -05:00
Marc Delisle
6094e6c644 - Bug #3151925 Page selector dropdown broken with ORDER BY query 
- PMA_pageselector() had an unused parameter
 2011-01-08 15:14:00 -05:00
Marc Delisle
4beca2fe92 Use the clip effect instead of the drop effect 2011-01-03 17:37:33 -05:00
Marc Delisle
a1ad4b295c Message was not under gettext 2010-12-27 07:14:10 -05:00
Marc Delisle
79f320e951 remove author names 2010-12-04 06:41:10 -05:00
Michal Čihař
89f03ef81b bug #3123433 [interface] Avoid double escaping of MySQL errors. 
The PMA_DBI_getError function already does escaping, so there is no need
to escape that string again on displaying.
 2010-12-02 17:14:59 +01:00
Michal Čihař
219f5a4fb9 Whitespace cleanup. 2010-12-02 17:13:47 +01:00
Michal Čihař
a480379bae Remove not used variable. 2010-12-02 17:05:57 +01:00
Herman van Rink
6d3b66059a bug #3115519: fixed XSS on search 2010-11-26 09:12:01 -05:00
Marc Delisle
9f4dc04691 no need to have a separate file for this 2010-11-05 06:30:21 -04:00
Marc Delisle
7d0c11c256 class nowrap was missing; div not allowed here 2010-10-09 09:05:54 -04:00
Marc Delisle
452dce72a2 missing end tag 2010-10-09 06:49:55 -04:00
Marc Delisle
b5cd7e69ea inline edit (in tools) and ajax mode 2010-10-08 13:21:27 -04:00
Marc Delisle
316ea9f006 prevent a call with incorrect parameter value 2010-09-19 09:26:49 -04:00
ninadsp
aed2e27b3f A better solution to the caching issues faced. Set jQuery's global Ajax parameter 'cache' to false, and also set the 'Cache-Control' header to 'no-cache' 2010-09-02 15:10:58 -04:00
Michal Čihař
d2de55cb0b Merge branch 'QA_3_3' 2010-08-31 11:44:30 +02:00
Marc Delisle
1b812f2d25 undefined variables after deleting a user 2010-08-30 12:54:12 -04:00
Michal Čihař
1d67babd52 Do not fail on non analyzed query (eg. because of parser failure). 2010-08-30 16:11:46 +02:00
Michal Čihař
d17fba309c Fix permissions. 
Most files were made executable somewhere in ninadsp tree, reverting
this.
 2010-08-30 09:53:37 +02:00
ninadsp
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
Herman van Rink
b477c4cb1a Merge branch 'blinky/master' into gsoc2010-blinky 
Conflicts:
	Documentation.html - renumbered 6.28 to 6.29
 2010-08-25 16:59:54 +02:00
ninadsp
7f9d141a85 Removed the blank new line at the end, which was causing issues 2010-08-24 18:25:09 +05:30
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Marc Delisle
82acbb2ba3 fix merge conflicts 2010-08-21 07:46:57 -04:00
Marc Delisle
22eaa592ca unused code 2010-08-20 08:43:09 -04:00
Michal Čihař
862e3ca2a7 Merge branch 'QA_3_3' 
Conflicts:
	libraries/core.lib.php
	server_databases.php
	server_privileges.php
 2010-08-20 13:40:37 +02:00
Michal Čihař
41145feb12 Merge branch 'MAINT_3_3_5' into QA_3_3 
Conflicts:
	ChangeLog
	libraries/common.lib.php
 2010-08-20 13:36:49 +02:00
Michal Čihař
bf60ec82e9 Fix possible XSS on IIS redirect page. 2010-08-20 11:20:10 +02:00
Michal Čihař
5128563d07 Merge branch 'QA_3_3' 
Conflicts:
	libraries/common.lib.php
	libraries/core.lib.php
 2010-08-20 11:11:27 +02:00
Michal Čihař
893abac3e5 bug #3042495 [core] Move PMA_sendHeaderLocation to core.lib.php. 
It might be needed from common.inc.php even if PMA_MINIMUM_COMMON is
defined.
 2010-08-20 11:09:15 +02:00
Herman van Rink
f273e6cbf6 Fix XSS on error with very long query. 2010-08-20 10:42:03 +02:00
Crack
b8cee3086b Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	js/functions.js
	js/tooltip.js
	libraries/config.default.php
	libraries/config.values.php
	libraries/display_export.lib.php
	setup/lib/forms.inc.php
	setup/lib/messages.inc.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
 2010-08-19 14:45:18 +02:00
ninadsp
0b2b21712e Added documentation to PHP files 2010-08-15 01:50:47 +05:30
lorilee
841fba88d5 Removing alt text since it interferes with tooltip 2010-08-05 18:23:18 -07:00
lorilee
646627b911 Updated tooltips using the new tooltip plugin; the code in js/functions.js was moved from js/tooltip.js (with new code appended); <sup> IDs not needed 2010-08-05 18:05:25 -07:00
Crack
53e8d75c0f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/db_links.inc.php
	libraries/tbl_links.inc.php
 2010-08-01 23:19:21 +02:00
lorilee
f1686d5172 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-29 14:12:36 -07:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Martynas Mickevicius
b0888714b6 Merge commit 'origin/master' into local 
Conflicts:
	server_status.php
 2010-07-29 14:14:26 +03:00
lorilee
8120a00af7 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-28 15:03:28 -07:00
lorilee
1faaa80b51 Fixing HTML markup 2010-07-28 15:00:36 -07:00
Michal Čihař
05160b3e03 No need for full columns here. 2010-07-27 10:07:55 +02:00
Michal Čihař
39aa4355a9 Convert default queries to unified expansion. 2010-07-27 10:01:58 +02:00
lorilee
428053bef5 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-26 13:44:30 -07:00
lorilee
2a59451ac5 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	server_export.php
 2010-07-26 13:42:42 -07:00
Crack
7db978de3f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/config.values.php
 2010-07-26 20:24:57 +02:00
Michal Čihař
d291827444 No need to require_once footer 
It is the last thing executed anyway (ends with exit).
 2010-07-26 16:20:24 +02:00
Michal Čihař
bcc372b5c5 Merge branch 'QA_3_3' 2010-07-26 15:51:48 +02:00
Michal Čihař
049fc7fef7 bug #3031705 [core] Fix generating condition for real numbers by comparing them to string. 2010-07-26 15:51:26 +02:00
Crack
2d67cb58c4 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/relation.lib.php
 2010-07-24 18:34:52 +02:00
lorilee
89b0a3082e Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-23 21:06:46 -07:00
lorilee
723a71c014 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/export/latex.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
 2010-07-23 20:43:35 -07:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Marc Delisle
56ebe05af7 blob streaming code cleanup (work in progress) 2010-07-22 13:15:27 -04:00
Barry Leslie
f8653e5803 Update blob streaming to match the current API and use the PBMS PHP extension. 2010-07-22 11:23:37 -04:00
Marc Delisle
8e98c5dd03 bug #3030862 (master only) inline sql edit got undefined 2010-07-22 08:47:47 -04:00
Michal Čihař
06cf763358 [interface] Better formatting for SQL validator results. 2010-07-21 13:45:32 +02:00
Michal Čihař
f5aa40b02f Catch error when connection to validator service fails. 2010-07-21 13:32:26 +02:00
Michal Čihař
e5e340e525 Proper propagating of overrided values. 2010-07-21 10:16:30 +02:00
Michal Čihař
7a788a52b9 Document why __VAR__ is there. 2010-07-21 10:07:03 +02:00
Michal Čihař
2040be9611 Documentation. 2010-07-21 09:56:05 +02:00
Michal Čihař
9b2aa3c40d Indentation. 2010-07-21 09:55:13 +02:00
Michal Čihař
7415caa4e4 LaTeX export uses PMA_expandUserString. 2010-07-21 09:51:24 +02:00
Michal Čihař
32910a9b28 Cleanup in PMA_expandUserString. 2010-07-21 09:43:38 +02:00
Michal Čihař
b24a566eba Export uses same expanding as title. 2010-07-21 09:36:28 +02:00
Michal Čihař
40aaa768dd Factor out variable expanding. 2010-07-21 09:30:31 +02:00
Michal Čihař
ce9e7a9462 Not used anywhere. 2010-07-21 09:26:00 +02:00
lorilee
aa49b85fad Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-20 15:23:12 -07:00
lorilee
2ebf96d242 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php
 2010-07-20 13:04:03 -07:00
Michal Čihař
3e57a8eca9 No @uses __('Something'). 2010-07-20 15:06:34 +02:00