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

96055 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Weblate
69822405cd Merge remote-tracking branch 'origin/master' 2014-11-19 02:47:20 +01:00
Sevdimali İsa
f7d8f5ccdf Translated using Weblate (Azerbaijani) 
Currently translated at 50.6% (1507 of 2976 strings)

[CI skip]
 2014-11-19 02:47:17 +01:00
Madhura Jayaratne
81b2be055f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-19 07:16:56 +05:30
Madhura Jayaratne
a9321f15d5 Merge branch 'QA_4_3' 2014-11-19 07:15:58 +05:30
Weblate
b29a021ffc Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-19 02:44:30 +01:00
Sevdimali İsa
4630dd22d5 Translated using Weblate (Azerbaijani) 
Currently translated at 50.6% (1507 of 2978 strings)

[CI skip]
 2014-11-19 02:44:28 +01:00
Madhura Jayaratne
aa41a0bb0e Merge branch 'QA_4_2' into QA_4_3 2014-11-19 07:13:37 +05:30
Madhura Jayaratne
e7b2f5415a Merge pull request #1403 from madhuracj/Bug4599 
#4599 Input field unnecessarily selected on focus
 2014-11-19 07:05:07 +05:30
Weblate
5e8c5af72f Merge remote-tracking branch 'origin/master' 2014-11-18 17:54:38 +01:00
Sevdimali İsa
d0c6061a96 Translated using Weblate (Azerbaijani) 
Currently translated at 50.6% (1506 of 2976 strings)

[CI skip]
 2014-11-18 17:54:35 +01:00
Marc Delisle
8fd9c48c9c Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-18 11:54:27 -05:00
Madhura Jayaratne
6399fd76a7 Merge branch 'QA_4_3' 2014-11-18 16:18:15 +05:30
Madhura Jayaratne
19e5ddffcc Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-11-18 16:14:48 +05:30
Madhura Jayaratne
ea5333e523 ChangeLog entries for bugs related to performance with thousands of databases 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-18 16:12:12 +05:30
Weblate
cdf832cb39 Merge remote-tracking branch 'origin/master' 2014-11-18 11:25:02 +01:00
Sevdimali İsa
c6aa4fca17 Translated using Weblate (Azerbaijani) 
Currently translated at 49.2% (1467 of 2976 strings)

[CI skip]
 2014-11-18 11:25:00 +01:00
Madhura Jayaratne
665f1fa215 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-18 15:54:34 +05:30
Weblate
54f1bc5d2c Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-18 11:21:29 +01:00