webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Code Activity
107,360 Commits 12 Branches 481 Tags
db4a2e11f473d169b41d00a6668dfd2742e8bd71
Commit Graph

1453 Commits

Author SHA1 Message Date
Michal Čihař
1a23eccd2b Remove code for MSIE 6 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 12:01:27 +02:00
Michal Čihař
1d09172f14 Turn OpenDocument wrapper to a class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 11:49:53 +02:00
Michal Čihař
6047e229b7 Merge branch 'QA_4_6' 2016-09-16 10:35:16 +02:00
Deven Bansod
429c679f77 Fix tests, added testcase for Generated columns in moveCopy 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-09 15:56:22 +05:30
Michal Čihař
89bea5fff1 Move request cleanup to Sanitize class and add tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 13:48:17 +02:00
Michal Čihař
4b1288a564 Correctly handle errors at client side 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 12:35:22 +02:00
Michal Čihař
8d4bfa0d63 Always test all available http request backends 
Issue #12380

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:47:37 +02:00
Michal Čihař
47a0b7edd5 Hardcode connection timeout settings 
We anyway used almost same value in all places.

While doing this change, I've also increased the timeout.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:35:52 +02:00
Michal Čihař
506ba670ee Test posting to URL not allowing post 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:33:03 +02:00
Michal Čihař
438244650e Consistent coding style 
Issue #12465

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:22:43 +02:00
Michal Čihař
d52e2cfbbf Move Util::httpRequest tests to UtilTest.php 
Issue #12465

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:22:25 +02:00
Michal Čihař
a7755dbb64 Merge pull request #12465 from Seldar/master 
Fixes #12380 Refactored http requests into one function "httpRequest" in Util.php
 2016-08-29 11:08:12 +02:00
Volkan Ulukut
be6944d0eb Fixes #12380 Refactored http requests into one function "httpRequest" in Util.php 
Signed-off-by: Volkan Ulukut <arthan@gmail.com>
 2016-08-29 00:20:38 +03:00
Michal Čihař
31f6d76405 Merge branch 'QA_4_6' 2016-08-24 11:55:10 +02:00
Michal Čihař
cbd6137c03 Avoid double escaping of built in transformation URLs 
We do already escape them in the tranformation, so avoid doing that
before.

Issue #12483

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-24 11:48:48 +02:00
Michal Čihař
46b329c32b Merge branch 'QA_4_6' 2016-08-18 17:37:34 +02:00
Michal Čihař
6faa1fe46a Add rel="noopener noreferrer" to all external target="_blank" links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-18 17:35:20 +02:00
Michal Čihař
7898060916 Ensure PmaAbsoluteUri ends with / 
This was probably most frequest user error we want to fix.

Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 15:37:20 +02:00
Michal Čihař
01b9db6b1c Rename getCookiePath() to getRootPath() 
It is not used only for cookies, so generic name makes more sense.

Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 15:35:15 +02:00
Michal Čihař
83476322ba Use PmaAbsolueUri for cookie path 
Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 15:35:15 +02:00
Deven Bansod
111fbab5d2 Fix tests after 44760ac 
* Currently hard-coded the values and removed URL::getCommon() call as it was producing incorrect order of parameters in the url
* Can look at a better approach for fixing the test

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-17 18:13:21 +05:30
Michal Čihař
23e01d306a Merge branch 'QA_4_6' 2016-08-17 15:38:22 +02:00
Michal Čihař
52f23338a8 Merge branch 'master-security' 2016-08-17 08:50:51 +02:00
Isaac Bennetch
0f6b76b578 Merge remote-tracking branch 'security/QA_4_6-security' into QA_4_6 2016-08-16 16:34:37 -04:00
Michal Čihař
652cfe0b2d Merge branch 'QA_4_6' 2016-08-03 11:37:14 +02:00
Michal Čihař
d09e5438c1 Remove unsued code for generating events 
This is no longer used, so there is no need to support it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-03 11:36:41 +02:00
Michal Čihař
7ef6fecb87 Merge branch 'master' into master-security 2016-08-01 11:07:33 +02:00
Madhura Jayaratne
7f43348e6b Merge pull request #12415 from nijel/remove-token-get 
Remove token from GET requests
 2016-08-01 07:50:37 +10:00
Michal Čihař
aebbb31aad Merge branch 'master' into master-security 2016-07-29 14:08:23 +02:00
Michal Čihař
1221b5ea4a Merge branch 'QA_4_6' into QA_4_6-security 2016-07-29 14:05:48 +02:00
Michal Čihař
43cfaeeade Add tests for control user connection fallbacks 
Issue #12218

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 13:25:58 +02:00
Michal Čihař
6b6040acbf Adjust tests to new parameters 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:40:45 +02:00
Michal Čihař
f46fd34081 Remove is_controluser flag from DBI backends 
They no longer need it (it was used only for empty password fallback).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 11:34:55 +02:00
Michal Čihař
ea73fded71 Adjust tests to token removal from GET 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 11:22:45 +02:00
Michal Čihař
bb18c5e02f Merge branch 'QA_4_6' 2016-07-28 11:06:43 +02:00
Michal Čihař
263318850c Merge pull request #12409 from rpv-tomsk/restore-overhead-column 
Restore Overhead column in Server > Databases > Enable Statistics.
 2016-07-28 11:05:47 +02:00
Michal Čihař
360b8e8a11 Merge branch 'master' into master-security 2016-07-28 09:44:08 +02:00
Michal Čihař
d31ff5a1e7 Merge branch 'QA_4_6' into QA_4_6-security 2016-07-28 09:43:26 +02:00
Michal Čihař
6d8e1d7935 Merge branch 'QA_4_6' 2016-07-28 09:38:08 +02:00
Michal Čihař
4072c1d29a Use example.com for sample test urls 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 09:12:01 +02:00
Pavel Rochnyack
c310304712 Restore Overhead column in Server > Databases > Enable Statistics. 
(Was removed in 582b02262b)

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-07-27 19:56:43 +01:00
Michal Čihař
d15490088c Merge branch 'QA_4_6' 2016-07-27 16:30:47 +02:00
Michal Čihař
af337d2054 Use https to access phpmyadmin.net 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-27 16:29:08 +02:00
Michal Čihař
f5015c2ea3 Merge branch 'QA_4_6-security' into master-security 2016-07-26 16:31:21 +02:00
Michal Čihař
99492bf42a Merge branch 'QA_4_6' into QA_4_6-security 2016-07-26 16:29:07 +02:00
Michal Čihař
22c4ede46d Merge branch 'QA_4_6' 2016-07-26 16:26:57 +02:00
Michal Čihař
6c95b73f90 Do not append session IDs to all URLs in redirect 
There is no need to do that as we rely on session cookies anyway. Also
appending sesson ID to external URLs is not a good idea.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-26 16:20:04 +02:00
Michal Čihař
45aedabbe6 Fix test errors 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 14:47:28 +02:00
Michal Čihař
f72572708f Merge branch 'QA_4_6-security' into master-security 2016-07-22 14:42:09 +02:00
Michal Čihař
9106b33933 Improve secrets splitting 
- ensure it has 16 bytes
- extends it by copying content if original is too short
- correctly handle corner cases (eg. 1 byte secret)

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 14:10:28 +02:00