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

96002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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ř
2ac39b2390 Another typo in plural form 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-20 10:36:21 +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ř
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ř
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
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
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
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
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
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
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
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
54f1bc5d2c Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-18 11:21:29 +01:00
Sevdimali İsa
7413983602 Translated using Weblate (Azerbaijani) 
Currently translated at 49.2% (1467 of 2978 strings)

[CI skip]
 2014-11-18 11:21:27 +01:00
Madhura Jayaratne
b802b5f9b3 Bug #4591 Spinner in navigation running forever 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-18 15:51:06 +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
Weblate
687e78d2cc Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-17 19:20:33 +01:00
Sevdimali İsa
8269287109 Translated using Weblate (Azerbaijani) 
Currently translated at 48.2% (1436 of 2978 strings)

[CI skip]
 2014-11-17 19:20:31 +01:00
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
Mircəlal
8502efb8cf Translated using Weblate (Azerbaijani) 
Currently translated at 47.9% (1429 of 2978 strings)

[CI skip]
 2014-11-16 21:29:47 +01:00
Weblate
9838e780e8 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-16 13:02:25 +01:00
Michal Čihař
baa9545808 Translated using Weblate (Welsh) 
Currently translated at 20.1% (599 of 2978 strings)

[CI skip]
 2014-11-16 13:02:23 +01:00
Michal Čihař
1a4be1f310 Translated using Weblate (Uzbek) 
Currently translated at 37.4% (1114 of 2978 strings)

[CI skip]
 2014-11-16 13:02:21 +01:00
Burak Yavuz
c5a40b5767 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-11-16 13:02:19 +01:00
youngminz
b5466eaa81 Translated using Weblate (Korean) 
Currently translated at 82.1% (2446 of 2978 strings)

[CI skip]
 2014-11-16 13:02:17 +01:00
Giovanni Sora
7509725b75 Translated using Weblate (Interlingua) 
Currently translated at 63.7% (1897 of 2978 strings)

[CI skip]
 2014-11-16 13:02:15 +01:00
Andika Triwidada
931a6458e1 Translated using Weblate (Indonesian) 
Currently translated at 74.2% (2210 of 2978 strings)

[CI skip]
 2014-11-16 13:02:13 +01:00
Panagiotis Papazoglou
9423d7bf68 Translated using Weblate (Greek) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-11-16 13:02:12 +01:00
Michal Čihař
b86853e50f Translated using Weblate (Armenian) 
Currently translated at 3.3% (100 of 2978 strings)

[CI skip]
 2014-11-16 13:02:10 +01: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
Kristjan Räts
53c67dafec Translated using Weblate (Estonian) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-11-14 14:46:27 +01:00
Kristjan Räts
375953e48b Translated using Weblate (Estonian) 
Currently translated at 99.9% (2976 of 2978 strings)

[CI skip]
 2014-11-14 13:53:26 +01:00
Marc Delisle
2ac5eae23a Translated using Weblate (French) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-11-14 13:53:11 +01:00
Dieter Adriaenssens
b39f4c9aff Translated using Weblate (Dutch) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-11-14 13:42:03 +01:00
Michal Čihař
6916c56fc2 Merge remote-tracking branch 'weblate-master/master' 
Conflicts:
	po/az.po
 2014-11-14 09:19:16 +01:00