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

103468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
b78f215ad5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-10-27 07:36:45 +11:00
Madhura Jayaratne
c2846af4c8 Fix #11606 PMA_Util not found when changing password 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-27 07:34:13 +11:00
Michal Čihař
402d9ff8e6 Translated using Weblate (Korean) 
Currently translated at 77.1% (2489 of 3228 strings)

[CI skip]
 2015-10-26 11:00:37 +01:00
Madhura Jayaratne
7c43e1f631 Fix #11603 Namespace clash for class Error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-26 19:49:51 +11:00
Madhura Jayaratne
5087a2d2b1 Merge branch 'QA_4_5' 2015-10-26 19:23:37 +11:00
Madhura Jayaratne
653d800a5b Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-10-26 19:15:39 +11:00
Madhura Jayaratne
5ca47d209b Search clause is also a part of the query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-26 19:14:12 +11:00
Kristjan Räts
3c15a3351b Translated using Weblate (Estonian) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-10-26 08:20:58 +01:00
Kristjan Räts
cfaa76c4ae Translated using Weblate (Estonian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-26 08:17:39 +01:00
Madhura Jayaratne
06646c8303 Merge branch 'QA_4_5' 2015-10-26 17:51:24 +11:00
Madhura Jayaratne
2a0b927606 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-10-26 17:49:13 +11:00
Madhura Jayaratne
2625cf3ba3 Merge branch 'QA_4_5' 2015-10-26 17:34:08 +11:00
Madhura Jayaratne
f859287249 Update dummy queries as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-26 17:32:38 +11:00
Madhura Jayaratne
fdf9c25be0 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-10-26 17:28:02 +11:00
Madhura Jayaratne
02a266e9b2 Consistent spacing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-26 17:26:19 +11:00
Madhura Jayaratne
358e001382 Merge branch 'QA_4_5' 2015-10-26 17:22:20 +11:00
Weblate
90d4abd400 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-26 07:06:23 +01:00
Domen
edaffe0f58 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-26 07:06:23 +01:00
Paulo Lopes Duarte
713472da84 Translated using Weblate (Portuguese) 
Currently translated at 54.6% (1755 of 3211 strings)

[CI skip]
 2015-10-26 07:06:22 +01:00
Julian Ladisch
ef90ba025c Translated using Weblate (German) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-26 07:06:22 +01:00
Madhura Jayaratne
2e3ed069c6 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-26 17:06:04 +11:00
Weblate
72d7ad3638 Merge remote-tracking branch 'origin/master' 2015-10-26 06:59:01 +01:00
Domen
ef97ec742b Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-10-26 06:59:00 +01:00
Paulo Lopes Duarte
7af6d0457c Translated using Weblate (Portuguese) 
Currently translated at 54.0% (1746 of 3228 strings)

[CI skip]
 2015-10-26 06:58:59 +01:00
Madhura Jayaratne
f4dee6a0f5 Merge branch 'QA_4_5' 2015-10-26 16:57:58 +11:00
Madhura Jayaratne
6c002b9fbc Fix #11594 'only_db' config option bug when db names contain underscore and are grouped 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-26 16:55:30 +11:00
Julian Ladisch
0ce02a6e56 Translated using Weblate (German) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-10-25 22:31:42 +01:00
Marc Delisle
b49a746d35 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-25 09:54:07 -04:00
Weblate
d5378e47d0 Merge remote-tracking branch 'origin/master' 2015-10-25 13:22:12 +01:00
Hanson String
ea675adeaf Translated using Weblate (Korean) 
Currently translated at 77.0% (2488 of 3228 strings)

[CI skip]
 2015-10-25 13:22:10 +01:00
Marc Delisle
573c0230c1 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-25 08:21:58 -04:00
Marc Delisle
f225e37b2d Merge commit '4f8bb8f' 2015-10-25 08:21:17 -04:00
Weblate
4f8bb8fdda Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-25 13:19:14 +01:00
Hanson String
561cf03f93 Translated using Weblate (Korean) 
Currently translated at 77.8% (2501 of 3211 strings)

[CI skip]
 2015-10-25 13:19:13 +01:00
Marc Delisle
78f7ef3ea3 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-25 08:19:04 -04:00
Weblate
b965217a62 Merge remote-tracking branch 'origin/master' 2015-10-24 22:36:58 +02:00
Andrey Aleksanyants
2fa77c5e82 Translated using Weblate (Armenian) 
Currently translated at 67.5% (2181 of 3228 strings)

[CI skip]
 2015-10-24 22:36:54 +02:00
Marc Delisle
f016df677e Merge branch 'QA_4_5' 2015-10-24 16:36:18 -04:00
Marc Delisle
ba0e6a118c Merge commit 'fa16adc' 2015-10-24 16:36:13 -04:00
Marc Delisle
8e666ec1b5 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-24 16:35:58 -04:00
Marc Delisle
65a9521b4c Merge commit 'da7391a' 2015-10-24 16:29:09 -04:00
Marc Delisle
d809b4cbee ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-24 16:28:28 -04:00
Weblate
fa16adca88 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-24 22:27:27 +02:00
Andrey Aleksanyants
33c6dabfb8 Translated using Weblate (Armenian) 
Currently translated at 67.2% (2160 of 3211 strings)

[CI skip]
 2015-10-24 22:27:25 +02:00
Marc Delisle
b13a92d603 Merge pull request #11601 from devenbansod/fix_11597 
Fix #11597
 2015-10-24 16:27:21 -04:00
Deven Bansod
223a7a5e4e Fix 11597 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-25 04:27:56 +05:30
Hugues Peccatte
0d62b5eb72 Remove nested levels in code. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-24 14:50:57 +02:00
Hugues Peccatte
8ac9634c7a Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-24 13:30:22 +02:00
Hugues Peccatte
8b4590aaa9 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-24 13:08:44 +02:00
Hugues Peccatte
0a947dd9b9 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-24 12:50:30 +02:00