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

99146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Marc Delisle
3dbc09a2b3 Merge pull request #1643 from PAlexcom/master-composer 
Ignore ./vendor directory of composer
 2015-04-14 09:14:40 -04:00
Marc Delisle
fe958159ac Translated using Weblate (French) 
Currently translated at 100.0% (3075 of 3075 strings)

[CI skip]
 2015-04-14 15:06:17 +02:00
Andreas Stieger
9d080a482f Use verbatim GPL 2.0 licence text 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-14 08:07:04 -04:00
Xavier Navarro
bf86d88649 Translated using Weblate (Catalan) 
Currently translated at 100.0% (3075 of 3075 strings)

[CI skip]
 2015-04-14 13:29:27 +02:00
Madhura Jayaratne
b398635e1a Merge branch 'QA_4_4' 2015-04-14 10:01:05 +05:30
Madhura Jayaratne
fe3a103767 bug #4851 PHP errors in login dialogue 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-14 09:57:52 +05:30
Marc Delisle
51f317690e Merge pull request #1644 from udan11/patch_1 
Old MySQL extension is not available in newer PHP versions.
 2015-04-13 15:13:24 -04:00
Dan Ungureanu
8cc3a7635c Old MySQL extension is not available in newer PHP versions. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-04-13 21:58:44 +03:00
Marc Delisle
b4a07fad22 Merge branch 'QA_4_4' 2015-04-13 08:22:52 -04:00
Marc Delisle
9dd71d465a 4.4.2 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-13 08:22:38 -04:00
Marc Delisle
8384d54fee 4.4.3-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-13 08:21:27 -04:00
P.Alex
d5ce381e94 Ignore ./vendor directory of composer 
Signed-off-by: P.Alex <web.is.art@p-alex.com>
 2015-04-13 11:33:36 +02:00
Madhura Jayaratne
abe7f3bdcd Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-13 14:36:18 +05:30
Madhura Jayaratne
d56b35ec08 bug #4850 Relation view on 1920 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-13 14:34:44 +05:30
Kristjan Räts
fff6dc885f Translated using Weblate (Estonian) 
Currently translated at 100.0% (3075 of 3075 strings)

[CI skip]
 2015-04-13 10:20:27 +02:00
Madhura Jayaratne
ffac71c312 Consistently provide editing for procedures, functions, events and triggers 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-13 12:18:56 +05:30
Madhura Jayaratne
0be5115f01 Merge branch 'QA_4_4' 2015-04-13 12:09:37 +05:30
Weblate
ecb7767a9b Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-04-13 08:38:19 +02:00
Burak Yavuz
1561679246 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-04-13 08:38:16 +02:00
Stefano Martinelli
5246629cc8 Translated using Weblate (Italian) 
Currently translated at 98.6% (2995 of 3035 strings)

[CI skip]
 2015-04-13 08:38:13 +02:00
dingo thirteen
7e3b73bb08 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-04-13 08:38:11 +02:00
Ondra Šimeček
ef8ed6d590 Translated using Weblate (Czech) 
Currently translated at 96.7% (2936 of 3035 strings)

[CI skip]
 2015-04-13 08:38:09 +02:00
Valter Georgiev
ef83484b79 Translated using Weblate (Bulgarian) 
Currently translated at 62.4% (1894 of 3035 strings)

[CI skip]
 2015-04-13 08:38:07 +02:00
Madhura Jayaratne
677c8f7c62 bug #4849 Functions accessed from navigation do not load on ajax dialog 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-13 12:07:44 +05:30
Madhura Jayaratne
66304349ad rfe #1639 Add grouping to stored procedures in the navigation tree 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-13 09:59:22 +05:30
Marc Delisle
357ab293ce Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-04-12 07:30:57 -04:00
Marc Delisle
6e748aa7fb Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-12 07:30:53 -04:00
Weblate
c0abe18735 Merge remote-tracking branch 'origin/master' 2015-04-12 13:03:24 +02:00
Burak Yavuz
5b994970be Translated using Weblate (Turkish) 
Currently translated at 99.9% (3074 of 3075 strings)

[CI skip]
 2015-04-12 13:03:21 +02:00
Thiago Casotti
411aae0427 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.0% (3045 of 3075 strings)

[CI skip]
 2015-04-12 13:03:18 +02:00
Stefano Martinelli
116a1598e3 Translated using Weblate (Italian) 
Currently translated at 98.4% (3027 of 3075 strings)

[CI skip]
 2015-04-12 13:03:16 +02:00
Giovanni Sora
2d1fa803d6 Translated using Weblate (Interlingua) 
Currently translated at 69.2% (2128 of 3075 strings)

[CI skip]
 2015-04-12 13:03:14 +02:00
Ondra Šimeček
57c79cb793 Translated using Weblate (Czech) 
Currently translated at 95.6% (2940 of 3075 strings)

[CI skip]
 2015-04-12 13:03:11 +02:00