nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,123 Commits 1 Branch 0 Tags
084410abc7b9dd9fb055dc8ebdd7da07e2cc1b0c
Commit Graph

630 Commits

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