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

96111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugues Peccatte
f0b18d5028 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-11-22 22:36:31 +01:00
Hugues Peccatte
c13aaed8af Minor coding style modifications. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-22 19:29:01 +01:00
Hugues Peccatte
d4330b47e3 Fix too long lines in pmd.css.php. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-22 19:28:43 +01:00
Marc Delisle
15d7b17e80 Merge branch 'QA_4_3' 2014-11-22 09:11:35 -05:00
Marc Delisle
ed6ba4210f Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:10:08 -05:00
Marc Delisle
0489e3248d Merge commit '783e28f' into QA_4_3 2014-11-22 09:09:32 -05:00
Marc Delisle
9af3635c26 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:09:18 -05:00
Marc Delisle
02fcb6e746 Add FAQ reference 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:04:11 -05:00
Marc Delisle
783e28f160 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:02:53 -05:00
Hugues Peccatte
404e99aa0f Reduce nesting levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-22 13:42:23 +01:00
Hugues Peccatte
d8f1c3446b Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-11-22 13:36:05 +01:00
Hugues Peccatte
15461fa0ea Remove trailing whitespaces. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-22 13:29:06 +01:00
Marc Delisle
47b1f9e6b2 Merge pull request #1397 from madhuracj/multiquery 
Multiquery
 2014-11-22 07:28:54 -05:00
Weblate
faba4612f8 Merge remote-tracking branch 'origin/master' 2014-11-22 13:21:05 +01:00
Sevdimali İsa
651261c25a Translated using Weblate (Azerbaijani) 
Currently translated at 51.6% (1537 of 2976 strings)

[CI skip]
 2014-11-22 13:21:03 +01:00
Marc Delisle
04d0c79530 Merge commit '42bf15e' 2014-11-22 07:19:49 -05:00
Marc Delisle
43beddf4df Merge commit '1110d08' 2014-11-22 07:18:57 -05:00
Weblate
42bf15ea70 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-22 13:17:54 +01:00
Sevdimali İsa
4bade1edfd Translated using Weblate (Azerbaijani) 
Currently translated at 51.6% (1537 of 2978 strings)

[CI skip]
 2014-11-22 13:17:52 +01:00
Marc Delisle
11b1dd67fb Merge branch 'QA_4_2' into QA_4_3 2014-11-22 07:14:17 -05:00
Marc Delisle
1110d08743 bug #4604 Query history not being deleted 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 07:13:41 -05:00
Marc Delisle
8fd8766587 Remove code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-21 10:25:18 -05:00
Marc Delisle
4f985d9c4c Merge branch 'QA_4_3' 2014-11-21 10:18:29 -05:00
Marc Delisle
3810111659 Incorrect offset in tracking report 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-21 10:17:52 -05:00
Marc Delisle
2eb927d870 Merge branch 'QA_4_3' 2014-11-20 12:15:00 -05:00
Marc Delisle
89515a0aa3 4.2.13-dev in ChangeLog 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-20 12:14:28 -05:00
Madhura Jayaratne
76a441c0ca Merge branch 'QA_4_3' 2014-11-20 21:59:09 +05:30
Madhura Jayaratne
0ca9f5f2c8 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-11-20 21:56:57 +05:30
Madhura Jayaratne
c2cf281dd6 Fix merge errors. MB functions are not required to handle geometry type names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 21:55:37 +05:30
Weblate
efee6fa7ef Merge remote-tracking branch 'origin/master' 2014-11-20 17:19:21 +01:00
Sandro Amaral
258351f52f Translated using Weblate (Portuguese) 
Currently translated at 61.0% (1819 of 2978 strings)

[CI skip]
 2014-11-20 17:19:19 +01:00
Madhura Jayaratne
45a971a561 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 21:48:50 +05:30
Weblate
23d65f6889 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-20 17:15:23 +01:00
Sandro Amaral
791243700f Translated using Weblate (Portuguese) 
Currently translated at 61.0% (1819 of 2978 strings)

[CI skip]
 2014-11-20 17:15:22 +01:00
Madhura Jayaratne
93366c8c24 Merge branch 'QA_4_2' into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 21:44:53 +05:30
Marc Delisle
3443cc1ca4 4.2.13-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-20 10:35:46 -05:00
Marc Delisle
82f13d3e1b Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-20 10:30:53 -05:00
Weblate
b7178c6fa3 Merge remote-tracking branch 'origin/master' 2014-11-20 14:18:59 +01:00
Sandro Amaral
1c0f3e2434 Translated using Weblate (Portuguese) 
Currently translated at 61.0% (1817 of 2978 strings)

[CI skip]
 2014-11-20 14:18:56 +01:00
Marc Delisle
5968b5c98c Merge commit '5ac08bd' 2014-11-20 08:18:46 -05:00
Weblate
c7d9a99683 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-20 14:18:27 +01:00
Sandro Amaral
ce8c536145 Translated using Weblate (Portuguese) 
Currently translated at 60.9% (1816 of 2978 strings)

[CI skip]
 2014-11-20 14:18:25 +01:00
Marc Delisle
5ac08bde49 4.3.0-beta1 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-20 08:18:11 -05:00
Michal Čihař
f06ee5205d Merge branch 'QA_4_3' 2014-11-20 10:36:33 +01:00
Michal Čihař
2ac39b2390 Another typo in plural form 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-20 10:36:21 +01:00
Michal Čihař
f5afbc763e Merge branch 'QA_4_3' 2014-11-20 10:32:23 +01:00
Michal Čihař
5c6d1c9423 Fix plural equation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-20 10:32:16 +01:00
Michal Čihař
c0d847f698 Merge branch 'QA_4_3' 2014-11-20 10:29:23 +01:00
Michal Čihař
c11efb678d This is binary string, can not use mb_strlen 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-20 10:28:53 +01:00
Michal Čihař
8fc377d83a Share code for resetting IV size 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-20 10:27:01 +01:00