Commit Graph

100137 Commits

Author SHA1 Message Date
Παναγιώτης Παπάζογλου
3f282edad5 Translated using Weblate (Greek)
Currently translated at 100.0% (3107 of 3107 strings)

[CI skip]
2015-06-02 07:21:51 +02:00
Isaac Bennetch
8e8ad11a3c Merge pull request #1711 from devenbansod/701Correction
Fixed a small error in PR#1708 for RFE#701
2015-06-01 22:05:20 -04:00
Deven Bansod
359ca5d787 Fixed a small error in PR#1708 for RFE#701
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-06-02 12:12:56 +05:30
Isaac Bennetch
5c78ad3d95 Changelog for pull request 1708 / RFE 701
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2015-06-01 15:00:23 -04:00
Isaac Bennetch
af658d27ee Merge pull request #1708 from devenbansod/rfe701_using_css
RFE#701 - Print View using CSS - Rewrite
2015-06-01 14:50:04 -04:00
Madhura Jayaratne
1953235c02 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-01 17:12:50 +05:30
Madhura Jayaratne
0ff83aa019 Coding style improvements
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-01 17:11:40 +05:30
Balázs Úr
0896badf9a Translated using Weblate (Hungarian)
Currently translated at 100.0% (3107 of 3107 strings)

[CI skip]
2015-06-01 13:37:46 +02:00
Madhura Jayaratne
8815a16c41 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-01 16:03:54 +05:30
Madhura Jayaratne
055f434886 Use PMA_MARIADB constant to identify MariaDB
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-01 16:02:41 +05:30
Madhura Jayaratne
1de1cd6c8d Identify MariaDB
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-01 16:02:00 +05:30
Marc Delisle
d2ce53d4ae Translated using Weblate (French)
Currently translated at 100.0% (3107 of 3107 strings)

[CI skip]
2015-06-01 12:06:01 +02:00
Madhura Jayaratne
6249c07c4e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-01 15:05:34 +05:30
Madhura Jayaratne
bc2d119fcc This is not required. We are already in PMA_Types_Drizzle class
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-01 15:04:20 +05:30
Weblate
85d8b589a3 Merge remote-tracking branch 'origin/master' 2015-06-01 11:32:54 +02:00
Stefano Martinelli
8f51b29c2b Translated using Weblate (Italian)
Currently translated at 99.6% (3095 of 3107 strings)

[CI skip]
2015-06-01 11:32:50 +02:00
Madhura Jayaratne
c88478a114 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-01 15:02:03 +05:30
Madhura Jayaratne
f0c44b29b8 bug #4932 Drizzle version numbers
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-01 15:01:20 +05:30
Kristjan Räts
f173bdc769 Translated using Weblate (Estonian)
Currently translated at 100.0% (3107 of 3107 strings)

[CI skip]
2015-06-01 08:27:09 +02:00
Madhura Jayaratne
d4235da3b8 ChangeLog entry for rfe #1676
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-01 10:06:46 +05:30
Madhura Jayaratne
234e72a582 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-01 10:04:18 +05:30
Weblate
59525a59fa Merge remote-tracking branch 'origin/master' 2015-06-01 06:32:03 +02:00
Benny
4fee24d8fd Translated using Weblate (Indonesian)
Currently translated at 71.4% (2220 of 3107 strings)

[CI skip]
2015-06-01 06:31:59 +02:00
Madhura Jayaratne
daa7f50cb0 Merge pull request #1710 from devenbansod/rfe1676
Allow fetching actual row counts when at least one table has approximate row count
2015-06-01 10:01:54 +05:30
Deven Bansod
7c37657cc5 RFE#1676 : Actually a Bug
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-06-01 13:34:15 +05:30
Madhura Jayaratne
38c0177b3a Remove the anchor if total row count is not approximate
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-01 09:59:46 +05:30
Deven Bansod
aeae86d7cc RFE#701 - Print View using CSS - Rewrite
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-06-01 03:57:50 +05:30
dingo thirteen
25543c5157 Translated using Weblate (Dutch)
Currently translated at 100.0% (3107 of 3107 strings)

[CI skip]
2015-05-31 22:10:10 +02:00
Burak Yavuz
4dcd0848fe Translated using Weblate (Turkish)
Currently translated at 100.0% (3102 of 3102 strings)

[CI skip]
2015-05-31 16:18:36 +02:00
Isaac Bennetch
7634905762 Feature request 1675: MySQL and MariaDB functions INET6_ATON and INET6_NTOA
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2015-05-31 09:48:20 -04:00
Chirayu Chiripal
d3cf896180 Merge commit 'a89d849' 2015-05-31 18:55:34 +05:30
Chirayu Chiripal
9052070707 Merge commit '22e52bd'
Conflicts:
	composer.json
2015-05-31 18:54:02 +05:30
Weblate
a89d849647 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-05-31 14:55:08 +02:00
Patrik Kollmann
c10417dcd8 Translated using Weblate (Slovak)
Currently translated at 84.1% (2553 of 3035 strings)

[CI skip]
2015-05-31 14:55:04 +02:00
Хомутов Иван Сергеевич
ffa7868ce2 Translated using Weblate (Russian)
Currently translated at 97.5% (2962 of 3035 strings)

[CI skip]
2015-05-31 14:55:01 +02:00
josep constanti
ee03057c1a Translated using Weblate (Catalan)
Currently translated at 99.8% (3029 of 3035 strings)

[CI skip]
2015-05-31 14:54:58 +02:00
Chirayu Chiripal
22e52bd0af remove stale translation (was breaking builds)
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2015-05-31 18:21:59 +05:30
Marc Delisle
927969508e Update po files
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-31 07:27:37 -04:00
Marc Delisle
69d48ab868 Improve English
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-31 07:27:00 -04:00
Marc Delisle
d1937fbe9c Merge pull request #1698 from nisargjhaveri/fk_check_sql
Disable foreign key checks in SQL query box
2015-05-31 07:22:22 -04:00
Weblate
80c0260c40 Merge remote-tracking branch 'origin/master' 2015-05-31 10:06:37 +02:00
Patrik Kollmann
10556af775 Translated using Weblate (Slovak)
Currently translated at 83.0% (2577 of 3104 strings)

[CI skip]
2015-05-31 10:06:34 +02:00
Хомутов Иван Сергеевич
646080c331 Translated using Weblate (Russian)
Currently translated at 94.9% (2948 of 3106 strings)

[CI skip]
2015-05-31 10:06:31 +02:00
josep constanti
cf1411e6c0 Translated using Weblate (Catalan)
Currently translated at 98.7% (3065 of 3104 strings)

[CI skip]
2015-05-31 10:06:28 +02:00
Atul Pratap Singh
7abd44ece3 Merge pull request #1700 from gzzhanghao/template
Complete templates for table related scripts
2015-05-31 13:36:25 +05:30
Nisarg Jhaveri
34720c2365 Disable foreign key checks in SQL query box and config option
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
2015-05-31 12:28:41 +05:30
Chirayu Chiripal
7b972d9550 Remove code coverage from scrutinizer
Let coveralls do code coverage and scrutinizer do code analysis job

Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2015-05-31 11:14:24 +05:30
Jason
79319a60fc Templates for table related scripts
Signed-off-by: Jason <jason.daurus@gmail.com>
2015-05-31 03:23:26 +08:00
Marc Delisle
5fb0a85197 Merge pull request #1704 from lem9/master
Fix test
2015-05-30 07:45:14 -04:00
Marc Delisle
fc53f46238 Merge commit 'd942e09' 2015-05-30 07:21:29 -04:00