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

96074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
efee6fa7ef Merge remote-tracking branch 'origin/master' 2014-11-20 17:19:21 +01:00
Sandro Amaral
258351f52f Translated using Weblate (Portuguese) 
Currently translated at 61.0% (1819 of 2978 strings)

[CI skip]
 2014-11-20 17:19:19 +01:00
Madhura Jayaratne
45a971a561 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 21:48:50 +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
Weblate
b7178c6fa3 Merge remote-tracking branch 'origin/master' 2014-11-20 14:18:59 +01:00
Sandro Amaral
1c0f3e2434 Translated using Weblate (Portuguese) 
Currently translated at 61.0% (1817 of 2978 strings)

[CI skip]
 2014-11-20 14:18:56 +01:00
Marc Delisle
5968b5c98c Merge commit '5ac08bd' 2014-11-20 08:18:46 -05:00
Weblate
c7d9a99683 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-20 14:18:27 +01:00
Sandro Amaral
ce8c536145 Translated using Weblate (Portuguese) 
Currently translated at 60.9% (1816 of 2978 strings)

[CI skip]
 2014-11-20 14:18:25 +01: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ř
f06ee5205d Merge branch 'QA_4_3' 2014-11-20 10:36:33 +01:00
Michal Čihař
2ac39b2390 Another typo in plural form 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-20 10:36:21 +01:00
Michal Čihař
f5afbc763e Merge branch 'QA_4_3' 2014-11-20 10:32:23 +01:00
Michal Čihař
5c6d1c9423 Fix plural equation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-20 10:32:16 +01:00
Michal Čihař
c0d847f698 Merge branch 'QA_4_3' 2014-11-20 10:29:23 +01:00
Michal Čihař
c11efb678d This is binary string, can not use mb_strlen 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-20 10:28:53 +01: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ř
2ad8d6176c Merge branch 'QA_4_3' 2014-11-20 09:57:20 +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
448c9079c2 Update zoom search styles 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 11:17:47 +05:30
Madhura Jayaratne
1b6a50b3e6 Default handling is good enough 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 10:53:39 +05:30
Madhura Jayaratne
f920cc93c0 Simplify the structure 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 10:38:16 +05:30
Madhura Jayaratne
c8549e9886 Merge branch 'QA_4_3' 2014-11-20 10:21:21 +05:30
Madhura Jayaratne
566466e32b Eliminate duplicate code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 10:20:30 +05:30
Madhura Jayaratne
5e1b5e086f Keep the content of the table structure page until editing page is loaded 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 10:12:28 +05:30
Madhura Jayaratne
095bdd842d Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-20 08:39:17 +05:30
Madhura Jayaratne
9b61294ed8 Merge branch 'QA_4_3' 2014-11-20 08:38:44 +05:30
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
1bc04ec950 bug #4579 [security] XSS vulnerability in zoom search page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 06:28:43 +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
ed5fc179f4 Merge branch 'QA_4_3' 2014-11-19 07:43:55 -05:00
Marc Delisle
d067ae7dd5 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-19 07:43:09 -05:00
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
b7e5b79ad4 Merge branch 'QA_4_3' 2014-11-19 10:41:07 +05:30
Madhura Jayaratne
837f5f46d5 Merge branch 'QA_4_2' into QA_4_3 2014-11-19 10:39:04 +05:30
Madhura Jayaratne
8252099d9d bug #4444 No insert statement produced in SQL export for queries with alias 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-19 10:36:29 +05:30
Madhura Jayaratne
1ba2c41052 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-19 09:34:43 +05:30
Madhura Jayaratne
923f6682fb Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-19 09:33:54 +05:30
Madhura Jayaratne
3cda6ac366 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-11-19 09:32:23 +05:30
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