gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,213 Commits 12 Branches 481 Tags 2.4 GiB
16859cd1ca
Commit Graph

99213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
16859cd1ca Merge remote-tracking branch 'origin/master' 2015-04-20 10:24:30 +02:00
Arben Çokaj
28c9fc71a5 Translated using Weblate (Albanian) 
Currently translated at 97.2% (2989 of 3075 strings)

[CI skip]
 2015-04-20 10:24:25 +02:00
Madhura Jayaratne
15caf48a9a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-20 13:54:02 +05:30
Madhura Jayaratne
0d109ac824 This is only a output transformation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 13:52:03 +05:30
Marc Delisle
6e7386ee91 Merge branch 'QA_4_4' 2015-04-19 05:58:38 -04:00
Marc Delisle
32acc6477b Merge commit '147f2e2' 2015-04-19 05:58:26 -04:00
Marc Delisle
ec72500d52 bug #4830 Maximum execution time exceeded in Util.class.php 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-19 05:57:47 -04:00
Burak Yavuz
1f67478ac7 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3075 of 3075 strings)

[CI skip]
 2015-04-19 08:39:41 +02:00
Marc Delisle
ed27666193 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-18 06:28:21 -04:00
Marc Delisle
8f2429c053 Remove extraneous argument 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-17 13:16:09 -04:00
Marc Delisle
feac547d80 Merge branch 'QA_4_4' 2015-04-17 09:52:26 -04:00
Weblate
147f2e2d69 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-04-17 15:52:17 +02:00
Michal Čihař
ac91727505 Translated using Weblate (Czech) 
Currently translated at 96.8% (2939 of 3035 strings)

[CI skip]
 2015-04-17 15:52:13 +02:00
Marc Delisle
e7180f6fac Remove reference to old display direction (see 
6d12882946).

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-17 09:51:06 -04:00
Weblate
b6ecf8b446 Merge remote-tracking branch 'origin/master' 2015-04-17 14:43:12 +02:00
Ondra Šimeček
078ff60935 Translated using Weblate (Czech) 
Currently translated at 95.7% (2943 of 3075 strings)

[CI skip]
 2015-04-17 14:43:10 +02:00
Marc Delisle
6b44f39c21 Merge branch 'QA_4_4' 2015-04-17 08:41:43 -04:00
Marc Delisle
ea43fe8f3e Merge commit 'f9a88ad' 2015-04-17 08:41:33 -04:00
Smita Kumari
fff9acba4e Merge pull request #1651 from smita786/QA_4_4 
fix bug #4857
 2015-04-17 17:35:34 +05:30
Smita Kumari
71f07d1e87 edit changeLog 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2015-04-17 17:33:21 +05:30
Smita Kumari
90336ba418 fix bug #4857 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2015-04-17 16:09:43 +05:30
Madhura Jayaratne
b5d301684b Merge pull request #1650 from madhuracj/rfe1655 
rfe1655 Support IPv6 browser transformation
 2015-04-17 15:52:18 +05:30
Madhura Jayaratne
33c4f54618 Fix unit tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-17 15:05:17 +05:30
Madhura Jayaratne
a8decb18db Adhere to coding style. Check for length of 4 first 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-17 14:41:46 +05:30
Madhura Jayaratne
bb8ca9eab5 Update description 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-17 14:35:13 +05:30
Madhura Jayaratne
a90fd8096a rfe #1655 Support IPv6 browser transformation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-17 14:33:56 +05:30
Madhura Jayaratne
cee4764196 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-17 08:59:07 +05:30
Madhura Jayaratne
4dfaa448eb Better way to check for ui preferences 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-17 08:57:54 +05:30
Marc Delisle
e579ed1220 Use the dot notation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-16 14:20:40 -04:00
Dan Ungureanu
f9a88ad930 Old MySQL extension is not available in newer PHP versions. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-16 11:23:50 -04:00
Weblate
1999e93535 Merge remote-tracking branch 'origin/master' 2015-04-16 15:01:55 +02:00
Michal Čihař
ce5f69c34f Translated using Weblate (Spanish) 
Currently translated at 97.4% (2996 of 3075 strings)

[CI skip]
 2015-04-16 15:01:52 +02:00
Michal Čihař
7002b67b6a Translated using Weblate (Frisian) 
Currently translated at 20.8% (641 of 3075 strings)

[CI skip]
 2015-04-16 15:01:49 +02:00
Marc Delisle
146f790b47 Merge branch 'QA_4_4' 2015-04-16 09:01:20 -04:00
Marc Delisle
95868e896e Bug PHP 7 session_regenerate_id() warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-16 09:00:28 -04:00
Stefano Martinelli
f8973cbe63 Translated using Weblate (Italian) 
Currently translated at 100.0% (3075 of 3075 strings)

[CI skip]
 2015-04-15 23:57:23 +02:00
Marc Delisle
7df3cb4552 Merge branch 'QA_4_4' 2015-04-15 14:57:13 -04:00
Marc Delisle
011438e74a Bug PHP 7 compatibility in bfShapeFiles 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-15 12:56:56 -04:00
Marc Delisle
1ad1a3846b Merge branch 'QA_4_4' 2015-04-15 12:17:58 -04:00
Marc Delisle
e00ec30c9a Merge commit 'c8b943b' 2015-04-15 12:17:51 -04:00
Marc Delisle
77369e5e2b Bug PHP 7 compatibility in php-gettext 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-15 11:32:31 -04:00
Marc Delisle
c8b943b556 Revert "Bug PHP 7 compatibility in php-gettext" 
This reverts commit e637c57c42.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-15 10:18:49 -04:00
Marc Delisle
e637c57c42 Bug PHP 7 compatibility in php-gettext 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-15 10:06:48 -04:00
Madhura Jayaratne
f15f67e604 More resources 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 18:18:30 +05:30
Madhura Jayaratne
266588e74f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-15 18:09:22 +05:30
Madhura Jayaratne
3e363c45b9 These are resources 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 18:08:32 +05:30
Weblate
9700f11030 Merge remote-tracking branch 'origin/master' 2015-04-15 14:04:31 +02:00
Bao trinh minh
7f5bd48be2 Translated using Weblate (Vietnamese) 
Currently translated at 2.2% (70 of 3075 strings)

[CI skip]
 2015-04-15 14:04:28 +02:00
Stefano Martinelli
07f922f717 Translated using Weblate (Italian) 
Currently translated at 99.7% (3066 of 3075 strings)

[CI skip]
 2015-04-15 14:04:25 +02:00
Marc Delisle
be58a349ef Merge branch 'QA_4_4' 2015-04-15 08:03:53 -04:00