gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,270 Commits 12 Branches 481 Tags 2.4 GiB
35981069da
Commit Graph

101270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
35981069da Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-23 08:47:11 -07:00
Marc Delisle
f5566095ec Merge pull request #1814 from nisargjhaveri/bug_1813 
Fix #1813, Delete rows using "Check All" is broken
 2015-07-23 08:38:31 -07:00
Nisarg Jhaveri
31199faff9 Fix #1813, Delete rows using "Check All" is broken 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-07-23 20:03:47 +05:30
Atul Pratap Singh
b47b4e3a5e Remove redundant db table params when parent class is providing them 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-07-23 18:59:31 +05:30
Atul Pratap Singh
682614277c Merge pull request #1777 from gzzhanghao/table 
WIP: Refining Table & TableSearch class
 2015-07-23 18:35:03 +05:30
Weblate
84baa4df3e Merge remote-tracking branch 'origin/master' 2015-07-23 14:38:19 +02:00
Giovanni Sora
1d2fac1006 Translated using Weblate (Interlingua) 
Currently translated at 70.4% (2251 of 3194 strings)

[CI skip]
 2015-07-23 14:38:15 +02:00
Hugues Peccatte
bf61709259 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-23 14:38:07 +02:00
Marc Delisle
1daf0a030f Merge pull request #1811 from udan11/coverage_fix 
The test folder was included in coverage.
 2015-07-23 04:03:10 -07:00
Marc Delisle
befdbb5b3c Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-23 03:55:21 -07:00
Weblate
ecd94743c0 Merge remote-tracking branch 'origin/master' 2015-07-23 12:54:23 +02:00
josep constanti
e3ff2b35f6 Translated using Weblate (Catalan) 
Currently translated at 96.2% (3044 of 3161 strings)

[CI skip]
 2015-07-23 12:54:19 +02:00
Marc Delisle
b399665085 Merge pull request #1807 from udan11/l10n 
Improved localization.
 2015-07-23 03:54:16 -07:00
Jason
6fd29078b6 Fix test failures 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:46:40 +08:00
Jason
12ac57e0bd Remove references to TableSearch.class.php 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:29:53 +08:00
Jason
6636153071 Resolve conflicts from upstream 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:29:53 +08:00
Dan Ungureanu
e724dbb691 The test folder was included in coverage. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-23 03:23:55 +03:00
Weblate
465a9ed5f2 Merge remote-tracking branch 'origin/master' 2015-07-22 22:08:33 +02:00
Franco
e4123a9e4b Translated using Weblate (Spanish) 
Currently translated at 99.7% (3152 of 3161 strings)

[CI skip]
 2015-07-22 22:08:30 +02:00
Hugues Peccatte
a1cf9a24e3 Coding style modification. 
Make PHPCS happy.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-22 22:08:24 +02:00
Dan Ungureanu
2b3febf652 Localization. 
Updated sql-parser library to udan11/sql-parser@e1b91ed.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-22 19:13:38 +03:00
Marc Delisle
86a4c3e32d Merge pull request #1796 from devenbansod/remove_some_errors_in_travis 
Fixed some errors visible in all travis builds
 2015-07-22 08:41:42 -07:00
Marc Delisle
a31d108a32 Merge branch 'QA_4_4' 2015-07-22 08:37:22 -07:00
Marc Delisle
101f853de7 Merge pull request #1795 from devenbansod/small_fix_in_test 
Fixed small error in a test
 2015-07-22 08:34:22 -07:00
Marc Delisle
0875febff3 Merge pull request #1810 from nisargjhaveri/fix_empty_return 
Show form group header properly in settings forms
 2015-07-22 05:51:45 -07:00
Nisarg Jhaveri
ceeab34a78 Show form group header properly 
It was broken since 431847b39e

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-07-22 16:10:32 +05:30
Madhura Jayaratne
a4f2685500 Fix gutter style for normal and dark console themes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-22 15:53:29 +05:30
Madhura Jayaratne
1c39ce5ccf Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-22 15:34:57 +05:30
Madhura Jayaratne
81f5c747c2 Merge branch 'QA_4_4' 
Conflicts:
	libraries/sql_query_form.lib.php
 2015-07-22 15:33:40 +05:30
Madhura Jayaratne
e555d0e6ab Fix legend for table SQL page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-22 15:25:09 +05:30
Michal Čihař
27c5a92f97 Document how to configure Apache to request HTTP auth for phpMyAdmin 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-22 10:42:32 +02:00
Hugues Peccatte
ef70037f2b Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-07-22 08:28:57 +02:00
Weblate
40f4eb4996 Merge remote-tracking branch 'origin/master' 2015-07-22 08:28:19 +02:00
Koo Youngmin
676cfcefba Translated using Weblate (Korean) 
Currently translated at 77.4% (2448 of 3161 strings)

[CI skip]
 2015-07-22 08:28:16 +02:00
Madhura Jayaratne
74b9961e70 Merge branch 'QA_4_4' 2015-07-22 11:57:50 +05:30
Madhura Jayaratne
0905415894 ChangeLog entry for https://github.com/phpmyadmin/phpmyadmin/pull/1809 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-22 11:55:07 +05:30
Weblate
b020e6e922 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-07-22 08:22:10 +02:00
Koo Youngmin
9a223332f5 Translated using Weblate (Korean) 
Currently translated at 81.6% (2481 of 3038 strings)

[CI skip]
 2015-07-22 08:22:07 +02:00
Madhura Jayaratne
63183d9efc Merge pull request #1809 from devenbansod/1606Correction 
Fix unexpected behaviour of Processlist filter
 2015-07-22 11:52:02 +05:30
Weblate
d9f7ccc17b Merge remote-tracking branch 'origin/master' 2015-07-22 08:06:42 +02:00
Madhura Jayaratne
13d5aabc59 Translated using Weblate (Sinhala) 
Currently translated at 62.6% (1980 of 3161 strings)

[CI skip]
 2015-07-22 08:06:38 +02:00
Madhura Jayaratne
487e1a8fa1 Fix floating. Fix styles for reported errors. Move inputs inside the form 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-22 11:36:19 +05:30
Weblate
61640fc488 Merge remote-tracking branch 'origin/master' 2015-07-22 06:54:58 +02:00
Madhura Jayaratne
21fe34ea99 Translated using Weblate (Sinhala) 
Currently translated at 62.5% (1978 of 3161 strings)

[CI skip]
 2015-07-22 06:54:54 +02:00
Stefano Martinelli
9679ca5002 Translated using Weblate (Italian) 
Currently translated at 100.0% (3161 of 3161 strings)

[CI skip]
 2015-07-22 06:54:50 +02:00
Madhura Jayaratne
5cbebb36ba Merge branch 'QA_4_4' 
Conflicts:
	ChangeLog
	README
	doc/conf.py
	libraries/Config.class.php
 2015-07-22 10:24:02 +05:30
Weblate
59de0a30d7 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-07-22 06:44:31 +02:00
Madhura Jayaratne
67e608a3b0 Translated using Weblate (Sinhala) 
Currently translated at 65.4% (1988 of 3038 strings)

[CI skip]
 2015-07-22 06:44:27 +02:00
Vinícius Araújo
565dab1c8a Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.9% (3037 of 3038 strings)

[CI skip]

I believe there is no reason to translate the message literally because it can lead to loss of meaning
 2015-07-22 06:44:24 +02:00
Παναγιώτης Παπάζογλου
2872471ecc Translated using Weblate (Greek) 
Currently translated at 100.0% (3038 of 3038 strings)

[CI skip]
 2015-07-22 06:44:22 +02:00