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

99581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
5d9a7a748c Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 10:18:08 -04:00
Marc Delisle
504b80adbf phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 10:16:20 -04:00
Marc Delisle
a5398611f7 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 08:47:46 -04:00
Marc Delisle
53677b8e25 Merge branch 'QA_4_4' of https://github.com/phpmyadmin/phpmyadmin into QA_4_4 2015-05-07 08:45:46 -04:00
Marc Delisle
9306a93bec phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 08:45:43 -04:00
Madhura Jayaratne
0e7ac33cb4 Merge branch 'QA_4_4' 2015-05-07 18:03:19 +05:30
Madhura Jayaratne
a0d8975544 Merge pull request #1663 from madhuracj/bug4891 
bug #4891 CSV Import ignores "Replace table data with file" checkbox
 2015-05-07 18:00:54 +05:30
Madhura Jayaratne
7199825abd Long links may be converted to forms 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-07 17:53:50 +05:30
Madhura Jayaratne
ae4e5db376 rfe #1413 Explain analyzer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-07 17:40:33 +05:30
Madhura Jayaratne
1663995c59 bug #4891 CSV Import ignores "Replace table data with file" checkbox 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-07 10:26:36 +05:30
Madhura Jayaratne
11893d99dc Merge branch 'QA_4_4' 2015-05-07 07:58:27 +05:30
Madhura Jayaratne
f7716754f4 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-05-07 07:54:12 +05:30
Madhura Jayaratne
1e6750cbc9 bug #4892 Undefined variable: unique_conditions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-07 07:51:16 +05:30
Weblate
b5c7b6445d Merge remote-tracking branch 'origin/master' 2015-05-06 21:16:55 +02:00
dingo thirteen
7134bdad04 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3082 of 3082 strings)

[CI skip]
 2015-05-06 21:16:52 +02:00
Marc Delisle
96500249da Merge branch 'QA_4_4' 2015-05-06 15:16:18 -04:00
Marc Delisle
14a4ebbd7d Merge commit '84e7513' 2015-05-06 15:16:12 -04:00
Marc Delisle
3e5eb604c6 phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-06 15:15:23 -04:00
dingo thirteen
84e7513bf8 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-05-06 21:07:51 +02:00
Marc Delisle
10fcc393fb Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-06 13:28:49 -04:00
Marc Delisle
fdf5e7f93d Merge commit '555bbd0' 2015-05-06 13:25:24 -04:00
Marc Delisle
6dfd1c135c phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-06 13:24:50 -04:00
Balázs Úr
555bbd057e Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-05-06 16:56:57 +02:00
Marc Delisle
a6da0dda0e Merge branch 'QA_4_4' 2015-05-06 10:15:50 -04:00
Marc Delisle
f1a1deac01 Merge commit '1343805' 2015-05-06 10:15:43 -04:00
Weblate
71a2975f5f Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-05-06 16:15:29 +02:00
Burak Yavuz
5b7f12a652 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-05-06 16:15:27 +02:00
Giovanni Sora
e68fdc2e9a Translated using Weblate (Interlingua) 
Currently translated at 69.2% (2103 of 3035 strings)

[CI skip]
 2015-05-06 16:15:24 +02:00
Marc Delisle
8a5824968a phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-06 10:15:11 -04:00
Marc Delisle
134380587d Translated using Weblate (French) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-05-06 14:12:36 +02:00
Weblate
f75accc4ff Merge remote-tracking branch 'origin/master' 2015-05-06 14:04:56 +02:00
Giovanni Sora
8a6257ec8a Translated using Weblate (Interlingua) 
Currently translated at 69.6% (2148 of 3085 strings)

[CI skip]
 2015-05-06 14:04:53 +02:00
Marc Delisle
0b2dea83e0 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-06 08:04:44 -04:00
Burak Yavuz
aa060d3718 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-05-06 09:25:38 +02:00
Weblate
003eabc03d Merge remote-tracking branch 'origin/master' 2015-05-06 08:35:18 +02:00
Madhura Jayaratne
ef13319f40 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-06 12:05:17 +05:30
Burak Yavuz
f05071c728 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3082 of 3082 strings)

[CI skip]
 2015-05-06 08:35:15 +02:00
Madhura Jayaratne
44668d051a bug #4890 webkitStorageInfo and webkitIndexedDB is deprecated 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-06 12:03:54 +05:30
Weblate
4026d947bf Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-05-06 08:33:53 +02:00
Burak Yavuz
28c1bcc11a Translated using Weblate (Turkish) 
Currently translated at 99.8% (3029 of 3035 strings)

[CI skip]
 2015-05-06 08:33:50 +02:00
Madhura Jayaratne
989cd902b3 Start with caps 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-06 10:34:21 +05:30
Παναγιώτης Παπάζογλου
dacca215e8 Translated using Weblate (Greek) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-05-06 06:58:04 +02:00
Madhura Jayaratne
072e0ce458 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-06 10:09:26 +05:30
Madhura Jayaratne
9616973750 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-06 10:07:38 +05:30
Madhura Jayaratne
204e8c23c6 Add spaces around concat 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-06 10:06:46 +05:30
Madhura Jayaratne
2f1e5ee7aa Remove trailing white spaces 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-06 10:05:50 +05:30
Madhura Jayaratne
660648a4ed Use the correct icon 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-06 10:01:25 +05:30
Madhura Jayaratne
36b863afd0 Fix some style violations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-06 09:55:27 +05:30
Madhura Jayaratne
2b36ae1c4c Fix comment. Add spaces for clarity 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-06 09:08:02 +05:30
Madhura Jayaratne
3448777601 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-06 08:53:24 +05:30