gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,392 Commits 12 Branches 481 Tags 2.4 GiB
42ecc045a9
Commit Graph

95392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
42ecc045a9 Merge branch 'QA_4_2' 2014-10-11 07:59:07 -04:00
Marc Delisle
1d2684cee1 Merge commit 'f1d8620' 2014-10-11 07:58:59 -04:00
Marc Delisle
360073a933 4.2.10 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-11 07:58:03 -04:00
Weblate
c32d1d6230 Merge remote-tracking branch 'origin/master' 2014-10-11 13:51:55 +02:00
Anders Jonsson
26c01500bc Translated using Weblate (Swedish) 
Currently translated at 91.6% (2716 of 2965 strings)

[CI skip]
 2014-10-11 13:51:54 +02:00
Xosé Calvo
964b2a47ad Translated using Weblate (Galician) 
Currently translated at 79.3% (2352 of 2965 strings)

[CI skip]
 2014-10-11 13:51:52 +02:00
Marc Delisle
afd078124d Merge commit '4fb6012' 2014-10-11 07:51:36 -04:00
Marc Delisle
e8c57794cd 4.2.11-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-11 07:51:11 -04:00
Weblate
f1d862096d Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-11 13:50:15 +02:00
Anders Jonsson
6dcb49a959 Translated using Weblate (Swedish) 
Currently translated at 99.7% (2762 of 2768 strings)

[CI skip]
 2014-10-11 13:50:13 +02:00
Xosé Calvo
9492a73fd1 Translated using Weblate (Galician) 
Currently translated at 86.3% (2389 of 2768 strings)

[CI skip]
 2014-10-11 13:50:11 +02:00
Marc Delisle
4fb60125fb 4.2.11-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-11 07:49:52 -04:00
Marc Delisle
8aa7a15ee0 Code cleanup 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-10 08:56:58 -04:00
Marc Delisle
9d187c0df6 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-10 08:03:25 -04:00
Madhura Jayaratne
f7140cfdd5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-10 12:04:19 +05:30
Madhura Jayaratne
460b71fc8d Status menu should be active for server_status_processes.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 12:00:42 +05:30
Weblate
17bb5aed89 Merge remote-tracking branch 'origin/master' 2014-10-10 08:14:05 +02:00
이 형진
a98f3bfbef Translated using Weblate (Korean) 
Currently translated at 80.4% (2384 of 2965 strings)

[CI skip]
 2014-10-10 08:14:03 +02:00
Madhura Jayaratne
dcaf3e1ab1 Merge branch 'QA_4_2' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 11:43:31 +05:30
Weblate
44f127c318 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-10 08:08:53 +02:00
이 형진
d275e429c4 Translated using Weblate (Korean) 
Currently translated at 84.9% (2352 of 2768 strings)

[CI skip]
 2014-10-10 08:08:52 +02:00
Michael Koch
ef075ea270 Translated using Weblate (German) 
Currently translated at 99.5% (2756 of 2768 strings)

[CI skip]
 2014-10-10 08:08:51 +02:00
Madhura Jayaratne
dc4d694bd4 bug #4556 Fast filters for tables, views etc. should be governed by NavigationTreeDisplayItemFilterMinimum 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 11:38:19 +05:30
Weblate
f9ada30dba Merge remote-tracking branch 'origin/master' 2014-10-09 16:01:28 +02:00
Michael Koch
7126860139 Translated using Weblate (German) 
Currently translated at 99.7% (2959 of 2965 strings)

[CI skip]
 2014-10-09 16:01:27 +02:00
Marc Delisle
dbf5533376 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-09 10:01:15 -04:00
Madhura Jayaratne
b71e7a0599 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-09 12:29:54 +05:30
Madhura Jayaratne
f399b3f2ee Add a ChangeLog entry for bug #3165 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 12:27:42 +05:30
Weblate
bd9d791157 Merge remote-tracking branch 'origin/master' 2014-10-09 08:18:43 +02:00
Burak Yavuz
72a631235c Translated using Weblate (Turkish) 
Currently translated at 100.0% (2965 of 2965 strings)

[CI skip]
 2014-10-09 08:18:41 +02:00
Michael Koch
f09c4a3281 Translated using Weblate (German) 
Currently translated at 98.4% (2919 of 2965 strings)

[CI skip]
 2014-10-09 08:18:40 +02:00
josep constanti
181c54f436 Translated using Weblate (Catalan) 
Currently translated at 82.0% (2433 of 2965 strings)

[CI skip]
 2014-10-09 08:18:38 +02:00
Madhura Jayaratne
70994d4cce Merge branch 'QA_4_2' 2014-10-09 11:47:39 +05:30
Weblate
3871584791 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-09 08:15:49 +02:00
Burak Yavuz
aebe78830e Translated using Weblate (Turkish) 
Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]
 2014-10-09 08:15:48 +02:00
Michael Koch
6d34ce8543 Translated using Weblate (German) 
Currently translated at 99.2% (2746 of 2768 strings)

[CI skip]
 2014-10-09 08:15:46 +02:00
josep constanti
04fb8a291b Translated using Weblate (Catalan) 
Currently translated at 86.5% (2395 of 2768 strings)

[CI skip]
 2014-10-09 08:15:45 +02:00
Madhura Jayaratne
cbcacb0f0a Merge branch 'MAINT_4_2_9' into QA_4_2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 11:44:22 +05:30
Weblate
5f8d081411 Merge remote-tracking branch 'origin/master' 2014-10-08 14:48:24 +02:00
Michael Koch
6a658f0410 Translated using Weblate (German) 
Currently translated at 90.2% (2677 of 2965 strings)

[CI skip]
 2014-10-08 14:48:23 +02:00
Marc Delisle
3ace78d638 Merge branch 'QA_4_2' 2014-10-08 08:46:48 -04:00
Marc Delisle
1795aece1a Merge commit '21032ab' 2014-10-08 08:46:41 -04:00
Marc Delisle
d189751262 Merge commit '536d4ef' 2014-10-08 08:45:54 -04:00
Marc Delisle
de12f8359a ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-08 08:45:05 -04:00
Weblate
21032ab3b1 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-08 14:42:45 +02:00
Michael Koch
dc3cabd654 Translated using Weblate (German) 
Currently translated at 95.2% (2637 of 2768 strings)

[CI skip]
 2014-10-08 14:42:44 +02:00
Marc Delisle
92efd1f7e1 Merge pull request #1374 from ashutoshdhundhara/bug_4554 
bug #4554 Grid-editing timestamp column forces datepicker.
 2014-10-08 08:42:34 -04:00
Ashutosh Dhundhara
536d4ef845 bug #4554 Grid-editing timestamp column forces datepicker. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-10-08 15:32:50 +05:30
Madhura Jayaratne
f8c1656aff Merge branch 'QA_4_2' 2014-10-07 19:36:13 +05:30
Madhura Jayaratne
01d6a06c52 Update Dummy DBI for tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 19:33:25 +05:30