gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,260 Commits 12 Branches 481 Tags 2.4 GiB
b857076fd1
Commit Graph

93260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matías Bellone
b857076fd1 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2802 of 2802)
 2014-06-14 01:05:39 +02:00
Marc Delisle
eac7b1d49b Update po files 2014-06-13 16:52:54 -04:00
Marc Delisle
c607dad041 Merge pull request #1222 from D-storm/bug-4415 
Bugfix 4415,4453,4452,4451;  RFE-1518 (Navigate away) improvements
 2014-06-13 16:51:39 -04:00
Chirayu Chiripal
b527dc74a1 bugfix-4415,4453,4452,4451: Complete makeover of rfe-1518 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-13 23:56:24 +05:30
Weblate
239f4c0b8c Merge remote-tracking branch 'origin/master' 2014-06-13 15:44:50 +02:00
Dieter Adriaenssens
f0a7cece5c Translated using Weblate (Dutch) 
Currently translated at 99.8% (2800 of 2803)
 2014-06-13 15:44:47 +02:00
Isaac Bennetch
85fdd3cef3 Merge branch 'D-storm-so' 
bug-fix: 4457 SQL tab - Insert queries not showing affected row count

Conflicts:
	ChangeLog
 2014-06-13 09:43:56 -04:00
Weblate
fe93f9e740 Merge remote-tracking branch 'origin/master' 2014-06-13 13:45:24 +02:00
Dieter Adriaenssens
e43d09bb3b Translated using Weblate (Dutch) 
Currently translated at 99.7% (2796 of 2803)
 2014-06-13 13:45:20 +02:00
Marc Delisle
052eb0ecac Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-13 07:44:39 -04:00
Marc Delisle
f9d842fd72 Merge commit '0306e2b' 2014-06-13 07:43:11 -04:00
Marc Delisle
531fff09fe bug #4405 Cannot import (open_basedir): fix another case 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-13 07:42:14 -04:00
Atul Pratap Singh
0306e2bd88 Fix bug#4450 Query is duplicated on Ctrl+Enter 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-06-13 11:20:27 +05:30
Atul Pratap Singh
d909aa66b7 Fix bug#4450 Query is duplicated on Ctrl+Enter 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-06-13 11:10:23 +05:30
Chirayu Chiripal
4c4cee598a bugfix: insert queries not showing affected row counts 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-13 00:39:28 +05:30
Michal Čihař
a7bc3a73a3 Do not pas arround empty $_url_params variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
bd4cccc039 Move password change handling to authenticaton plugins 
We should not care about plugin type while changing password, we should
just notify it and the plugin should be responsible for anything needed.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
209390c3f2 Properly store password in cookie when changing it 
Use auth plugin method to do that, otherwise it could not work properly
with autogenerated blowfish_secret.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
92a10d0968 Factor out cookie storing to separate methods 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
234cfbf73f Document AES usage 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
51d4d514f9 Adjust tests to new encryption 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
e433d8189b Use phpseclib for generating session encryption key 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
da047efbd1 Use random per session key for encrypting password 
This makes it impossible to decrypt cookies later if the key would be
compromised.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
5e51f178dd Remove some blowfish mentions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
5f3b69908a Document that we are using AES for encryption 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
cd4d54395b Remove another reference to Blowfish 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Marc Delisle
ceb77ce6d4 Function was used before it was defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-12 08:28:33 -04:00
Michal Čihař
98034ba148 Remove $GLOBALS['cfg']['Bookmark'] variable 
It makes it impossible to include bookmark library at any time as when
it is included before configuration is loaded it caches false result for
bookmarks support.

And anyway, using superglobals is always bad idea.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 13:45:03 +02:00
Michal Čihař
ddac366fd6 Merge remote-tracking branch 'origin/QA_4_2' 
Conflicts:
	libraries/DatabaseInterface.class.php
 2014-06-12 13:37:35 +02:00
Michal Čihař
2b8bb91bc3 Merge pull request #1223 from D-storm/bug-4454 
bug-4454: PMA_DatabaseInterface::getColumnsFull() when called with no da...
 2014-06-12 13:36:23 +02:00
Chirayu Chiripal
2bd9544878 bug-4454: PMA_DatabaseInterface::getColumnsFull() when called with no database or table parameter gives incorrectly nested keys 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-12 16:55:27 +05:30
Michal Čihař
a7bcbbc35f Wrap long line 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:51:29 +02:00
Michal Čihař
96977c994e Use require here 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:50:52 +02:00
Michal Čihař
20640592f0 Always use phpseclib for cookie encryption 
- it provides fallback in case mcrypt is not found
- we now use AES in both mcrypt and PHP code case
- cleanup the code by removing mcrypt conditials
- rename some methods and cookies so that they don't refer to
  implementation details
- switching encryption implementations no longer invalidates the
  credentials

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:39:52 +02:00
Michal Čihař
0652ca9ccd Merge remote-tracking branch 'origin/QA_4_2' 2014-06-12 10:19:00 +02:00
Michal Čihař
bc60315023 Adjust tests to new IV logic 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:18:45 +02:00
Michal Čihař
c6e76422c4 Allow to use system phpseclib 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:06:20 +02:00
Michal Čihař
d69f8bdd09 Update phpseclib to latest Git snapshot 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:02:52 +02:00
Michal Čihař
716f6d4c55 Merge remote-tracking branch 'origin/QA_4_2' 2014-06-12 09:47:17 +02:00
Michal Čihař
953c7415ad Separate check for password cookie 
Otherwise it would not be possible to recall user name.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 09:47:04 +02:00
Michal Čihař
bd482546bc Merge remote-tracking branch 'origin/QA_4_2' 2014-06-12 09:45:43 +02:00
Michal Čihař
5d39998a86 Merge commit '7cba81de271d62bdf93ded7598709702a96f92d7' 
Conflicts:
	libraries/plugins/auth/AuthenticationCookie.class.php
 2014-06-12 09:45:13 +02:00
Michal Čihař
1cd945e548 Merge commit '59bb241cf13fd9a02626eb73daf5a5ca8476b29e' 2014-06-12 09:44:51 +02:00
Weblate
76c051bcea Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-06-12 09:44:11 +02:00
Burak Yavuz
e664c931d2 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-12 09:44:09 +02:00
Matías Bellone
480b992aae Translated using Weblate (Spanish) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-12 09:44:06 +02:00
Giovanni Sora
bfb0f98a91 Translated using Weblate (Interlingua) 
Currently translated at 51.1% (1417 of 2770)
 2014-06-12 09:44:03 +02:00
Marc Delisle
ffb543b6e3 Translated using Weblate (French) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-12 09:44:01 +02:00
Dieter Adriaenssens
88910393e5 Translated using Weblate (Dutch) 
Currently translated at 99.9% (2768 of 2770)
 2014-06-12 09:44:00 +02:00
Michal Čihař
29094da204 Translated using Weblate (Czech) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-12 09:43:58 +02:00