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

107483 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
0e03ffdb76 Merge branch 'QA_4_6' 2016-10-17 17:13:31 +02:00
Michal Čihař
307dd63354 ChangeLog entry for #12472 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-17 17:13:25 +02:00
Michal Čihař
6a4cf7b1ec Merge pull request #12631 from devenbansod/fix_12472 
Fix order of testing DBConnection with different parameters in Config method
 2016-10-17 17:12:40 +02:00
Michal Čihař
4311ea09d9 Merge branch 'QA_4_6' 2016-10-17 17:03:12 +02:00
Michal Čihař
d47956461f Merge remote-tracking branch 'origin/pull/12616' into QA_4_6 2016-10-17 17:02:25 +02:00
Michal Čihař
62b6e640fc Merge branch 'QA_4_6' 2016-10-17 17:01:18 +02:00
Michal Čihař
153d6ca4f0 Merge remote-tracking branch 'origin/QA_4_6' 2016-10-17 17:01:15 +02:00
Michal Čihař
198e257da4 Merge commit '57451f31c8ef8ba0d9dd695dd9004dbdaec2e10c' 2016-10-17 17:01:06 +02:00
Michal Čihař
d6680545ff ChangeLog entry for #12632 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-17 17:00:42 +02:00
Weblate
0b59c6283e Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-17 16:59:52 +02:00
SDSkyKlouD
eebe1471b7 Translated using Weblate (Korean) 
Currently translated at 79.7% (2558 of 3206 strings)

[CI skip]
 2016-10-17 16:59:51 +02:00
Michal Čihař
57451f31c8 Merge pull request #12632 from devenbansod/fix_12366 
Use IDENTIFIED BY 'auth_string' if password check plugin is active
 2016-10-17 16:59:43 +02:00
Weblate
4f11e13e17 Merge remote-tracking branch 'origin/master' 2016-10-17 16:53:38 +02:00
SDSkyKlouD
97c182c715 Translated using Weblate (Korean) 
Currently translated at 79.4% (2557 of 3219 strings)

[CI skip]
 2016-10-17 16:53:36 +02:00
Michal Čihař
4e237821fc Use 7.1.0RC3 for tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-17 16:52:11 +02:00
Deven Bansod
25ee53c183 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-17 13:40:25 +05:30
Weblate
870527df77 Merge remote-tracking branch 'origin/master' 2016-10-17 10:10:00 +02:00
Deven Bansod
555d5104b5 Merge branch 'QA_4_6' 
Conflicts:
	po/id.po
	po/ko.po
 2016-10-17 13:41:21 +05:30
Zulfikar
d28c77783d Translated using Weblate (Indonesian) 
Currently translated at 69.2% (2228 of 3219 strings)

[CI skip]
 2016-10-17 10:09:57 +02:00
Deven Bansod
f9ed7a5054 ChangeLog for #12639 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-17 13:39:11 +05:30
Deven Bansod
334910216e Check if the function actually has arguments or not 
Fix #12639

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-17 13:36:09 +05:30
Weblate
d37af63415 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-17 10:05:19 +02:00
Zulfikar
61ec405c16 Translated using Weblate (Indonesian) 
Currently translated at 69.6% (2232 of 3206 strings)

[CI skip]
 2016-10-17 10:05:18 +02:00
Weblate
04408b1f52 Merge remote-tracking branch 'origin/master' 2016-10-15 09:38:23 +02:00
Deven Bansod
790882735d Merge branch 'QA_4_6' 2016-10-15 13:09:59 +05:30
Deven Bansod
1aaedb32ca Don't output edit/delete row links when table is not set 
Issue #12625

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-15 13:08:58 +05:30
SDSkyKlouD
dbdd146794 Translated using Weblate (Korean) 
Currently translated at 78.5% (2529 of 3219 strings)

[CI skip]
 2016-10-15 09:38:21 +02:00
Weblate
55b3366d64 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-15 09:37:45 +02:00
SDSkyKlouD
96b40611db Translated using Weblate (Korean) 
Currently translated at 78.9% (2530 of 3206 strings)

[CI skip]
 2016-10-15 09:37:43 +02:00
Deven Bansod
89d10569e9 Merge branch 'QA_4_6' 
Conflicts:
	po/ko.po
	po/pt_BR.po
 2016-10-15 11:57:51 +05:30
Deven Bansod
5c600140cc Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-15 11:56:19 +05:30
Deven Bansod
adec50866c ChangeLog for #12338 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-15 11:55:38 +05:30
Deven Bansod
02b1d17c56 Reload the current page after adding/deleting a relation in Designer 
Fix #12338

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-15 10:49:39 +05:30
Weblate
90d81d9ffd Merge remote-tracking branch 'origin/master' 2016-10-15 07:19:03 +02:00
Deven Bansod
57d4ad7c43 Merge branch 'QA_4_6' 2016-10-15 10:50:46 +05:30
Vinicius Moreira (Vm Creative)
be29fc6a53 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.8% (2989 of 3219 strings)

[CI skip]
 2016-10-15 07:19:02 +02:00
SDSkyKlouD
6d8ff8a1e5 Translated using Weblate (Korean) 
Currently translated at 78.1% (2516 of 3219 strings)

[CI skip]
 2016-10-15 07:19:01 +02:00
Weblate
38dc43af2f Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-15 07:18:20 +02:00
Vinicius Moreira (Vm Creative)
b38e22e25f Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.3% (2993 of 3206 strings)

[CI skip]
 2016-10-15 07:18:19 +02:00
SDSkyKlouD
78dadd42fa Translated using Weblate (Korean) 
Currently translated at 78.6% (2522 of 3206 strings)

[CI skip]
 2016-10-15 07:18:18 +02:00
Weblate
650522ef28 Merge remote-tracking branch 'origin/master' 2016-10-14 06:37:05 +02:00
Deven Bansod
b95c35e5cc Merge branch 'QA_4_6' 2016-10-14 10:08:51 +05:30
dingo thirteen
2ca85411f4 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-10-14 06:37:02 +02:00
Deven Bansod
5668fa558b Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-14 10:01:55 +05:30
Deven Bansod
34637a71d8 ChangeLog for #12634 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-14 10:01:04 +05:30
Deven Bansod
201ba095ce Adjust tests 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-14 10:01:04 +05:30
Deven Bansod
c00cf34886 Use IF EXISTS with DROP Database while exporting to prevent error while importing this dump 
Fix #12634

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-14 10:00:50 +05:30
Deven Bansod
6ed1da5a45 Merge branch 'QA_4_6' 2016-10-14 09:59:32 +05:30
Deven Bansod
3accab1764 Adjust tests 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-14 09:55:50 +05:30
Deven Bansod
41b07b2009 Use IF EXISTS with DROP Database to prevent error while importing 
Fix #12634

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-14 09:54:50 +05:30