gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
97,377 Commits 12 Branches 481 Tags 2.4 GiB
2afee3e557
Commit Graph

97377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
2afee3e557 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-22 16:36:54 +05:30
Madhura Jayaratne
c84304aae9 Merge branch 'QA_4_3' 2015-01-22 16:35:41 +05:30
Madhura Jayaratne
4f493b110e A better way to handle navigation in filtered results 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-22 16:34:46 +05:30
Atul Pratap Singh
a5baea0012 improve selector 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-22 12:55:42 +05:30
Atul Pratap Singh
4bd1c04472 Modify message for different containers 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-22 12:44:38 +05:30
Atul Pratap Singh
95827f38b3 typo 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-22 12:14:17 +05:30
Atul Pratap Singh
e8005fddf2 Differentiate between search results and normal tree 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-22 12:08:37 +05:30
Madhura Jayaratne
d4f1781ea8 Merge branch 'QA_4_3' 2015-01-22 09:25:30 +05:30
Madhura Jayaratne
17ab2ff6d4 bug #4724 Cannot navigate in filtered table list 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-22 09:19:06 +05:30
Madhura Jayaratne
8bff56985b Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-22 07:07:58 +05:30
Madhura Jayaratne
ebb9c1fdbe Merge branch 'bug4704' into QA_4_3 2015-01-22 06:45:41 +05:30
Madhura Jayaratne
3fadd8d5ab Adhere to hide_db directive fully 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-22 06:45:04 +05:30
Madhura Jayaratne
2b70a85709 ChangeLog entry for bug 4716 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-22 06:40:42 +05:30
Madhura Jayaratne
386ef16ad9 Merge pull request #1467 from madhuracj/bug4716 
#4716 Collapse all in navigation panel is sometimes broken
 2015-01-22 06:36:25 +05:30
Atul Pratap Singh
027195e856 Changelog entry 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-21 23:59:28 +05:30
Atul Pratap Singh
a1137cd105 Merge branch 'QA_4_3' 
Conflicts:
	js/messages.php

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-21 23:55:56 +05:30
Atul Pratap Singh
3a43b5a458 Merge commit '86eb4c456855bb1663af60418d09f3e348b705d2' 2015-01-21 23:54:45 +05:30
Atul Pratap Singh
3680e2929a Merge pull request #1466 from zixtor/QA_4_3 
bug #4710 Nav tree error after filtering the tables
 2015-01-21 23:48:36 +05:30
Marc Delisle
1d4c93cc29 Merge commit '3c17b43' 2015-01-21 13:13:52 -05:00
Atul Pratap Singh
a2c3b39cec Better message for enter search on fast filter 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-21 23:41:28 +05:30
Atul Pratap Singh
86eb4c4568 Fix bug#4710 Nav tree error after filtering the tables 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-21 23:39:32 +05:30
Marc Delisle
e46a192509 Merge commit 'b3c1368' 2015-01-21 13:05:01 -05:00
Weblate
3c17b43454 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-21 19:03:47 +01:00
Jozef Pistej
0529bc0cca Translated using Weblate (Slovak) 
Currently translated at 81.4% (2427 of 2979 strings)

[CI skip]
 2015-01-21 19:03:44 +01:00
Marc Delisle
b3c1368c89 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-21 13:03:28 -05:00
Alexander Kamp
3da106c572 Bug #4722 Incorrect width table summary when favorite tables is disabled 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-21 13:02:48 -05:00
Weblate
162c9e6c67 Merge remote-tracking branch 'origin/master' 2015-01-21 18:53:05 +01:00
Jozef Pistej
5c4c6c037e Translated using Weblate (Slovak) 
Currently translated at 81.4% (2433 of 2988 strings)

[CI skip]
 2015-01-21 18:53:02 +01:00
Atul Pratap Singh
e1a9e02fc0 Fast filter improvement: remove 'x other results found' and replace with Enter search 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-21 23:22:12 +05:30
Marc Delisle
d6d11159b6 Bug #4723 Duplicate entry for configuration directive in doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-21 05:25:31 -05:00
Madhura Jayaratne
9cdcd992b1 Merge branch 'QA_4_3' 2015-01-21 11:14:58 +05:30
Madhura Jayaratne
cb18ec2320 bug #4700 Error text: Internal Server Error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-21 11:13:44 +05:30
Madhura Jayaratne
888a58ff0c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-21 10:23:55 +05:30
Madhura Jayaratne
fbb1c42176 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-21 10:23:10 +05:30
Madhura Jayaratne
11612c6420 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2015-01-21 10:16:50 +05:30
Madhura Jayaratne
2002e9d6f8 ChangeLog entry for bug #4719 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-21 10:15:40 +05:30
Madhura Jayaratne
d1d5ee02f4 Merge branch 'bug4719' into QA_4_3 2015-01-21 10:13:28 +05:30
Weblate
6df22f5eb8 Merge remote-tracking branch 'origin/master' 2015-01-21 05:38:48 +01:00
Krystian Biesaga
3385e88a14 Translated using Weblate (Polish) 
Currently translated at 88.5% (2646 of 2987 strings)

[CI skip]
 2015-01-21 05:38:45 +01:00
josep constanti
666f1002f2 Translated using Weblate (Catalan) 
Currently translated at 84.5% (2526 of 2988 strings)

[CI skip]
 2015-01-21 05:38:42 +01:00
Madhura Jayaratne
43e5a71e2c Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-21 10:08:39 +05:30
Weblate
1dd6915157 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-21 05:32:11 +01:00
Krystian Biesaga
07b3ba91cf Translated using Weblate (Polish) 
Currently translated at 89.1% (2659 of 2982 strings)

[CI skip]
 2015-01-21 05:32:08 +01:00
josep constanti
c84da25657 Translated using Weblate (Catalan) 
Currently translated at 84.8% (2530 of 2982 strings)

[CI skip]
 2015-01-21 05:32:06 +01:00
Madhura Jayaratne
924e5128d9 Add ChangeLog entry for bug #4721 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-21 10:01:47 +05:30
Madhura Jayaratne
190ea0452e Merge branch 'bug4721' into QA_4_3 2015-01-21 10:00:55 +05:30
Madhura Jayaratne
97dc4831a4 #4716 Collapse all in navigation panel is sometimes broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-21 08:38:43 +05:30
Marc Delisle
e9807d2e3e Fix doc for removed parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-20 13:32:41 -05:00
Madhura Jayaratne
6ff3e42d53 Check whether version and date is set 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-20 23:31:46 +05:30
Madhura Jayaratne
56027c51ba Lose navigation panel state on pref save. There is no point of selectively preserving it. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-20 23:21:50 +05:30