Commit Graph

97446 Commits

Author SHA1 Message Date
Madhura Jayaratne
7f9082fd95 Merge branch 'QA_4_3' 2015-01-26 15:37:10 +05:30
Madhura Jayaratne
a8e0f35ef7 bug #4730 Notice while browsing tables when phpmyadmin pma database exists, but not all the tables
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-26 15:35:05 +05:30
Weblate
78390b5d0f Merge remote-tracking branch 'origin/master' 2015-01-26 09:52:20 +01:00
Martin Lacina
b02db4bf35 Translated using Weblate (Slovak)
Currently translated at 83.5% (2496 of 2988 strings)

[CI skip]
2015-01-26 09:52:16 +01:00
Valter Georgiev
86401c4a0a Translated using Weblate (Bulgarian)
Currently translated at 62.5% (1869 of 2988 strings)

[CI skip]
2015-01-26 09:52:11 +01:00
Madhura Jayaratne
4dc0f8e613 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-26 14:22:01 +05:30
Madhura Jayaratne
8b1f6eccd2 Fix some failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-26 14:07:50 +05:30
Madhura Jayaratne
078eaea916 Add ChangeLog entry
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-26 13:08:37 +05:30
Madhura Jayaratne
29815e644e Browser transformation for some of the SHOW statements
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-26 13:07:29 +05:30
Madhura Jayaratne
112099971b Remove redundant check
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-26 12:27:14 +05:30
Madhura Jayaratne
c7ebfd4478 Organize the code. Adhere to hide_browser_transformations
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-26 12:22:15 +05:30
Madhura Jayaratne
19acb28444 Browser transformation and links for mysql and information_schema
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-26 11:56:51 +05:30
Madhura Jayaratne
bfd0a67845 Do not link to itself
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-25 17:59:03 +05:30
Marc Delisle
f5e74f72cc Merge commit '6fb1b43' 2015-01-25 07:04:07 -05:00
Marc Delisle
07e6c40368 Merge commit '264b66c' 2015-01-25 07:03:50 -05:00
Marc Delisle
d830605fb0 Merge commit 'e8f7475' 2015-01-25 07:03:38 -05:00
Weblate
6fb1b43c14 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-25 13:02:28 +01:00
Jozef Pistej
33ef6cc85c Translated using Weblate (Slovak)
Currently translated at 83.5% (2490 of 2979 strings)

[CI skip]
2015-01-25 13:02:25 +01:00
Sevdimali ฤฐsa
930d04bd62 Translated using Weblate (Azerbaijani)
Currently translated at 53.1% (1584 of 2982 strings)

[CI skip]
2015-01-25 13:02:21 +01:00
Marc Delisle
264b66c6c7 bug #4728 Incorrect headings in routine editor
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-25 07:02:01 -05:00
Weblate
3debe31abe Merge remote-tracking branch 'origin/master' 2015-01-25 11:38:06 +01:00
Jozef Pistej
fe35dbcc9b Translated using Weblate (Slovak)
Currently translated at 83.5% (2496 of 2988 strings)

[CI skip]
2015-01-25 11:38:02 +01:00
Sevdimali ฤฐsa
aee161a78e Translated using Weblate (Azerbaijani)
Currently translated at 52.6% (1572 of 2988 strings)

[CI skip]
2015-01-25 11:37:58 +01:00
Marc Delisle
41ab33863c Merge pull request #1470 from phlyper/patch-1
update 1 message
2015-01-25 05:37:53 -05:00
phlyper
1b9ada0681 update 1 message
The central list of columns for the current database is empty.
ุงู„ู‚ุงุฆู…ุฉ ุงู„ู…ุฑูƒุฒูŠุฉ ู„ู„ุฃุนู…ุฏุฉ ู‚ุงุนุฏุฉ ุงู„ุจูŠุงู†ุงุช ุงู„ุญุงู„ูŠุฉ ูุงุฑุบุฉ.
2015-01-25 02:09:38 +01:00
Martin Lacina
be9de94553 Translated using Weblate (Slovak)
Currently translated at 82.4% (2463 of 2988 strings)

[CI skip]
2015-01-24 17:34:46 +01:00
Martin Lacina
e8f74759ed Translated using Weblate (Slovak)
Currently translated at 82.4% (2457 of 2979 strings)

[CI skip]
2015-01-24 17:34:40 +01:00
Weblate
4c1c87f1fa Merge remote-tracking branch 'origin/master' 2015-01-24 12:34:50 +01:00
Valter Georgiev
1244531d32 Translated using Weblate (Bulgarian)
Currently translated at 62.2% (1861 of 2988 strings)

[CI skip]
2015-01-24 12:34:47 +01:00
Marc Delisle
58556a1b8b 4.3.8 release
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-24 06:34:34 -05:00
Marc Delisle
25eb932882 Merge commit '1318786' 2015-01-24 06:33:06 -05:00
Weblate
8fdccb41c6 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-24 12:33:00 +01:00
Valter Georgiev
1b3fb67619 Translated using Weblate (Bulgarian)
Currently translated at 62.5% (1863 of 2980 strings)

[CI skip]
2015-01-24 12:32:57 +01:00
Marc Delisle
1318786ce3 4.3.9-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-24 06:32:36 -05:00
Marc Delisle
c8a25c1d16 Merge branch 'QA_4_3' 2015-01-23 13:31:47 -05:00
Marc Delisle
189173f2e1 Bug Undefined index favorite_tables
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-23 13:31:25 -05:00
Marc Delisle
b46c42bcf2 Merge branch 'QA_4_3' 2015-01-23 11:52:24 -05:00
Marc Delisle
c5580d3319 Merge commit 'fc7bf93' 2015-01-23 11:52:18 -05:00
Marc Delisle
16c9ce2907 Bug Undefined index central_columnswork
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-23 11:51:49 -05:00
Madhura Jayaratne
d0e39b7575 Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-23 17:33:14 +05:30
Weblate
fc7bf93d7e Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-23 13:01:58 +01:00
Martin Lacina
8b89935c37 Translated using Weblate (Slovak)
Currently translated at 81.7% (2434 of 2979 strings)

[CI skip]
2015-01-23 13:01:56 +01:00
krasimir
3237c7e393 Translated using Weblate (Bulgarian)
Currently translated at 62.2% (1856 of 2980 strings)

[CI skip]
2015-01-23 13:01:54 +01:00
Madhura Jayaratne
2eab3b5880 bug #4727 Collation column missing in database list when DisableIS is true
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-23 17:31:03 +05:30
Madhura Jayaratne
750bfbbcb4 Fix coding style violations
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-23 16:56:59 +05:30
Madhura Jayaratne
153988f0f9 This link no longer works
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-23 16:54:28 +05:30
Madhura Jayaratne
635413442a Coding style improvements
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-23 16:52:33 +05:30
Madhura Jayaratne
890b047924 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-23 16:51:21 +05:30
Madhura Jayaratne
8ed47444db Wrap some long lines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-23 16:44:00 +05:30
Weblate
35868af3af Merge remote-tracking branch 'origin/master' 2015-01-23 11:17:50 +01:00