Commit Graph

82 Commits

Author SHA1 Message Date
Marc Delisle
9a400be32d Merge commit '18bccea' 2015-03-16 08:02:03 -04:00
Deven Bansod
18bccea291 Fixes bug #4803
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-03-16 05:09:26 +05:30
Chirayu Chiripal
ef4411cd2d Fix coding style in libraries/navigation/*
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2015-03-07 20:36:33 +05:30
Marc Delisle
4d425e8cf8 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-17 12:48:00 -05:00
Marc Delisle
6dc728a6a6 Bug Undefined index navwork
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-07 08:48:20 -05:00
Marc Delisle
6954dd971d Bug Undefined index navwork
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-08 10:06:54 -05:00
Marc Delisle
efbd0a8407 Refactor code duplication
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-07 08:09:24 -05:00
Marc Delisle
290ae63dd8 Refactor code duplication
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-06 12:57:50 -05:00
Marc Delisle
25a591e3d7 Refactor code duplication
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-05 13:54:54 -05:00
Madhura Jayaratne
69dee25e95 $singleItem is a boolean variable
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-03 21:43:03 -08:00
Madhura Jayaratne
a9d64610d2 Refactor getPresence() method into a set of smaller methods
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-03 19:03:37 -08:00
Madhura Jayaratne
3ce934faba Break gigantic getData() method into smaller methods
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-03 18:42:34 -08:00
Madhura Jayaratne
88089a76a7 Merge branch 'master' into Performance
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-03 05:06:49 +05:30
Hugues Peccatte
fd7f02f929 Fix typos.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-02 14:33:41 +01:00
Hugues Peccatte
bdb5f333d7 Fix PHPCS issues.
PHPDoc updates.
Minor coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-01 22:07:18 +01:00
Chirayu Chiripal
f7b37d8d72 Added title attr to links in navigation tree items
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-11-01 18:34:34 +05:30
Hugues Peccatte
e17de11c74 Improve multibytes string manipulation performances.
Review SQL import process.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-30 17:40:09 +01:00
Hugues Peccatte
74f0beda8f Fix syntax error.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-20 20:56:12 +02:00
Madhura Jayaratne
bba05162bf Count hidden tables aggregatively rather than for individual database
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-20 13:08:04 +05:30
Ann + J.M
b1a7039ae3 Convert PMA_URL_getCommon calls to new style
Rewritten tests need validation
Signed-Off-By: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
2014-10-18 19:42:29 +02:00
Madhura Jayaratne
a87294fbe4 Merge branch 'QA_4_2'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-17 08:28:05 +05:30
Madhura Jayaratne
28e2642054 Move duplicate code to a method
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-10 11:01:55 +05:30
Madhura Jayaratne
185c45e190 Take $singleItem parameter into consideration for non IS queries
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-10 10:25:42 +05:30
Madhura Jayaratne
f4f910204b Revert "The DisableIS directive is being deprecated"
This reverts commit e94f74fa51.

Conflicts:
	libraries/navigation/Nodes/Node_Database.class.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-09 18:31:20 +05:30
Madhura Jayaratne
380e8940b1 bug #4552 Incorrect routines display for database due to case insensitive checks
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-09 11:27:09 +05:30
Hugues Peccatte
e20510de39 Replace mb functions by standard string functions.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-03 23:08:43 +02:00
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls.
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-28 20:53:01 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-06 10:44:03 +02:00
Atul Pratap Singh
92335f8582 Merge branch 'QA_4_2' 2014-08-29 14:26:42 +05:30
Atul Pratap Singh
7e5026cde4 Fix bug#4413 Navigation Error in Nav Tree for Search Results Past the First Page
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-08-29 14:19:38 +05:30
Michal Čihař
725073709c Use token directly for session
There is no need to have intermediate global variable to store the token
once we have it in the session data.

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-10 11:23:33 +02:00
Madhura Jayaratne
74aebe629b Spaces around . operator
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-08 18:06:02 +05:30
Marc Delisle
458ce4102c Bug #4164 "Hide" and "Show hidden items" are not translatable 2013-11-25 16:17:23 -05:00
Hugues Peccatte
1f09a22281 Fix PHPDoc. 2013-11-08 22:41:05 +01:00
Marc Delisle
e94f74fa51 The DisableIS directive is being deprecated 2013-11-04 06:11:50 -05:00
Marc Delisle
7c6b61ace1 Fix merge conflicts 2013-10-30 08:07:09 -04:00
Marc Delisle
266ee805b0 bug #4147 Accessibility: Images without Alt nor title attribute 2013-10-30 08:00:13 -04:00
Madhura Jayaratne
565c65ef8b Merge branch 'QA_4_0' 2013-09-28 19:55:55 +05:30
Madhura Jayaratne
1559343ace bug #4109 Drizzle tables in navigation are shown as views 2013-09-28 19:47:37 +05:30
Marc Delisle
93cb28b1aa New icons for hide/show tables in navi 2013-09-28 07:13:41 -04:00
Marc Delisle
399f6af722 Fix merge conflicts 2013-09-26 08:54:09 -04:00
Marc Delisle
809138c4f1 bug #3996 Drizzle navigation doesn't expand 2013-09-26 07:45:18 -04:00
Kasun Chathuranga
8d70cd4dec Merge branch 'QA_4_0' into merge. Resolved conflicts. 2013-09-03 14:13:02 +05:30
Kasun Chathuranga
b43f4c7fed Expand the navigation and highlight the current database or table/view 2013-08-30 12:30:05 +05:30
Marc Delisle
e25db4a004 Fix merge conflicts 2013-08-27 10:54:59 -04:00
Michal Čihař
1084e4dfdd Do not show tooltip in table navigation
Most tables don't have any comment set and this causes serious slow down
of a navigation.
2013-08-27 11:08:28 +02:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Kasun Chathuranga
04c2e88d67 Change tables name from 'navigation' to 'navigationhiding' 2013-07-25 21:26:23 +05:30
Kasun Chathuranga
1ae59ad063 Merge branch 'hideTables' of github.com:kasunchathuranga/phpmyadmin into hideTables
Conflicts:
	libraries/navigation/Nodes/Node_Database.class.php
	libraries/relation.lib.php
2013-07-25 07:08:04 +05:30
Kasun Chathuranga
dd39bdd717 Use 'show' instead of 'unhide' in messages and method comments 2013-07-25 06:52:29 +05:30