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

101249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Madhura Jayaratne
36423d6ebd issue #1808 "Improve table structure" generates invalid SQL 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-22 10:14:04 +05:30
Deven Bansod
cd34226d89 Fix unexpected behaviour 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-07-22 04:01:22 +05:30
Hugues Peccatte
527b64e364 Simplify if statements. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-21 14:56:38 +02:00
Madhura Jayaratne
cd5154d74c Revert changes that were accidentally committed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-21 18:06:18 +05:30
Madhura Jayaratne
7d55220cce Another failing test fixed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-21 18:03:27 +05:30
Madhura Jayaratne
c94a68c849 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-21 17:58:43 +05:30
Hugues Peccatte
71aea4c512 Revert "Simplify if statements." 
This reverts commit 119e745d26.
 2015-07-21 14:27:35 +02:00
Madhura Jayaratne
37b7ff2932 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-21 17:56:58 +05:30
Madhura Jayaratne
dfea8ffda7 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-21 17:56:07 +05:30
Hugues Peccatte
96247fe283 Revert CSS selector modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-21 14:20:39 +02:00
Madhura Jayaratne
d0eb2af152 Fix another float 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-21 17:31:04 +05:30
Madhura Jayaratne
dbef7e5872 Revert accidentally committed changes that were made to test rtl languages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-21 17:30:23 +05:30
Madhura Jayaratne
12e6dc886d Remove more floats in the code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-21 15:31:00 +05:30
Madhura Jayaratne
77fb8ec96b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-21 15:25:52 +05:30
Madhura Jayaratne
822129a365 rtl support in table charts 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-21 15:24:46 +05:30
Atul Pratap Singh
0352d10d89 Merge pull request #1750 from devenbansod/rfe1679 
Ctrl/Alt + Enter submits Table->Insert form
 2015-07-21 14:50:04 +05:30
Atul Pratap Singh
80a9ed2e8c Call form.validate before adding rules 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-07-21 14:40:16 +05:30
Madhura Jayaratne
256d76f8d0 Use class to support rtl languages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-21 14:15:29 +05:30
Madhura Jayaratne
b074d15208 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-21 14:01:31 +05:30
Madhura Jayaratne
cce247fbc9 Fix more floats 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-21 14:00:29 +05:30
Weblate
3f5e389d11 Merge remote-tracking branch 'origin/master' 2015-07-21 10:28:23 +02:00