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

93281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Burak Yavuz
3cd16f17f0 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2802 of 2802)
 2014-06-14 21:13:29 +02:00
Marc Delisle
f6c44d8ccb Merge pull request #1230 from smita786/gsoc_central_columns_list 
PHPUnit test case for central_columns.lib.php
 2014-06-14 14:27:08 -04:00
Marc Delisle
d4a45f66cc Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 12:36:55 -04:00
Smita Kumari
b663334c5b PHPUnit test case 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

Fix coding style

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

Fix coding styl

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-14 22:06:37 +05:30
Marc Delisle
03fb581447 Refactor vertical display links 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 12:34:06 -04:00
Marc Delisle
d4809ced56 Merge pull request #1229 from D-storm/table-search 
fix: call to undefined function on table search
 2014-06-14 11:03:35 -04:00
Marc Delisle
0e5e0afc9a Merge pull request #1227 from D-storm/reset-bug 
fix: reset form button not resetting lock
 2014-06-14 10:56:41 -04:00
Weblate
e9236eeaca Merge remote-tracking branch 'origin/master' 2014-06-14 15:22:09 +02:00
Haval Abdulkarim
a0a1c8d5a5 Translated using Weblate (Kurdish Sorani) 
Currently translated at 18.4% (516 of 2802)
 2014-06-14 15:22:05 +02:00
Haval Abdulkarim
5cb05681a7 Translated using Weblate (English (United Kingdom)) 
Currently translated at 88.4% (2478 of 2802)
 2014-06-14 15:22:03 +02:00
Marc Delisle
dcb4163369 Merge commit 'a33fcad' 2014-06-14 09:21:04 -04:00
Marc Delisle
d387040b36 Merge commit 'a7703a3' 2014-06-14 09:20:50 -04:00
Marc Delisle
a33fcad037 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 09:19:56 -04:00
Christian Simon
47709d414e Fix 'token mismatch' due to missing server parameter for some AJAX requests 
* server_privileges user duplicate request
* js error_reporting
* cf. https://sourceforge.net/p/phpmyadmin/bugs/3893

Signed-off-by: Christian Simon <simon@swine.de>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 09:16:53 -04:00
Marc Delisle
36864a1213 Translated using Weblate (French) 
Currently translated at 100.0% (2802 of 2802)
 2014-06-14 12:51:48 +02:00
Domen
9dd884f4a0 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2802 of 2802)
 2014-06-14 11:57:52 +02:00
Panagiotis Papazoglou
10fd7bb7de Translated using Weblate (Greek) 
Currently translated at 100.0% (2802 of 2802)
 2014-06-14 10:05:41 +02:00
Panagiotis Papazoglou
a7703a3644 Translated using Weblate (Greek) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-14 10:00:21 +02:00
Chirayu Chiripal
742e1d13d2 fix: call to undefined function on table search 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-14 13:22:19 +05:30
Chirayu Chiripal
967c8f641c fix: reset form button not resetting lock 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-14 12:15:54 +05:30
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
Isaac Bennetch
ddadc4853e Merge branch 'D-storm-so' into QA_4_2 
bug-fix: 4457 SQL tab - Insert queries not showing affected row count

Conflicts:
	ChangeLog
 2014-06-13 09:40:15 -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