Commit Graph

60 Commits

Author SHA1 Message Date
Michal Čihař
e56949f160 Use package name PhpMyAdmin
Needed to match phpdoc rules as package name must begin with upper case.
2011-10-25 10:13:17 +02:00
Rouslan Placella
d17814f463 Replaced use of hard coded images with the sprite-aware PMA_getImage() functions (both PHP and JS). 2011-09-26 20:54:59 +01:00
Madhura Jayaratne
9bcb83af03 File is being conditionally included; use "include" instead 2011-09-23 10:56:30 +05:30
Madhura Jayaratne
e67a0a2531 Spaces between parameters in function calls 2011-09-23 08:43:41 +05:30
Dieter Adriaenssens
94c6836f8b fix coding style : control structures 2011-09-05 14:28:17 +02:00
Marc Delisle
4d2521ac91 Merge branch 'QA_3_4' 2011-08-24 12:30:15 -04:00
Herman van Rink
f00c57bdf3 Slightly far fetched XSS prevention 2011-08-19 11:01:45 +02:00
Piotr Przybylski
e2eb8a28da PMA_backquote is not needed for string literals 2011-08-16 00:04:44 +02:00
Herman van Rink
c547703b10 Sanitize filenames before using in Content-Disposition header 2011-08-08 20:07:09 +02:00
Herman van Rink
b659fbeb12 remove extraneous ? 2011-08-08 17:51:25 +02:00
Marc Delisle
0f5f2d9601 XSS with IE <= 8.x (semicolon and attachment headers 2011-08-06 15:05:59 -04:00
Herman van Rink
39edf6e1fb XSS fixes 2011-08-05 12:01:47 +02:00
Herman van Rink
3d8fddceb0 XSS fixes 2011-08-05 11:45:35 +02:00
Herman van Rink
2b0d12b2de Make better use of PMA_generate_common_url to prevent XSS 2011-08-05 11:45:16 +02:00
Herman van Rink
ec848d825f XSS fixes 2011-08-05 10:14:18 +02:00
Michal Čihař
8fcb4720e2 Include length in headers when we know it 2011-08-04 15:06:09 +02:00
Michal Čihař
d6c2dfb51b Use new function for download headers 2011-08-04 14:28:23 +02:00
Michal Čihař
9405dbb82a Fix spacing after @param 2011-07-22 09:21:55 +02:00
Michal Čihař
25bda8e991 Fix spacing on opening code block 2011-07-22 09:18:02 +02:00
Michal Čihař
219ec73d69 Spacing around if 2011-07-22 09:10:37 +02:00
Michal Čihař
9730a6b3d7 Merge commit '97b1375605f241481a953e2c78eb42d43f84fa9d'
Conflicts:
	js/functions.js
	libraries/common.lib.php
	libraries/header.inc.php
	server_status.php
2011-07-21 15:51:05 +02:00
Michal Čihař
48e9af42e0 Add missing space after foreach calls 2011-07-21 11:21:26 +02:00
Tyron Madlener
3b3a9fc762 pma spritify part 2 2011-07-15 09:42:16 +03:00
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02:00
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Marc Delisle
a4c168a3a3 Merge branch 'QA_3_4' 2011-05-20 12:51:47 -04:00
Herman van Rink
7e10c132a3 XSS in Tracking page, more 2011-05-20 12:49:49 -04:00
Herman van Rink
d3ccf798fd XSS in Tracking page 2011-05-20 12:41:33 -04:00
Marc Delisle
f493cd776e Typos 2011-05-16 10:30:22 -04:00
bumbu
21f8f5d072 + delete button into tracking table + function change tracking data in Tracker.class.php 2011-05-11 13:52:39 +02:00
Michal Čihař
7899b0f199 Avoid comparing translated strings and simplify the code. 2011-03-18 14:49:38 +01:00
Madhura Jayaratne
326f13827b Do not highlight rows of these tables 2011-03-15 20:35:53 +05:30
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
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Michal Čihař
3910ce6121 Remove explicit inclusion of Table.class.php as it is included in common.inc anyway. 2010-07-26 16:35:52 +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ř
ee767e2d3d No need to explicitely include relation.lib its anyway included in common.inc 2010-07-26 16:17:59 +02:00
Marc Delisle
084c0dbcf5 functions.js included automatically 2010-07-24 08:11:48 -04:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
ninadsp
160f4314eb Merge remote branch 'origin/master' 2010-06-03 22:34:52 +05:30
Marc Delisle
caa98445d8 conform to relational terminology regarding columns and rows 2010-05-31 14:33:21 -04:00
ninadsp
38ac78e3ba merging changes from origin 2010-05-24 18:32:42 +05:30
Michal Čihař
f33f82386e Use correct message and escape for js. 2010-05-24 11:23:29 +02:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet
only added a few comments
2010-05-23 01:22:01 +05:30
Michal Čihař
08edb1f2a6 Another fixup of wrong conversion. 2010-05-05 11:17:28 +02:00
Michal Čihař
962d9d6c0f Fix wrong conversion to inline gettext. 2010-05-05 11:15:13 +02:00
Marc Delisle
f55823f47f strings to gettext, first batch 2010-05-03 12:57:46 -04:00
Marc Delisle
ba0ca1851a Merge branch 'QA_3_3' 2010-04-26 16:38:46 -04:00
Marc Delisle
06c8fa0abb Tracking report should obey MaxCharactersInDisplayedSQL 2010-04-26 16:38:20 -04:00