gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,829 Commits 12 Branches 481 Tags 2.4 GiB
7728961aad
Commit Graph

89829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
7728961aad Merge commit 'cea6359' 2014-02-12 08:16:45 -05:00
Marc Delisle
f76ca094a7 Merge commit '21c5bcf' 2014-02-12 08:16:36 -05:00
Marc Delisle
4f2816207a Merge commit '27f616e' 2014-02-12 08:15:54 -05:00
Marc Delisle
cea635925e ChangeLog entry for fix of bug #4053 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-12 08:13:17 -05:00
Weblate
21c5bcf676 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-02-12 14:11:02 +01:00
Anders Jonsson
fdaa3d4a8d Translated using Weblate (Swedish) 
Currently translated at 99.9% (2748 of 2749)
 2014-02-12 14:11:00 +01:00
Dieter Adriaenssens
93643db0a7 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2749 of 2749)
 2014-02-12 14:10:57 +01:00
Marc Delisle
1db0995932 Merge pull request #921 from omerjerk/QA_4_1 
Contest-1 BugFix #4053
 2014-02-12 08:10:56 -05:00
Douglas dreginatto
d44256ef7e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.1% (2554 of 2741)
 2014-02-12 12:05:41 +01:00
Panagiotis Papazoglou
d2fc6adb29 Translated using Weblate (Greek) 
Currently translated at 100.0% (2741 of 2741)
 2014-02-11 20:44:21 +01:00
Umair Khan
27f616e963 Contest-1 BugFix #4053 
Signed-off-by: Umair Khan <omerjerk@gmail.com>
 2014-02-12 00:29:55 +05:30
Marc Delisle
0cc0e0f3a1 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-11 12:57:06 -05:00
Marc Delisle
1cf3d3545e Merge branch 'QA_4_1' 2014-02-11 12:54:00 -05:00
Marc Delisle
e05db59556 Merge commit '37dc085' 2014-02-11 12:53:52 -05:00
Marc Delisle
3fa7915575 Merge commit '52084d8' 2014-02-11 12:53:32 -05:00
Marc Delisle
0aea14ae1d ChangeLog entry for fix of bug #4275 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-11 12:51:42 -05:00
Marc Delisle
37dc085ef1 Merge pull request #916 from dhananjay92/Bug#4275 
Fix for Bug#4275
 2014-02-11 12:50:12 -05:00
Weblate
23abcfbf47 Merge remote-tracking branch 'origin/master' 2014-02-11 18:33:30 +01:00
Burak Yavuz
4c0108cef8 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2741 of 2741)
 2014-02-11 18:33:27 +01:00
Anders Jonsson
c909d7e8ea Translated using Weblate (Swedish) 
Currently translated at 98.4% (2699 of 2741)
 2014-02-11 18:33:25 +01:00
Giovanni Sora
adcf033a76 Translated using Weblate (Interlingua) 
Currently translated at 42.2% (1158 of 2741)
 2014-02-11 18:33:22 +01:00
Marc Delisle
9e53ca62b7 Merge commit 'bc32d0c' 2014-02-11 12:33:03 -05:00
Marc Delisle
db3d6ebbaf Merge commit 'fc36ed7' 2014-02-11 12:32:30 -05:00
Marc Delisle
de8bac5dce Merge commit '7a5296b' 2014-02-11 12:32:20 -05:00
Marc Delisle
3b76a7549a Merge commit 'b6cd8cd' 2014-02-11 12:31:28 -05:00
Marc Delisle
bc32d0ccb6 Merge branch 'QA_4_1' of github.com:phpmyadmin/phpmyadmin into QA_4_1 2014-02-11 12:29:53 -05:00
Marc Delisle
fc36ed7322 ChangeLog entry for fix of bug #4249 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-11 12:29:37 -05:00
Weblate
7a5296bd43 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-02-11 18:28:38 +01:00
Anders Jonsson
fb8c1e3374 Translated using Weblate (Swedish) 
Currently translated at 99.1% (2726 of 2749)
 2014-02-11 18:28:36 +01:00
Porta Shqipe
b80a8b913b Translated using Weblate (Albanian) 
Currently translated at 29.6% (814 of 2749)
 2014-02-11 18:28:34 +01:00
Marc Delisle
b7da0fa50c Merge pull request #913 from sampathLiyanage/bugfix4249 
bug fix 4249
 2014-02-11 12:28:25 -05:00
Domen
47b709f4b7 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2741 of 2741)
 2014-02-11 12:55:58 +01:00
Matías Bellone
3055331f19 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2741 of 2741)
 2014-02-11 12:28:11 +01:00
Marc Delisle
fb0d311a70 Translated using Weblate (French) 
Currently translated at 100.0% (2741 of 2741)
 2014-02-11 12:16:46 +01:00
Kristjan Räts
bd10ca9fd8 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2741 of 2741)
 2014-02-11 10:31:51 +01:00
Michal Čihař
8589290727 Translated using Weblate (Czech) 
Currently translated at 100.0% (2741 of 2741)
 2014-02-11 09:35:02 +01:00
Michal Čihař
c8af5e3ffb Update po files 2014-02-11 09:16:20 +01:00
Michal Čihař
d938eb9eb1 Simplify url redirectory code, no need for two branchs 2014-02-11 09:15:28 +01:00
Michal Čihař
5e9cf18073 Improvements in URL redirector 
- do not concatenate message to allow better translation
- avoid possbile XSS
 2014-02-11 09:14:42 +01:00
Michal Čihař
935c2e1406 Translated using Weblate (Swedish) 
Currently translated at 98.1% (2691 of 2741)
 2014-02-11 09:11:44 +01:00
Michal Čihař
e806461081 Translated using Weblate (Simplified Chinese) 
Currently translated at 84.9% (2329 of 2741)
 2014-02-11 09:11:39 +01:00
Michal Čihař
5984015a00 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.1% (2553 of 2741)
 2014-02-11 09:11:32 +01:00
Michal Čihař
55f7902bbb Translated using Weblate (Norwegian Bokmål) 
Currently translated at 59.3% (1626 of 2741)
 2014-02-11 09:11:28 +01:00
Michal Čihař
67974e0176 Translated using Weblate (German) 
Currently translated at 92.5% (2537 of 2741)
 2014-02-11 09:11:24 +01:00
Michal Čihař
cc0e7d0f0b Translated using Weblate (Galician) 
Currently translated at 87.7% (2406 of 2741)
 2014-02-11 09:11:20 +01:00
Michal Čihař
f92ec4b283 Translated using Weblate (English (United Kingdom)) 
Currently translated at 90.1% (2471 of 2741)
 2014-02-11 09:11:12 +01:00
Weblate
e5fecd3ac5 Merge remote-tracking branch 'origin/master' 2014-02-11 00:53:25 +01:00
Porta Shqipe
11f39d8641 Translated using Weblate (Albanian) 
Currently translated at 28.3% (777 of 2741)
 2014-02-11 00:53:22 +01:00
Marc Delisle
9a867d5148 Merge pull request #918 from jeffchan/format-byte-down-float 
Explicitly cast int to float in PMA_Util::formatByteDown()
 2014-02-10 18:53:15 -05:00
Jeff Chan
9a5603f908 Cast unit size value for formatByteDown to float to avoid overflow. 
Add another test case to formatByteDown which fails on HHVM 2.4

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-02-10 18:25:54 +00:00