gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,844 Commits 12 Branches 481 Tags 2.4 GiB
60a8d33ab5
Commit Graph

96844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
60a8d33ab5 Merge branch 'QA_4_3' 2014-12-28 06:18:56 -05:00
Marc Delisle
67a67b7e9d Merge pull request #1439 from Tithugues/b4673_qa43 
Fix #4673 Delimiter causing page lock
 2014-12-28 06:16:10 -05:00
Hugues Peccatte
70985f197c Update ChangeLog 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-27 20:11:27 +01:00
Hugues Peccatte
0d3a9e4ca6 Fix #4673 Delimiter causing page lock 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-27 20:10:37 +01:00
Robin van der Vliet
ca1f0a0fc8 Translated using Weblate (Limburgish) 
Currently translated at 0.0% (0 of 2988 strings)

[CI skip]
 2014-12-27 15:51:21 +01:00
Robin van der Vliet
39b9c91056 Translated using Weblate (Esperanto) 
Currently translated at 0.0% (0 of 2988 strings)

[CI skip]
 2014-12-27 15:40:42 +01:00
Marc Delisle
ac381bb4e3 Fix Plural-Forms in newly added li language 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-27 07:56:07 -05:00
Marc Delisle
3443ce8a18 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-27 07:47:18 -05:00
Michal Čihař
70dcf37480 Add Limburgish and Esperanto translation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-27 11:57:46 +01:00
Hugues Peccatte
82358ecbb3 Reduce nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-26 15:00:44 +01:00
Marc Delisle
4e8737ff2c Merge branch 'QA_4_3' 2014-12-26 08:29:32 -05:00
Marc Delisle
38bb19ffb6 bug #4655 Undefined index: collation_connection 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-26 08:29:09 -05:00
Marc Delisle
7694043514 Merge branch 'QA_4_3' 2014-12-25 07:48:04 -05:00
Marc Delisle
d3bd2ae8da Merge commit '09e1896' 2014-12-25 07:47:56 -05:00
Marc Delisle
462428570e bug #4658 Illegal string offset (Data_length, Index_length) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-25 07:47:20 -05:00
Weblate
d8072b9a27 Merge remote-tracking branch 'origin/master' 2014-12-25 12:45:11 +01:00
Robin van der Vliet
ee81b758ef Translated using Weblate (Frisian) 
Currently translated at 21.6% (647 of 2988 strings)

[CI skip]
 2014-12-25 12:45:08 +01:00
Robin van der Vliet
7ed1eac353 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2988 of 2988 strings)

[CI skip]
 2014-12-25 12:45:07 +01:00
Marc Delisle
a7267d751b Merge branch 'QA_4_3' 2014-12-25 06:44:26 -05:00
Marc Delisle
6c31790ff9 Merge commit '4e65c7f' 2014-12-25 06:44:19 -05:00
Weblate
09e189605d Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-25 12:44:00 +01:00
Robin van der Vliet
fe2725f5be Translated using Weblate (Dutch) 
Currently translated at 100.0% (2977 of 2977 strings)

[CI skip]
 2014-12-25 12:43:57 +01:00
Marc Delisle
056e15749e ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-25 06:43:47 -05:00
Robin van der Vliet
0783075b1e Translated using Weblate (Frisian) 
Currently translated at 20.9% (627 of 2988 strings)

[CI skip]
 2014-12-24 22:47:47 +01:00
Robin van der Vliet
9bef084460 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2988 of 2988 strings)

[CI skip]
 2014-12-24 22:11:37 +01:00
Robin van der Vliet
4e65c7fc4d Translated using Weblate (Dutch) 
Currently translated at 100.0% (2977 of 2977 strings)

[CI skip]
 2014-12-24 22:11:22 +01:00
Robin van der Vliet
9a4de91931 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2988 of 2988 strings)

[CI skip]
 2014-12-24 22:09:16 +01:00
Robin van der Vliet
1b9bedc65c Translated using Weblate (Dutch) 
Currently translated at 100.0% (2977 of 2977 strings)

[CI skip]
 2014-12-24 22:09:02 +01:00
Robin van der Vliet
a807567d2f Translated using Weblate (Dutch) 
Currently translated at 100.0% (2988 of 2988 strings)

[CI skip]
 2014-12-24 22:03:13 +01:00
Robin van der Vliet
9fea160d3b Translated using Weblate (Dutch) 
Currently translated at 100.0% (2977 of 2977 strings)

[CI skip]
 2014-12-24 21:58:56 +01:00
Marc Delisle
668bf046d0 Merge branch 'QA_4_3' 2014-12-24 13:46:18 -05:00
Marc Delisle
6fab2c158e ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-24 13:45:30 -05:00
Marc Delisle
cd136786e9 Merge pull request #1438 from rakeshkaundilya/QA_4_3 
fix bug #4672
 2014-12-24 13:44:27 -05:00
Rakesh Kumar
ed32527de0 fix bug #4672 
Signed-off-by: Rakesh Kumar <rakeshkumar4294@gmail.com>
 2014-12-24 23:01:29 +05:30
Robin van der Vliet
99311deae3 Translated using Weblate (Frisian) 
Currently translated at 16.6% (497 of 2988 strings)

[CI skip]
 2014-12-24 17:15:34 +01:00
Marc Delisle
1c1c313d76 Merge branch 'QA_4_3' 2014-12-24 06:41:47 -05:00
Marc Delisle
77fec70ee8 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-24 06:40:18 -05:00
Madhura Jayaratne
e56f197c3d Merge branch 'QA_4_3' 2014-12-24 13:51:18 +05:30
Madhura Jayaratne
296a87c83d #4671 Unable to move all columns 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 13:49:53 +05:30
Madhura Jayaratne
6d682dc48f Merge branch 'QA_4_3' 2014-12-24 12:08:32 +05:30
Madhura Jayaratne
204af78879 Merge pull request #1425 from madhuracj/Bug4642 
bug #4642 phpmyadmin often fails to load due to specific load order
 2014-12-24 12:04:12 +05:30
Madhura Jayaratne
aaa6b9d4d9 Merge branch 'QA_4_3' into Bug4642 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 12:03:25 +05:30
Madhura Jayaratne
e16ad76ebd Merge branch 'QA_4_3' 2014-12-24 11:55:32 +05:30
Madhura Jayaratne
32f1ac4211 bug #4670 CSV import reads both commas and values into first column after first row 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 11:52:20 +05:30
Madhura Jayaratne
2ec57babda Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 10:36:57 +05:30
Madhura Jayaratne
bc25daf3f7 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-12-24 10:30:48 +05:30
Madhura Jayaratne
48570a6dbd Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 10:25:21 +05:30
Weblate
0fa99606cf Merge remote-tracking branch 'origin/master' 2014-12-24 05:49:45 +01:00
Robin van der Vliet
4b7feab290 Translated using Weblate (Russian) 
Currently translated at 99.0% (2959 of 2988 strings)

[CI skip]
 2014-12-24 05:49:43 +01:00
Robin van der Vliet
c138fd149d Translated using Weblate (Kannada) 
Currently translated at 2.7% (83 of 2988 strings)

[CI skip]
 2014-12-24 05:49:41 +01:00