gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,112 Commits 12 Branches 481 Tags 2.4 GiB
daa7f50cb0
Commit Graph

100112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Marc Delisle
20db71b940 Merge commit '0bbd8b9' 2015-05-30 07:21:06 -04:00
Marc Delisle
73d82392a0 Fix test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-30 07:14:58 -04:00
Weblate
d942e092bc Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-05-29 22:02:34 +02:00
Costel Cocerhan
62a28999c6 Translated using Weblate (Romanian) 
Currently translated at 59.0% (1791 of 3035 strings)

[CI skip]
 2015-05-29 22:02:30 +02:00
Smita Kumari
66a052d8f2 Merge pull request #1702 from smita786/QA_4_4 
fix bug #4909
 2015-05-30 01:32:27 +05:30
Smita Kumari
0bbd8b9223 fix bug #4909 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2015-05-30 00:11:50 +05:30
dingo thirteen
a3c83a1521 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3106 of 3106 strings)

[CI skip]
 2015-05-29 17:34:32 +02:00
Madhura Jayaratne
3ada00030f Fix failing translation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-29 19:25:27 +05:30
Madhura Jayaratne
8fa3680da8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-29 19:19:00 +05:30
Madhura Jayaratne
6439a10af2 bug #4872 Drop table doesn't remove the table name from navigation bar 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-29 19:17:58 +05:30
Marc Delisle
478a3b4784 Translated using Weblate (French) 
Currently translated at 100.0% (3106 of 3106 strings)

[CI skip]
 2015-05-29 14:48:02 +02:00
Weblate
1362e91176 Merge remote-tracking branch 'origin/master' 2015-05-29 13:27:02 +02:00
Costel Cocerhan
ca5a6f8681 Translated using Weblate (Romanian) 
Currently translated at 57.4% (1784 of 3104 strings)

[CI skip]
 2015-05-29 13:26:59 +02:00
Marc Delisle
f0c272ce6e Fix test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-29 07:26:49 -04:00
Madhura Jayaratne
375d34157b Merge branch 'QA_4_4' 2015-05-29 15:46:39 +05:30
Madhura Jayaratne
6a6ed5d5dc Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-29 15:45:27 +05:30
Madhura Jayaratne
52a06ee5f9 Merge branch 'QA_4_4' 2015-05-29 15:37:50 +05:30
Madhura Jayaratne
0391bab825 bug #4931 False error before entering reCAPTCHA 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-29 15:30:19 +05:30
Madhura Jayaratne
19f8048bee Merge branch 'QA_4_4' 2015-05-29 11:32:09 +05:30
Madhura Jayaratne
02a6541e46 bug #4905 Sorting by an alias 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-29 11:29:59 +05:30
Madhura Jayaratne
f4b12e5cbd Align 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-29 10:52:35 +05:30
Madhura Jayaratne
323482bcea Merge branch 'QA_4_4' 2015-05-29 10:52:02 +05:30
Madhura Jayaratne
d5371be455 bug #4920 relation view doesn't list fields of table in other database 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-29 10:49:11 +05:30
Marc Delisle
afdce2f594 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-05-28 10:43:48 -04:00
Marc Delisle
ccdc5134ab Fix loose comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-28 10:41:17 -04:00