Commit Graph

97407 Commits

Author SHA1 Message Date
Madhura Jayaratne
c7ebfd4478 Organize the code. Adhere to hide_browser_transformations
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-26 12:22:15 +05:30
Madhura Jayaratne
19acb28444 Browser transformation and links for mysql and information_schema
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-26 11:56:51 +05:30
Madhura Jayaratne
bfd0a67845 Do not link to itself
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-25 17:59:03 +05:30
Madhura Jayaratne
d0e39b7575 Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-23 17:33:14 +05:30
Madhura Jayaratne
2eab3b5880 bug #4727 Collation column missing in database list when DisableIS is true
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-23 17:31:03 +05:30
Madhura Jayaratne
750bfbbcb4 Fix coding style violations
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-23 16:56:59 +05:30
Madhura Jayaratne
153988f0f9 This link no longer works
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-23 16:54:28 +05:30
Madhura Jayaratne
635413442a Coding style improvements
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-23 16:52:33 +05:30
Madhura Jayaratne
890b047924 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-23 16:51:21 +05:30
Madhura Jayaratne
8ed47444db Wrap some long lines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-23 16:44:00 +05:30
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
Weblate
b1244c8b33 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-22 16:53:56 +01:00
Martin Lacina
b60ff5fa98 Translated using Weblate (Slovak)
Currently translated at 81.5% (2429 of 2979 strings)

[CI skip]
2015-01-22 16:53:53 +01:00
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