Commit Graph

165 Commits

Author SHA1 Message Date
Marc Delisle
29e658a1f7 Merge branch 'QA_3_4' 2011-11-21 12:42:07 -05:00
Marc Delisle
e2b6af5a99 Avoid showing the password in phpinfo()'s output 2011-11-21 12:41:13 -05:00
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
Dieter Adriaenssens
87459a5cf6 use include() instead of require() when including file conditionally 2011-09-06 22:04:51 +02:00
Dieter Adriaenssens
5c751cd1c0 make die() messages translatable, where possible 2011-08-25 22:38:51 +02:00
Piotr Przybylski
df9b8c2729 Fix comments for functions with missing @return tag 2011-08-16 14:31:52 +02:00
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +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
da943ecbf7 PMA Icons to sprites part 1 2011-07-14 15:37:08 +03:00
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Michal Čihař
4aa470e27e Indentation fixes 2011-06-22 11:03:38 +02:00
Michal Čihař
e0c7147806 This is a fatal error rather than place for warning
It is not necessary to translate as this really should not happen.
2011-06-22 11:02:15 +02:00
Michal Čihař
568a0e03de Show mcrypt waring only on main page and not on every page 2011-06-22 11:00:45 +02:00
Tyron Madlener
5e09426666 Merge 2011-06-06 14:38:56 +02:00
Michal Čihař
bbbf2c49ed Drop $GLOBALS['charset'].
It was anyway always set to utf-8 so it does not make sense to keep it
as a variable.
2011-06-03 14:04:29 +02:00
Marc Delisle
99eb0cde32 bug #3308072 [auth] Version disclosure to anonymous visitors 2011-05-30 16:32:29 -04:00
Michal Čihař
cd74e9fa5d bug #3175227 [auth] Reset user cache on login. 2011-02-08 13:15:01 +01:00
Michal Čihař
5a2835ec86 Readd redirect login to top frame 2011-02-02 11:44:56 +01:00
Michal Čihař
685e199c16 Use standard javascript loading on login page. 2011-02-01 17:52:14 +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
b923bb3fbb Upgrade to jQuery 1.4.4 2011-01-02 08:00:25 -05: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
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Michal Čihař
6c3ad9e942 Fix back showing login form in frames. 2010-07-26 17:31:56 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
eeae8bec21 Get rid of inline javascript in login form. 2010-07-21 09:21:58 +02:00
Michal Čihař
3e57a8eca9 No @uses __('Something'). 2010-07-20 15:06:34 +02:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
ninadsp
bcbf327139 Merge remote branch 'origin/master' 2010-06-29 23:54:01 +05:30
Dieter Adriaenssens
16ed06531a remove author names 2010-06-28 20:36:12 +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ř
ee776a570c Convert mcrypt warning to generic function. 2010-05-05 11:35:32 +02:00
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Marc Delisle
f55823f47f strings to gettext, first batch 2010-05-03 12:57:46 -04:00
Michal Čihař
71ff89c2fe Include non minified version in Git.
The JS compression will happen on release.
2010-04-13 11:52:33 +02:00
Marc Delisle
7d106d4aa3 missing jQuery on login page (needed by update-location.js 2010-04-01 16:30:59 -04:00
Michal Čihař
5ecbd6941d Better name for javascript file. 2010-04-01 11:24:38 +02:00
Michal Čihař
7b754395e9 Provide way for vendors to easily change paths to config files. 2010-03-31 12:29:21 +02:00
Marc Delisle
819324ede6 remove author names, as discussed at the 2010 developer meeting and according to the book Producing Open Source Software 2010-03-06 18:04:17 +00:00
Marc Delisle
5d96387808 bug #2961609 Potential information disclosure at login page 2010-03-04 13:00:35 +00:00
Michal Čihař
ecc4913a8c Reenable bookmarking code.
Just disable it for webkit based browsers, because they do not allow to
update any part of location without reload.

bug#2937481
2010-01-25 11:50:48 +00:00
Michal Čihař
b6a7def809 Reloading also on login page. 2010-01-22 21:45:49 +00:00
Michal Čihař
94c2f864ae [core] Remove config data from session as it brings chicken-egg problem.
Configuration data stores PmaAbsoluteUri, which should be accessible
before initiating session. Otherwise there is no way to make
PmaAbsoluteUri work. PmaAbsoluteUri is needed at least for reverse
proxy setups, for example http webserver running behind https proxy.
2010-01-21 11:18:18 +00:00
Marc Delisle
e0579f1b9e bug #2905629 [auth] Blowfish secret is not hashed 2009-11-29 21:36:13 +00:00
Herman van Rink
9df074aad3 patch #2665440 Detect mcrypt initialization failure 2009-05-07 07:56:13 +00:00