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

4405 Commits

Author SHA1 Message Date
Michal Čihař
ac5cab4f6f These should be translatable as well. 2010-08-27 16:16:54 +02:00
Marc Delisle
c9d4d52fff correct template variable 2010-08-27 10:03:52 -04:00
Crack
a82b355fc9 simplified PMA_SETUP checks 2010-08-27 15:57:45 +02:00
Crack
1dba66c13f user cannot restore a setting to its default value if it's set in config.inc.php 2010-08-27 15:55:06 +02:00
Herman van Rink
51c9c1763e Code cleanup, mostly added extra spaces 2010-08-26 17:01:12 +02:00
ninadsp
43c18c50b8 Incorrect resolution of merge conflict was causing the database name to not show up on the serverinfo div. Fixed it 2010-08-26 20:19:51 +05:30
Herman van Rink
58f8ebc23c Merge branch 'master' into gsoc2010-blinky 2010-08-26 09:54:42 +02:00
Herman van Rink
e076ec85e1 Add vim mode lines 2010-08-25 17:07:08 +02:00
Herman van Rink
6fb5591f4e Add CDATA to script code 2010-08-25 17:07:02 +02:00
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
Michal Čihař
1b58bc993e Fix description of config option. 2010-08-25 09:32:11 +02:00
Michal Čihař
99975dfc17 Merge branch 'QA_3_3' 
Conflicts:
	test/PMA_headerLocation_test.php
 2010-08-25 09:30:12 +02:00
Herman van Rink
d1e9585c9e Merge branch 'QA_3_3' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into QA_3_3 2010-08-24 15:17:11 +02:00
ninadsp
7f9d141a85 Removed the blank new line at the end, which was causing issues 2010-08-24 18:25:09 +05:30
Herman van Rink
45bdf8f522 Add additional condition for strict checking. 2010-08-24 14:47:29 +02:00
Michal Čihař
5c63cbd231 Merge branch 'QA_3_3' 
Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
 2010-08-23 17:10:04 +02:00
Michal Čihař
362251abbf Merge branch 'MAINT_3_3_6' into QA_3_3 
Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
 2010-08-23 17:08:58 +02:00
Michal Čihař
133a77fac7 Escape backtrace listing to avoid possible XSS on this. 2010-08-23 17:05:53 +02:00
Michal Čihař
a24e418527 Avoid PHP error when false is passed to PMA_DBI_getError. 
This can be caused by controllink set to false.
 2010-08-23 17:02:15 +02:00
Michal Čihař
5a51858352 [relations] Dropped WYSIWYG-PDF configuration variable. 2010-08-23 11:05:12 +02:00
Michal Čihař
8a011f77b8 Better name for schema export script. 2010-08-23 10:55:57 +02:00
Michal Čihař
f84659efcb Better file name for schema edit page. 2010-08-23 10:55:19 +02:00
Michal Čihař
1c20d31e65 No upper case in box title. 2010-08-23 10:52:46 +02:00
Michal Čihař
ab03dc8d5c Whitespace cleanup. 2010-08-23 10:50:17 +02:00
Michal Čihař
2ea03801eb Better size of Dia export. 2010-08-23 10:33:05 +02:00
Michal Čihař
dd80998080 Merge remote branch 'adnan/export_branch' 2010-08-23 10:21:22 +02:00
ninadsp
6a2445ccf2 Fixed the error caused due to a missing index , relocated the code that sets the null class for a null element 2010-08-22 12:59:25 +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
9036ac09e3 3.3.7-dev 2010-08-20 13:03:13 -04:00
Marc Delisle
1e7bc7d691 3.3.6-rc1 2010-08-20 12:59:21 -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
Adnan
8a827e5261 TCPDF: removed ob_get_contents() [was added for debugging] 2010-08-20 12:13:30 +05:00
Adnan
13abea596a Merge remote branch 'origin/master' into export_branch 2010-08-20 11:34:36 +05:00
Adnan
5fb5678a50 DIA Relation Schema: scale diagram fix 2010-08-20 11:11:51 +05:00
Adnan
75623e5066 EPS Relation Schema: missing lines fix 2010-08-20 11:09:37 +05: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
Adnan
afcf1e6bbe Automatic Foreign/Internal Layout fix 2010-08-19 17:31:01 +05:00
Michal Čihař
6aefc832ad Fixes for JSON plugin. 2010-08-19 14:05:04 +02:00