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

97395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
35868af3af Merge remote-tracking branch 'origin/master' 2015-01-23 11:17:50 +01:00
krasimir
c5e632c113 Translated using Weblate (Bulgarian) 
Currently translated at 61.8% (1847 of 2988 strings)

[CI skip]
 2015-01-23 11:17:47 +01:00
Madhura Jayaratne
6cc36bd9e4 Click OK on confirm dialog 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-23 15:34:59 +05:30
Madhura Jayaratne
8e49e0ba43 Add classes to buttons in confirmation dialog 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-23 15:34:26 +05:30
Deven Bhooshan
bdf3ae8445 Alert happens only after submitting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-23 15:18:05 +05:30
Madhura Jayaratne
5f32194b4f Select by Id rather than text 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-23 15:16:09 +05:30
Weblate
fa1f339b12 Merge remote-tracking branch 'origin/master' 2015-01-22 22:01:47 +01:00
Martin Lacina
39aab2dde7 Translated using Weblate (Slovak) 
Currently translated at 81.6% (2440 of 2988 strings)

[CI skip]
 2015-01-22 22:01:44 +01:00
Marc Delisle
4458426aa7 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-22 16:01:32 -05:00
Marc Delisle
ad580b1910 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-22 11:38:11 -05:00
Marc Delisle
1ad5fd8dab Merge pull request #1468 from geekman-rohit/master 
fix bug #4720 (problem with missing php-mbstring warning)
 2015-01-22 11:36:26 -05:00
Weblate
1dc0dda892 Merge remote-tracking branch 'origin/master' 2015-01-22 16:55:08 +01:00
Martin Lacina
522c4cef0f Translated using Weblate (Slovak) 
Currently translated at 81.4% (2435 of 2988 strings)

[CI skip]
 2015-01-22 16:55:05 +01:00
Madhura Jayaratne
1bcf053c67 Merge branch 'QA_4_3' 2015-01-22 21:24:58 +05:30
Madhura Jayaratne
782fcd8399 ChangeLog entry for bug #4717 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-22 21:23:50 +05:30
Madhura Jayaratne
344b7df54e Fix bug #4717 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-22 18:27:39 +05:30
Madhura Jayaratne
d68dcef9ac Better way to handle navigation filter tooltip 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-22 17:04:47 +05:30
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
Rohit Mulange
f508e9312a fix bug #4720 (problem with missing php-mbstring warning) 
Signed-off-by: Rohit Mulange <rohit@rohit.codes>
 2015-01-21 23:45:02 +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