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

12624 Commits

Author SHA1 Message Date
Marc Delisle
3aa884ee36 Fix undefined index notice (fields) in PMA_getParamsForUpdateOrInsert() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-04 10:35:58 -05:00
Marc Delisle
bd2a8b501c Fix other undefined index notices in PMA_getDiagMessageForFeature() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-04 09:15:18 -05:00
Marc Delisle
41c02abc41 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-12-03 09:02:25 -05:00
Madhura Jayaratne
a4e8d008f4 bug #4611 [security] DOS attack with long passwords 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 08:50:14 -05:00
Marc Delisle
85c866fb8f Bug Undefined index navwork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-02 10:28:03 -05:00
Nisarg Jhaveri
c43d60d1a4 Bug 4614 Missing separator 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-01 10:30:06 -05:00
Marc Delisle
1e39ac53d0 Bug Undefined index menuswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-29 06:49:24 -05:00
Madhura Jayaratne
eb79ad9181 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 11:09:04 +05:30
Madhura Jayaratne
ea7ca462e5 Document what these flags do 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 10:57:19 +05:30
Madhura Jayaratne
5e1ab952b8 Use a separate flag to avoid confusion 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 10:56:52 +05:30
Madhura Jayaratne
b92d3e1047 Workaround for token mismatch error on server session timeout for config and http authentication types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 10:56:28 +05:30
Marc Delisle
0ab3ee3728 4.3.0-rc1 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-27 09:32:24 -05:00
Ann + J.M
3d87430aa0 [FIX] Browse table: Make Show all label clickable 
<label for> works with IDs, not names.

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-11-27 14:43:16 +01:00
Madhura Jayaratne
10b958c1ba Merge branch 'QA_4_2' into QA_4_3 2014-11-27 10:27:34 +05:30
Madhura Jayaratne
19802ca9f9 bug #4608 SELECT permission issues with relations and restricted access 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 10:25:42 +05:30
Marc Delisle
496602674c 4.3.1-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-26 11:20:54 -05:00
Marc Delisle
e38f5753ff Undefined index central_columnswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-26 08:12:23 -05:00
Madhura Jayaratne
57413772c1 Merge branch 'QA_4_2' into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-25 10:26:09 +05:30
Madhura Jayaratne
14a77261d2 bug #4606 Tracking report export as SQL dump does not work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-25 10:21:18 +05:30
Madhura Jayaratne
0fda8293f4 Merge branch 'QA_4_2' into QA_4_3 2014-11-25 09:15:08 +05:30
Madhura Jayaratne
8607de61e0 bug #4605 Unseen messages in tracking 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-25 09:01:35 +05:30
Marc Delisle
11b1dd67fb Merge branch 'QA_4_2' into QA_4_3 2014-11-22 07:14:17 -05:00
Marc Delisle
1110d08743 bug #4604 Query history not being deleted 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 07:13:41 -05:00
Marc Delisle
3810111659 Incorrect offset in tracking report 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-21 10:17:52 -05:00
Madhura Jayaratne
c2cf281dd6 Fix merge errors. MB functions are not required to handle geometry type names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 21:55:37 +05:30
Madhura Jayaratne
93366c8c24 Merge branch 'QA_4_2' into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 21:44:53 +05:30
Marc Delisle
3443cc1ca4 4.2.13-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-20 10:35:46 -05:00
Marc Delisle
82f13d3e1b Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-20 10:30:53 -05:00
Marc Delisle
5ac08bde49 4.3.0-beta1 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-20 08:18:11 -05:00
Michal Čihař
8fc377d83a Share code for resetting IV size 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-20 10:27:01 +01:00
Michal Čihař
5f1a5a78bc Shared check for OpenSSL support 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-20 10:14:47 +01:00
Michal Čihař
4d151b6e89 Fix encoding of relation.lib.php 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-20 09:57:04 +01:00
Madhura Jayaratne
a0b60e0901 Merge branch 'QA_4_2' into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 08:37:28 +05:30
Madhura Jayaratne
bfc61051b7 bug #4603 Field disabled when internal relations used 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 08:27:03 +05:30
Madhura Jayaratne
2ffdbf2d7d bug #4597 [security] XSS through pma_fontsize cookie 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 06:40:39 +05:30
Madhura Jayaratne
2a3b7393d1 bug #4598 [security] XSS in multi submit 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 06:36:55 +05:30
Madhura Jayaratne
80cd40b668 bug #4594 [security] Path traversal in file inclusion of GIS factory 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 06:32:57 +05:30
Madhura Jayaratne
d32da348c4 bug #4578 [security] XSS vulnerability in table print view 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 06:26:55 +05:30
Madhura Jayaratne
b99b6b6672 bug #4595 [security] Path traversal can lead to leakage of line count 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 06:24:34 +05:30
Madhura Jayaratne
9364e2eee5 bug #4596 [security] XSS through exception stack 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 06:20:49 +05:30
Marc Delisle
d3fb6617f5 Merge branch 'QA_4_3' of https://github.com/phpmyadmin/phpmyadmin into QA_4_3 2014-11-19 07:42:07 -05:00
Robert Scheck
491c426623 Patch by Robert Scheck <robert@fedoraproject.org> for phpMyAdmin 4.2.6 
which enhances cookie encryption/decryption by the optional usage of
PHP OpenSSL. Unfortunately PHP Mcrypt is not shipped by all Linux
distributions however PHP OpenSSL is often enabled by default.
PHP < 5.3.4 does not support passing an IV, thus this has been added as
a requirement. I could have used 'BF-CBC' rather 'AES-128-CBC' but Blowfish
(even it is fast) is seen by experts as weaker algorithm than
AES. If this should be a show-stopper for upstream merging just replace
'AES-128-CBC' by 'BF-CBC', please.

Patch adapted for 4.3.x and tests modified by Marc Delisle

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-19 07:38:32 -05:00
Madhura Jayaratne
0b662922db Merge branch 'QA_4_2' into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-19 09:30:30 +05:30
Madhura Jayaratne
2e42e8a11b bug #4602 Exporting selected rows exports all rows of the query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-19 09:26:11 +05:30
Madhura Jayaratne
aa41a0bb0e Merge branch 'QA_4_2' into QA_4_3 2014-11-19 07:13:37 +05:30
Madhura Jayaratne
9f9e6937ca #4599 Input field unnecessarily selected on focus 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-18 12:56:09 +05:30
Marc Delisle
b7108e9e70 Bug #4600 Warning when editing the results of a Search 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-17 13:19:52 -05:00
Marc Delisle
babad6efe5 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-16 07:01:06 -05:00
Marc Delisle
e1a722dee7 bug #4576 Issue with long comments on table columns 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-16 06:48:17 -05:00
Marc Delisle
3d038ced19 4.3.0-alpha1 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-14 11:23:46 -05:00