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

102303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
81072142d9 Merge remote-tracking branch 'origin/master' 2015-09-03 07:07:26 +02:00
Vincent Lau
5f9153918a Translated using Weblate (Chinese (China)) 
Currently translated at 76.9% (2468 of 3209 strings)

[CI skip]
 2015-09-03 07:07:21 +02:00
Madhura Jayaratne
491ccf1f13 Merge branch 'QA_4_5' 2015-09-03 15:06:47 +10:00
Madhura Jayaratne
2d83476d82 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-09-03 15:05:19 +10:00
Madhura Jayaratne
c8c12767c0 Fix another test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-03 15:04:10 +10:00
Weblate
0123628fbe Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-03 06:59:45 +02:00
Vincent Lau
99c0ace7ef Translated using Weblate (Chinese (China)) 
Currently translated at 76.9% (2468 of 3209 strings)

[CI skip]
 2015-09-03 06:59:42 +02:00
Madhura Jayaratne
ae92e02dbf Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-03 14:59:27 +10:00
Madhura Jayaratne
8f0f0c5bbe Merge branch 'QA_4_5' 2015-09-03 10:06:53 +10:00
Madhura Jayaratne
06e0773d94 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-09-03 09:54:41 +10:00
Madhura Jayaratne
b48c414c0b Fix bugs introduced in 788c96e8c7 while fixing issue #11442 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-03 09:53:34 +10:00
Marc Delisle
3a65539c7f Merge commit '2fc3df8' 2015-09-02 16:55:22 -04:00
Marc Delisle
931aac1374 Merge branch 'QA_4_5' 2015-09-02 16:54:54 -04:00
Weblate
2fc3df8bbf Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-02 22:54:28 +02:00
dingo thirteen
aa961ccb02 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2015-09-02 22:54:26 +02:00
Marc Delisle
e1b916b223 4.5.0-beta2 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-02 16:54:17 -04:00
dingo thirteen
a1a9f509fc Translated using Weblate (Dutch) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2015-09-02 19:53:14 +02:00
Marc Delisle
73e71c68c8 Merge branch 'QA_4_5' 2015-09-02 11:37:32 -04:00
Weblate
8c2df4a396 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-02 17:37:21 +02:00
Παναγιώτης Παπάζογλου
d800b26a9b Translated using Weblate (Greek) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2015-09-02 17:37:19 +02:00
Dmitry Bakshaev
c1495982ab 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-02 11:35:45 -04:00
Παναγιώτης Παπάζογλου
622e74ea4d Translated using Weblate (Greek) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2015-09-02 15:20:58 +02:00
Madhura Jayaratne
9843e00e7b Merge branch 'QA_4_5' 2015-09-02 23:01:15 +10:00
Madhura Jayaratne
5916f3b8da Fix #11454 Find and replace is broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-02 22:58:58 +10:00
Weblate
a2e928dcd6 Merge remote-tracking branch 'origin/master' 2015-09-02 14:07:34 +02:00
Petr Kateřiňák
f07d4c313b Translated using Weblate (Czech) 
Currently translated at 93.6% (3005 of 3209 strings)

[CI skip]
 2015-09-02 14:07:29 +02:00
Marc Delisle
4fe8c5f496 Merge branch 'QA_4_5' 2015-09-02 08:07:15 -04:00
Weblate
f242a1c4d4 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-02 14:06:58 +02:00
Petr Kateřiňák
73bd29f96a Translated using Weblate (Czech) 
Currently translated at 93.6% (3005 of 3209 strings)

[CI skip]
 2015-09-02 14:06:55 +02:00
Marc Delisle
85f6849921 Avoid fetching a variable that was only introduced in MySQL 5.7.2 
Fix a notice due to the new way of fetching system variables

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-02 08:05:24 -04:00
Madhura Jayaratne
e24e0a6931 Merge branch 'QA_4_5' 2015-09-02 19:28:39 +10:00
Madhura Jayaratne
9c0a2b2837 Merge branch 'QA_4_4' into QA_4_5 2015-09-02 19:27:47 +10:00
Madhura Jayaratne
aa858ae736 #11451 Designer-Bug in move.js on multiple server configuration 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-02 19:25:12 +10:00
Madhura Jayaratne
8b1b24de64 Merge branch 'QA_4_5' 2015-09-02 16:56:22 +10:00
Madhura Jayaratne
80ae3f2e58 Fix #11450 Validation fails when using functions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-02 16:54:00 +10:00
Marc Delisle
ef18a3a9b7 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-01 14:35:54 -04:00
Marc Delisle
a4456bde74 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-01 12:10:56 -04:00
Deven Bansod
529b9ff4c8 Refactor queries fn and fix errors related to add/copy user 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-09-02 00:34:08 +05:30
Marc Delisle
24c90955e1 Merge commit 'aebb278' 2015-09-01 12:08:15 -04:00
Marc Delisle
2bf07ffac6 Merge pull request #11449 from devenbansod/fix_refactor_add_copy_user 
Refactor queries fn and fix errors related to add/copy user
 2015-09-01 12:07:07 -04:00
Weblate
1a6941e2e2 Merge remote-tracking branch 'origin/master' 2015-09-01 16:55:22 +02:00
Burak Yavuz
6368624cb8 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2015-09-01 16:55:18 +02:00
Domen
120d4ea895 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2015-09-01 16:55:13 +02:00
Claus Svalekjaer
2683d6a212 Translated using Weblate (Danish) 
Currently translated at 93.1% (2990 of 3209 strings)

[CI skip]
 2015-09-01 16:55:09 +02:00
Arben Çokaj
3004a58bd4 Translated using Weblate (Albanian) 
Currently translated at 96.5% (3098 of 3209 strings)

[CI skip]
 2015-09-01 16:55:06 +02:00
Marc Delisle
4806769c95 Merge branch 'QA_4_5' 2015-09-01 10:54:50 -04:00
Marc Delisle
dbc591b503 Merge commit '32e155a' 2015-09-01 10:54:28 -04:00
Marc Delisle
4de25c684d Merge commit 'c3c0dd0' 2015-09-01 10:54:17 -04:00
Weblate
aebb278577 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-01 16:54:01 +02:00
Kristjan Räts
d87c7bdcbc Translated using Weblate (Estonian) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2015-09-01 16:53:58 +02:00