gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,003 Commits 12 Branches 481 Tags 2.4 GiB
02a3e2e096
Commit Graph

98003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
02a3e2e096 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-02-23 18:54:08 +05:30
Madhura Jayaratne
cf70ed404f Merge branch 'QA_4_3' 2015-02-23 18:53:32 +05:30
Madhura Jayaratne
bf428dc0ca Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 18:52:37 +05:30
Madhura Jayaratne
228f9c8de1 bug #4760 Cannot re-import settings from local storage 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 18:39:49 +05:30
Marc Delisle
a84e476902 Merge branch 'QA_4_3' 2015-02-23 08:01:11 -05:00
Marc Delisle
f2170d3bc6 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-23 08:00:44 -05:00
Deven Bansod
6c96b00713 Fix bug #4753 | Added a 6px margin to Textarea fields 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-02-23 07:57:31 -05:00
Madhura Jayaratne
839c3e9433 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-02-23 18:24:57 +05:30
Madhura Jayaratne
073712a442 Use empty string as the default value. Otherwise it gives trouble importing stored settings 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 18:23:39 +05:30
Marc Delisle
503bbae97a Translated using Weblate (French) 
Currently translated at 100.0% (3019 of 3019 strings)

[CI skip]
 2015-02-23 13:51:23 +01:00
Madhura Jayaratne
8f9ff979fa Merge branch 'QA_4_3' 2015-02-23 15:12:15 +05:30
Weblate
744703d528 Merge remote-tracking branch 'origin/master' 2015-02-23 10:41:56 +01:00
Giovanni Sora
faac4e8755 Translated using Weblate (Interlingua) 
Currently translated at 64.8% (1959 of 3019 strings)

[CI skip]
 2015-02-23 10:41:53 +01:00
Madhura Jayaratne
7ddabcaf1b bug #4767 Drizzle: undefined index in mysql_charsets.inc.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 15:05:08 +05:30
Madhura Jayaratne
f7a00a10e1 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-02-23 13:10:08 +05:30
Madhura Jayaratne
2bb6492834 More default transformations for pmadb 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 13:09:23 +05:30
Michal Čihař
636125002e Add Buildtime Trend Service 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-02-23 08:31:06 +01:00
Madhura Jayaratne
fce5238f03 Override background as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 12:16:03 +05:30
Madhura Jayaratne
6642772f43 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 11:59:37 +05:30
Madhura Jayaratne
55dccb6138 bug #4777 Some images are missing in Designer for original theme 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 11:58:26 +05:30
Madhura Jayaratne
486aa9c97f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-02-23 11:39:32 +05:30
Madhura Jayaratne
df99d9874d Maked rows should not affect toggler 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 11:38:33 +05:30
Burak Yavuz
e1b049c9b9 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3019 of 3019 strings)

[CI skip]
 2015-02-23 06:54:15 +01:00
Weblate
e4301af7ed Merge remote-tracking branch 'origin/master' 2015-02-23 05:09:58 +01:00
Helder Santana
fa4401938f Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 95.4% (2883 of 3019 strings)

[CI skip]
 2015-02-23 05:09:55 +01:00
Madhura Jayaratne
5619047ab9 rfe Change tracking activation status from db level tracking page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 09:37:45 +05:30
Madhura Jayaratne
a43c9b2df0 Activate/deactivate tracking with a single parameter 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-23 08:45:33 +05:30
Hugues Peccatte
05ebf9a3a7 Fix typos. 
Minor PHPDoc update.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-22 22:54:09 +01:00
Hugues Peccatte
e669cb4708 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-02-22 22:52:35 +01:00
Hugues Peccatte
4846ef6bf7 Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-22 22:51:12 +01:00
Balázs Úr
22045d341f Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3019 of 3019 strings)

[CI skip]
 2015-02-22 22:50:07 +01:00
Marc Delisle
8a68634707 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 16:03:47 -05:00
Marc Delisle
17c9592f3c Use standard backquote method 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 16:03:08 -05:00
Marc Delisle
d2de03ebbe Use shorter operator 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 15:58:25 -05:00
Marc Delisle
5a8208f67c ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 15:54:10 -05:00
Marc Delisle
e71496dc84 Merge pull request #1508 from devenbansod/feat-req-1606 
Adding Filter Process List | Feature #1606
 2015-02-22 15:52:31 -05:00
Hugues Peccatte
52bfc94d74 Update PHPDoc. 
Fix typo.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-22 20:03:32 +01:00
Deven Bansod
42d5a90f2f Add Filter to Process List | Feature #1606 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-02-22 22:52:47 +05:30
Marc Delisle
c132f6697b Merge branch 'QA_4_3' 2015-02-22 08:34:52 -05:00
Marc Delisle
5bf0dd4de1 Merge commit 'e835710' 2015-02-22 08:34:45 -05:00
Weblate
9c38a97cc4 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-02-22 14:34:43 +01:00
JongDeok
d0f0bd00a5 Translated using Weblate (Korean) 
Currently translated at 82.8% (2472 of 2982 strings)

[CI skip]
 2015-02-22 14:34:39 +01:00
Masahiko HISAKAWA
65a334414d Translated using Weblate (Japanese) 
Currently translated at 74.3% (2217 of 2982 strings)

[CI skip]
 2015-02-22 14:34:35 +01:00
Marc Delisle
efbfe9a0b4 bug #4768 MariaDB: version mismatch 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 08:33:18 -05:00
Weblate
8ab3daca44 Merge remote-tracking branch 'origin/master' 2015-02-22 13:52:40 +01:00
JongDeok
013de65c48 Translated using Weblate (Korean) 
Currently translated at 81.4% (2452 of 3012 strings)

[CI skip]
 2015-02-22 13:52:37 +01:00
Marc Delisle
3e8ed57470 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 07:52:26 -05:00
Koo Young Min
e1944a45a6 Translated using Weblate (Korean) 
Currently translated at 81.3% (2451 of 3012 strings)

[CI skip]
 2015-02-21 19:46:07 +01:00
Koo Young Min
e835710fac Translated using Weblate (Korean) 
Currently translated at 82.8% (2471 of 2982 strings)

[CI skip]
 2015-02-21 19:45:56 +01:00
Atul Pratap Singh
0697b0b859 Merge commit '0abfb99' 2015-02-21 22:46:55 +05:30