Commit Graph

97207 Commits

Author SHA1 Message Date
Madhura Jayaratne
0d601eb9c4 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-13 19:09:54 +05:30
Madhura Jayaratne
b1056fc7d4 diagram variable does not have a method dieSchema()
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-13 19:08:36 +05:30
Madhura Jayaratne
baa92b32f3 Revert "Remove more dead code"
This reverts commit c1e220520e.
2015-01-13 18:51:21 +05:30
Michal Čihař
b4fe0d8db6 Merge branch 'QA_4_3' 2015-01-13 13:55:33 +01:00
Madhura Jayaratne
c1e220520e Remove more dead code
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-13 18:18:11 +05:30
Madhura Jayaratne
c895b6147b Remove dead code
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-13 18:10:10 +05:30
Madhura Jayaratne
a3477de69a Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-13 18:07:55 +05:30
Weblate
7d5acc16be Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-13 13:30:40 +01:00
Michal Čihař
132a9c081a Translated using Weblate (Portuguese (Brazil))
Currently translated at 95.0% (2833 of 2982 strings)

[CI skip]
2015-01-13 13:30:37 +01:00
Giovanni Sora
a88447c4e5 Translated using Weblate (Interlingua)
Currently translated at 63.8% (1901 of 2979 strings)

[CI skip]
2015-01-13 13:30:35 +01:00
Zufar Fathi Suhardi
e2c4569398 Translated using Weblate (Indonesian)
Currently translated at 74.8% (2232 of 2982 strings)

[CI skip]
2015-01-13 13:30:33 +01:00
Kristjan Räts
538f303a4b Translated using Weblate (Estonian)
Currently translated at 99.9% (2977 of 2979 strings)

[CI skip]
2015-01-13 13:30:30 +01:00
josep constanti
92a76746e7 Translated using Weblate (Catalan)
Currently translated at 84.5% (2522 of 2982 strings)

[CI skip]
2015-01-13 13:30:28 +01:00
Madhura Jayaratne
9524db89ce bug #4703 Unsaved schema page exported as pdf.pdf
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-13 18:00:13 +05:30
Weblate
3154e1ca4f Merge remote-tracking branch 'origin/master' 2015-01-13 12:06:17 +01:00
josep constanti
7b0e251e5d Translated using Weblate (Catalan)
Currently translated at 84.3% (2528 of 2996 strings)

[CI skip]
2015-01-13 12:06:14 +01:00
Michal Čihař
1746bd8e8e Include link to downloads page on github
Signed-off-by: Michal Čihař <michal@cihar.com>
2015-01-13 12:06:08 +01:00
Weblate
efb1078446 Merge remote-tracking branch 'origin/master' 2015-01-12 13:59:57 +01:00
Marc Delisle
27f3fba11f Temporary fix for missing parameters in message
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-12 07:59:44 -05:00
Weblate
4c290cb935 Merge remote-tracking branch 'origin/master' 2015-01-12 13:56:40 +01:00
Michal Čihař
12e17c4e78 Translated using Weblate (Portuguese (Brazil))
Currently translated at 94.4% (2831 of 2996 strings)

[CI skip]
2015-01-12 13:56:38 +01:00
Giovanni Sora
41ecc3fac0 Translated using Weblate (Interlingua)
Currently translated at 63.9% (1916 of 2996 strings)

[CI skip]
2015-01-12 13:56:36 +01:00
Kristjan Räts
ab2dcfb739 Translated using Weblate (Estonian)
Currently translated at 99.7% (2988 of 2996 strings)

[CI skip]
2015-01-12 13:56:34 +01:00
josep constanti
fa9d46819d Translated using Weblate (Catalan)
Currently translated at 83.9% (2516 of 2996 strings)

[CI skip]
2015-01-12 13:56:32 +01:00
Marc Delisle
4f7cf4eba9 Remove deprecated message
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-12 07:56:22 -05:00
Weblate
77ae1fdda5 Merge remote-tracking branch 'origin/master' 2015-01-12 06:46:04 +01:00
Dadan Setia
7265d22152 Translated using Weblate (Indonesian)
Currently translated at 74.7% (2239 of 2996 strings)

[CI skip]
2015-01-12 06:46:01 +01:00
Madhura Jayaratne
aa7fa1930f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-12 11:15:08 +05:30
Madhura Jayaratne
44dafd05d8 Move to appropriate doc section
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-12 11:13:37 +05:30
Weblate
2b8af05ae0 Merge remote-tracking branch 'origin/master' 2015-01-12 06:07:27 +01:00
Yan Gabriel
1aa242f777 Translated using Weblate (Portuguese (Brazil))
Currently translated at 94.5% (2832 of 2996 strings)

[CI skip]
2015-01-12 06:07:24 +01:00
Zufar Fathi Suhardi
c5b9f8bf63 Translated using Weblate (Indonesian)
Currently translated at 74.6% (2237 of 2996 strings)

[CI skip]
2015-01-12 06:07:22 +01:00
Madhura Jayaratne
bc0910cc9b Merge branch 'QA_4_3' 2015-01-12 10:36:52 +05:30
Weblate
156856c5ff Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-12 06:05:00 +01:00
Yan Gabriel
819aaecf83 Translated using Weblate (Portuguese (Brazil))
Currently translated at 95.0% (2834 of 2982 strings)

[CI skip]
2015-01-12 06:04:57 +01:00
Zufar Fathi Suhardi
8a81163121 Translated using Weblate (Indonesian)
Currently translated at 74.7% (2230 of 2982 strings)

[CI skip]
2015-01-12 06:04:55 +01:00
Madhura Jayaratne
00c7e891e1 Properly implement 'TableNavigationLinksMode' configuration
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-12 10:34:37 +05:30
Madhura Jayaratne
b44e9cb312 bug #4699 Navigation panel should not hide icons based on 'TableNavigationLinksMode'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-12 10:09:41 +05:30
Hugues Peccatte
086d91b015 Minor ChangeLog style modification.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-01-11 16:31:02 +01:00
Marc Delisle
bd44c979ac Merge commit '2248993' 2015-01-11 06:05:02 -05:00
Marc Delisle
5ab46c758b Merge commit 'e858172' 2015-01-11 06:04:48 -05:00
Marc Delisle
f91969d2a4 Merge commit 'e51b582' 2015-01-11 06:04:31 -05:00
Marc Delisle
2248993e2f Merge branch 'QA_4_3' of https://github.com/phpmyadmin/phpmyadmin into QA_4_3 2015-01-11 06:03:49 -05:00
Marc Delisle
e858172a9f Bug Undefined index central_columnswork
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-11 06:03:28 -05:00
Weblate
26c4938970 Merge remote-tracking branch 'origin/master' 2015-01-11 11:51:14 +01:00
Martin Lacina
e9c4fe3b28 Translated using Weblate (Slovak)
Currently translated at 77.6% (2325 of 2996 strings)

[CI skip]
2015-01-11 11:51:11 +01:00
Marc Delisle
4884e088ad Merge branch 'QA_4_3' 2015-01-11 05:50:54 -05:00
Weblate
e51b5829c3 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-11 11:50:43 +01:00
Martin Lacina
3f7686df2d Translated using Weblate (Slovak)
Currently translated at 77.8% (2318 of 2979 strings)

[CI skip]
2015-01-11 11:50:40 +01:00
Marc Delisle
a41ddf562e Bug Null argument in array_multisort()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-11 05:50:17 -05:00