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

102711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
e0a0699d4a Merge remote-tracking branch 'origin/master' 2015-09-24 15:28:33 +02:00
Yizhou Qiang
857ef10d40 Translated using Weblate (Chinese (China)) 
Currently translated at 77.0% (2472 of 3209 strings)

[CI skip]
 2015-09-24 15:28:27 +02:00
Marc Delisle
a815444712 Merge branch 'QA_4_5' 2015-09-24 09:28:13 -04:00
Marc Delisle
c342d40814 Merge commit 'fb32ce9' 2015-09-24 09:28:06 -04:00
Marc Delisle
5bad4dab82 Fixes #11495 'PMA_Microhistory' is undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-24 09:27:17 -04:00
Weblate
6a8c4913e5 Merge remote-tracking branch 'origin/master' 2015-09-24 10:10:39 +02:00
Yizhou Qiang
f3aa17153e Translated using Weblate (Chinese (China)) 
Currently translated at 76.9% (2470 of 3209 strings)

[CI skip]
 2015-09-24 10:10:34 +02:00
Marc Delisle
ac5d97f0ca Merge branch 'QA_4_5' 2015-09-24 04:10:17 -04:00
Weblate
fb32ce9a5c Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-24 10:10:00 +02:00
Yizhou Qiang
50153dec8b Translated using Weblate (Chinese (China)) 
Currently translated at 76.9% (2470 of 3209 strings)

[CI skip]
 2015-09-24 10:09:58 +02:00
Marc Delisle
f322635e19 Fix for #11492 moved to 4.5.0.1 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-24 04:09:31 -04:00
Weblate
8813154557 Merge remote-tracking branch 'origin/master' 2015-09-23 21:58:35 +02:00
Victor Laureano
82dc704ff7 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.4% (2966 of 3209 strings)

[CI skip]
 2015-09-23 21:58:30 +02:00
Marc Delisle
91337a7237 Merge branch 'QA_4_5' 2015-09-23 15:56:37 -04:00
Marc Delisle
b468d57409 Merge commit 'bd84bb8' 2015-09-23 15:56:27 -04:00
Weblate
e45efdb3e2 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-23 21:55:31 +02:00
Victor Laureano
2b089a019a Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.4% (2966 of 3209 strings)

[CI skip]
 2015-09-23 21:55:28 +02:00
Marc Delisle
bd84bb8c2d Merge pull request #11494 from nisargjhaveri/bug_11492 
Fix #11492, AUTO_INCREMENT statements are partly missing from exports
 2015-09-23 15:55:24 -04:00
Nisarg Jhaveri
053edda33f Fix #11492, AUTO_INCREMENT statements are partly missing from exports 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-09-24 00:34:07 +05:30
Marc Delisle
34d3657fbd Merge branch 'QA_4_5' 2015-09-23 08:37:47 -04:00
Marc Delisle
fa4c7fcf75 Merge commit 'bab06a7' 2015-09-23 08:37:39 -04:00
Marc Delisle
692c555c3f Replace the mcrypt extension suggestion with openssl 
See http://blog.remirepo.net/post/2015/07/07/About-libmcrypt-and-php-mcrypt

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-23 08:35:27 -04:00
Marc Delisle
80ebfbef7a Merge branch 'QA_4_5' 2015-09-23 06:08:00 -04:00
Marc Delisle
d2535a9ed9 Merge commit '58fe80d' 2015-09-23 06:07:46 -04:00
Weblate
bab06a7bff Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-23 12:07:24 +02:00
Hauke Henningsen
e2c5552ec7 Translated using Weblate (German) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2015-09-23 12:07:21 +02:00
Marc Delisle
8e093ffb52 4.5.0 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-23 06:07:14 -04:00
Hauke Henningsen
6a635f84c0 Translated using Weblate (German) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2015-09-23 03:11:55 +02:00
Marc Delisle
4412a3aab6 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-22 08:12:37 -04:00
Madhura Jayaratne
12307045c0 Merge branch 'QA_4_5' 2015-09-22 21:57:08 +10:00
Weblate
58fe80dd11 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-22 13:56:35 +02:00
Martin Lacina
38cb4807dd Translated using Weblate (Slovak) 
Currently translated at 82.8% (2659 of 3209 strings)

[CI skip]
 2015-09-22 13:56:33 +02:00
Madhura Jayaratne
2da36e93b2 Fix #11464 phpMyAdmin suggests upgrading to newer version not usable on that system 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-22 21:35:05 +10:00
Madhura Jayaratne
5f55156c81 Fix doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-22 21:17:42 +10:00
Madhura Jayaratne
7ec4bcdbea Use include for files being included conditionally 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-22 21:11:11 +10:00
Madhura Jayaratne
f1ca1c97e5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-09-22 21:04:31 +10:00
Madhura Jayaratne
3d192002bb Expected 1 space after FUNCTION keyword 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-22 21:03:16 +10:00
Marc Delisle
84a49947e5 Merge pull request #11471 from madhuracj/issue11464 
Fix #11464 phpMyAdmin suggests upgrading to newer version not usable on that system
 2015-09-22 07:02:43 -04:00
Weblate
3968a723ab Merge remote-tracking branch 'origin/master' 2015-09-22 13:01:37 +02:00
Martin Lacina
9901aeddd0 Translated using Weblate (Slovak) 
Currently translated at 82.8% (2659 of 3209 strings)

[CI skip]
 2015-09-22 13:01:32 +02:00
Madhura Jayaratne
45c05e3ad6 Fix coding style violations related to function calls 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-22 21:00:47 +10:00
Madhura Jayaratne
f70add88d6 Return the MySQL version 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-22 17:27:55 +10:00
Madhura Jayaratne
75d7927604 Do not suggest upgrading when there is no compatible versions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-21 21:37:55 +10:00
Marc Delisle
7a2b16dc30 Merge branch 'QA_4_5' 2015-09-20 06:24:24 -04:00
Marc Delisle
f18ac85048 4.4.15 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-20 06:23:57 -04:00
Marc Delisle
0b87f93fec Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-19 13:21:17 -04:00
Marc Delisle
ced0d39979 Use function parameter instead of global 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-18 18:05:59 -04:00
Marc Delisle
5d008acb33 Fix param doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-18 13:56:25 -04:00
Madhura Jayaratne
f40f5d10f4 Merge branch 'QA_4_5' 2015-09-18 21:09:16 +10:00
Madhura Jayaratne
4acfae901c Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-09-18 21:07:32 +10:00