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

102352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
93e4af9dd6 Merge branch 'QA_4_5' 2015-09-05 12:21:26 -04:00
Marc Delisle
a2898d760e Fixes #11463 Cannot redeclare class phpseclib\Crypt\AES 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-05 12:20:09 -04:00
Marc Delisle
aa84bfd594 Merge branch 'QA_4_5' 2015-09-05 05:58:53 -04:00
Marc Delisle
cd34ffab02 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-05 05:57:33 -04:00
Marc Delisle
ff358717e4 Fix invalid argument supplied for foreach() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-05 05:43:21 -04:00
Michal Čihař
8e836bdfc8 Merge branch 'QA_4_5' 2015-09-04 14:18:47 +02:00
Michal Čihař
afbe065bde Use ellipsis instead of three dots 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-09-04 14:18:20 +02:00
Marc Delisle
5661a9e6f1 Merge branch 'QA_4_5' 2015-09-04 07:54:19 -04:00
Marc Delisle
ec4a023b49 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-04 07:53:44 -04:00
Marc Delisle
84a60be19c ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-04 07:46:14 -04:00
Marc Delisle
fdd26da4bf Merge pull request #11459 from madhuracj/issue11457 
Fix #11457 414 Request-URI Too Large
 2015-09-04 07:45:14 -04:00
Michal Čihař
f2799ebdb3 Merge branch 'QA_4_5' 2015-09-04 10:21:49 +02:00
Michal Čihař
c857a63031 Merge commit '94b02eb6b075bc8572e3e00d3d7c5345f22c4536' 2015-09-04 10:21:39 +02:00
Michal Čihař
08005965d0 Merge branch 'QA_4_4' into QA_4_5 2015-09-04 10:21:14 +02:00
Michal Čihař
2fdfac49fc Merge commit 'e843ece9dd2984acba5533ce5115333cbeeeb835' into QA_4_5 2015-09-04 10:20:55 +02:00
Michal Čihař
51b72ba53c Change address for discussing translations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-09-04 10:20:35 +02:00
Michal Čihař
95cc6a5809 Change address for discussing translations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-09-04 10:18:29 +02:00
Michal Čihař
f0fa72436c Translated using Weblate (Bodo) 
Currently translated at 0.0% (1 of 3209 strings)

[CI skip]
 2015-09-04 09:33:51 +02:00
Michal Čihař
71adfad1b1 Start Bodo translation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-09-04 09:30:34 +02:00
Madhura Jayaratne
9aab826839 Mark default storage engine 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-04 16:09:05 +10:00
Madhura Jayaratne
5998c1de53 Fix #11457 414 Request-URI Too Large 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-04 09:52:27 +10:00
Marc Delisle
98701140a2 Merge branch 'QA_4_5' 2015-09-03 09:43:50 -04:00
Marc Delisle
7dff03e5c6 Merge commit '56ae423' 2015-09-03 09:43:41 -04:00
Weblate
94b02eb6b0 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-03 15:43:22 +02:00
JongDeok
87081827b9 Translated using Weblate (Korean) 
Currently translated at 77.7% (2496 of 3209 strings)

[CI skip]
 2015-09-03 15:43:20 +02:00
Michal Čihař
578eab7d5a Translated using Weblate (Czech) 
Currently translated at 95.3% (3059 of 3209 strings)

[CI skip]
 2015-09-03 15:43:17 +02:00
Marc Delisle
a21d6f7d0c Merge branch 'QA_4_4' into QA_4_5 2015-09-03 09:42:59 -04:00
Weblate
e843ece9dd Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-09-03 15:42:10 +02:00
Myung-han Yu
c2e8e6d7ac Translated using Weblate (Korean) 
Currently translated at 82.1% (2498 of 3040 strings)

[CI skip]
 2015-09-03 15:42:07 +02:00
Petr Kateřiňák
4fa165e446 Translated using Weblate (Czech) 
Currently translated at 98.1% (2985 of 3040 strings)

[CI skip]
 2015-09-03 15:42:04 +02:00
Vincent Lau
1eff115a5c Translated using Weblate (Chinese (China)) 
Currently translated at 82.5% (2509 of 3040 strings)

[CI skip]
 2015-09-03 15:42:02 +02:00
Marc Delisle
040ecb777b ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-03 09:41:53 -04:00
Dmitry Bakshaev
7b594270a1 cookie authentication: fix cookie_iv length detection with mb_string overload 
Signed-off-by: Dmitry Bakshaev <dab1818@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-03 09:40:25 -04:00
Madhura Jayaratne
4e2c81032b Fix not supported query for tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-03 21:23:45 +10:00
Madhura Jayaratne
234d7bedff Add missing global value for tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-03 21:16:16 +10:00
Madhura Jayaratne
ff799572f4 Fix #11456 Disabled storage engines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-03 20:28:24 +10:00
Madhura Jayaratne
af0522df8f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-09-03 19:01:19 +10:00
Madhura Jayaratne
013b50d8f3 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-03 19:00:06 +10:00
Weblate
1f42bcdbea Merge remote-tracking branch 'origin/master' 2015-09-03 10:57:23 +02:00
Myung-han Yu
7bbdd7d319 Translated using Weblate (Korean) 
Currently translated at 77.7% (2496 of 3209 strings)

[CI skip]
 2015-09-03 10:57:19 +02:00
Michal Čihař
df7d4e6f19 Translated using Weblate (Czech) 
Currently translated at 95.3% (3059 of 3209 strings)

[CI skip]
 2015-09-03 10:57:15 +02:00
Madhura Jayaratne
3b1869c7a2 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-09-03 18:57:00 +10:00
Madhura Jayaratne
4f128f3080 Scroll to top with search results 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-03 18:55:40 +10:00
Myung-han Yu
56ae423359 Translated using Weblate (Korean) 
Currently translated at 77.7% (2495 of 3209 strings)

[CI skip]
 2015-09-03 09:25:36 +02:00
JongDeok
f86cb04a74 Translated using Weblate (Korean) 
Currently translated at 77.7% (2495 of 3209 strings)

[CI skip]
 2015-09-03 09:23:59 +02:00
Myung-han Yu
be5e875760 Translated using Weblate (Korean) 
Currently translated at 77.7% (2494 of 3209 strings)

[CI skip]
 2015-09-03 09:23:29 +02:00
Deleted User
96df3c85aa Translated using Weblate (Korean) 
Currently translated at 77.7% (2494 of 3209 strings)

[CI skip]
 2015-09-03 09:22:34 +02:00
이경준
040e227de2 Translated using Weblate (Korean) 
Currently translated at 77.7% (2494 of 3209 strings)

[CI skip]
 2015-09-03 09:21:33 +02:00
Myung-han Yu
794695c543 Translated using Weblate (Korean) 
Currently translated at 77.7% (2494 of 3209 strings)

[CI skip]
 2015-09-03 09:19:51 +02:00
Weblate
81072142d9 Merge remote-tracking branch 'origin/master' 2015-09-03 07:07:26 +02:00