nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,977 Commits 1 Branch 0 Tags
0645663aa937f616976d7fe829213a42609bb92a
Commit Graph

4092 Commits

Author SHA1 Message Date
Marc Delisle
82acbb2ba3 fix merge conflicts 2010-08-21 07:46:57 -04:00
Marc Delisle
7be8236208 comment was no longer accurate 2010-08-20 08:46:59 -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ř
59b3b4916b Escape error message coming from MySQL to avoid XSS on bad parameters. 2010-08-20 11:35:42 +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
Michal Čihař
d2e0e09e0d Fix XSS with $cfg['SQP']['fmtType'] = 'text'. 2010-08-20 10:38:32 +02:00
Crack
a5417a0ce7 add custom-no-form to Export/method 2010-08-19 20:35:49 +02:00
Crack
e344696016 account for changes introduced when merging lori/gsoc branch 2010-08-19 16:36:41 +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
Michal Čihař
6aefc832ad Fixes for JSON plugin. 2010-08-19 14:05:04 +02:00
Michal Čihař
c7815a8650 Fix typo. 2010-08-19 11:47:39 +02:00
Michal Čihař
d76fe3856b Remove some HTML from translatable strings. 2010-08-19 11:35:45 +02:00
Michal Čihař
660324620c No HTML for translators. 2010-08-19 11:32:26 +02:00
Michal Čihař
3f33397651 No need to translate SQL statements. 2010-08-19 11:31:28 +02:00
Michal Čihař
882892af23 Better translatable messages. 2010-08-19 11:30:44 +02:00
Michal Čihař
763aff5a6f Use format strings. 2010-08-19 11:30:32 +02:00
Michal Čihař
124ba18d03 Better to use format strings. 2010-08-19 11:26:34 +02:00
Michal Čihař
c5a3288396 Merge remote branch 'lori/gsoc' 2010-08-19 11:11:51 +02:00
Michal Čihař
26c79f55c5 Backward compatibility for language cookies. 2010-08-19 10:52:58 +02:00
Michal Čihař
1f248cc254 Simplify code to use native tcpdf functions. 2010-08-18 13:58:52 +02:00
Michal Čihař
48e9096600 Properly check validity of sort parameter. 2010-08-18 12:31:54 +02:00
Michal Čihař
25ac7de38c Document PMA_sanitize. 2010-08-18 11:42:08 +02:00
Michal Čihař
00add5c43f Add option to escape PMA_sanitize output. 
This is required when it is used in form values.
 2010-08-18 11:38:19 +02:00
Michal Čihař
533e102135 Fix handling of unknown sort order. 2010-08-18 11:30:19 +02:00
Michal Čihař
0f39dc040a Merge branch 'QA_3_3' 2010-08-17 15:31:06 +02:00
Michal Čihař
e8cf1ac677 Generate new token on forcible generating of session id. 2010-08-17 15:30:47 +02:00
lorilee
8fa03264e4 Added comments 2010-08-14 15:14:45 -07:00
lorilee
e7ac520670 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-08-14 14:40:42 -07:00
lorilee
ed918c070b Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-08-14 14:39:59 -07:00
lorilee
03fdce14c4 Checks if value is a string before calling urldecode() 2010-08-14 14:10:18 -07:00
lorilee
955df80a30 Set properties to be text and icons by default 2010-08-14 11:47:44 -07:00
Marc Delisle
bda213a5ac bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop 2010-08-11 10:48:05 -04:00
lorilee
5dafeb467f Added Quick export options 2010-08-10 22:12:46 -07:00
lorilee
4482228f66 Back button on export.php page 2010-08-10 22:11:57 -07:00
lorilee
90c0e573f7 Fixed formatting 2010-08-10 20:43:57 -07:00
Marc Delisle
dda6de20d2 bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop 2010-08-10 17:55:04 -04:00
lorilee
1c0b81d477 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-08-09 13:36:31 -07:00
lorilee
6f833918e9 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-08-09 13:35:27 -07:00
Marc Delisle
75d5afd401 merge conflict 2010-08-07 06:30:13 -04:00
Marc Delisle
04c2f9d254 bug #3040226 [XHTML] LockFromUpdate checkbox not checked by default 2010-08-07 06:27:04 -04:00
Crack
97c939f8df Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-08-06 15:24:15 +02:00
Crack
e6170b2dc2 comments 
output escaping
 2010-08-06 15:17:53 +02:00
Crack
bcaec73441 sort messages 2010-08-06 14:56:52 +02:00
Crack
60329f14cb blacklist and settings debug code shown if $cfg['DBG']['php'] is true 2010-08-06 14:36:26 +02:00
lorilee
8b199f7e3a Replacing old tooltip with new jQuery plugin 2010-08-05 18:23:52 -07:00