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

99180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marc Delisle
36ca744181 Merge commit '603f93d' 2015-04-15 08:03:40 -04:00
Marc Delisle
96cf06deed Merge commit '61e413b' 2015-04-15 08:03:31 -04:00
Marc Delisle
223b205866 Merge commit '9a04e80' 2015-04-15 08:03:17 -04:00
Marc Delisle
0e3b294ff2 Merge branch 'QA_4_4' of https://github.com/phpmyadmin/phpmyadmin into QA_4_4 2015-04-15 08:01:09 -04:00
Marc Delisle
603f93d168 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-15 08:01:01 -04:00
Weblate
61e413b3ea Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-04-15 14:00:32 +02:00
Bao trinh minh
01b0bfd36c Translated using Weblate (Vietnamese) 
Currently translated at 2.3% (70 of 3035 strings)

[CI skip]
 2015-04-15 14:00:29 +02:00
Stefano Martinelli
9553647c62 Translated using Weblate (Italian) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-04-15 14:00:26 +02:00
Marc Delisle
1659caf8e8 Merge pull request #1646 from madhuracj/Bug4853 
Bug #4853 Relation view between 1600 and 1780 px
 2015-04-15 08:00:23 -04:00
Madhura Jayaratne
9a04e80561 Make the layout responsive 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 16:58:11 +05:30
Madhura Jayaratne
d1b77a2949 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 09:00:32 +05:30
Madhura Jayaratne
91da1a8f38 Fix issues related to number of decimal places in time 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 08:55:44 +05:30
Weblate
4ae2e6f6b1 Merge remote-tracking branch 'origin/master' 2015-04-15 04:47:01 +02:00
Stefano Martinelli
963ada5887 Translated using Weblate (Italian) 
Currently translated at 98.8% (3041 of 3075 strings)

[CI skip]
 2015-04-15 04:46:58 +02:00
Madhura Jayaratne
29f59a7090 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 08:16:03 +05:30
Weblate
5d18ac872c Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-04-15 04:42:28 +02:00
Stefano Martinelli
972349d1fc Translated using Weblate (Italian) 
Currently translated at 99.1% (3010 of 3035 strings)

[CI skip]
 2015-04-15 04:42:25 +02:00
Madhura Jayaratne
111cb8235a $meta->decimals is not available for mysql extension 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 08:12:07 +05:30
Madhura Jayaratne
0e13997475 bug #4794 Server error viewing table content 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 07:56:17 +05:30
Marc Delisle
c9dc6408b2 Merge branch 'QA_4_4' 2015-04-14 13:29:52 -04:00
Marc Delisle
965075452a Merge commit '0acbf99' 2015-04-14 13:29:43 -04:00
Marc Delisle
b764ec8971 Merge commit 'ff8b956' 2015-04-14 13:29:34 -04:00
Marc Delisle
bc76252f26 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-14 13:29:23 -04:00
Marc Delisle
0327c0273d Merge commit 'cfa542c' 2015-04-14 13:28:48 -04:00
Marc Delisle
c16798e0b4 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-14 13:27:43 -04:00
Madhura Jayaratne
5b8b8bc8dc Merge branch 'QA_4_4' 2015-04-14 22:57:35 +05:30
Marc Delisle
0acbf99549 Fix unit tests for Cloudflare support 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-14 13:27:08 -04:00
Weblate
ff8b956d2b Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-04-14 19:26:20 +02:00
Marc Delisle
bfbbafdcb6 Translated using Weblate (French) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-04-14 19:26:17 +02:00
Xavier Navarro
8d745ab4eb Translated using Weblate (Catalan) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-04-14 19:26:16 +02:00
Madhura Jayaratne
0f3840138f bug #4207 json_encode error due to strftime returning non utf8 chars in Windows 8.1 Chinese version 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-14 22:56:00 +05:30
Marc Delisle
6806cff468 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-14 13:11:47 -04:00
Ryan Stasel
cfa542cfa9 Bug #4845 White screen (Cloudflare) 
Signed-off-by: Ryan Stasel <staze@staze.org>
 2015-04-14 13:09:56 -04:00