gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,872 Commits 12 Branches 481 Tags 2.4 GiB
d248f77458
Commit Graph

97 Commits

Author SHA1 Message Date
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
df7f409f1b rfe #1575 "Disable database expansion" : unclear directive name and explanation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-24 13:10:48 -05:00
Marc Delisle
71c7af80b8 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-12 13:14:19 -05:00
Marc Delisle
5e765233cd Bug Undefined index DisableIS 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-12 13:07:09 -05:00
Atul Pratap Singh
42706c33f7 Merge pull request #1469 from zixtor/master 
rfe #1574 Provide for a database select dropdown in navigation panel as in pre-4.0 versions
 2015-01-27 11:49:41 +05:30
Atul Pratap Singh
fc257c9904 Rename configuration option as ShowDatabasesNavigationAsTree with default true 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-27 11:31:03 +05:30
Atul Pratap Singh
2b79586343 Modify the configuration option ShowNavigationAsTree to NavigationDatabasesSelector 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-24 19:18:46 +05:30
Atul Pratap Singh
7ea8e7763d Merge branch 'navi_tree_optional' 
Conflicts:
	js/navigation.js
	libraries/navigation/NavigationTree.class.php

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-23 22:56:32 +05:30
Atul Pratap Singh
7d60c8c6f9 more js linkages for db-specific tree with select box 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-23 22:53:41 +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
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
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
Atul Pratap Singh
4fa06442c5 Render tables tree on selecting a database using select box 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-18 02:34:02 +05:30
Atul Pratap Singh
b295b6442c Render a database select in existing Node engine 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-18 01:59:27 +05:30
Marc Delisle
3ea88f59ae Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-10 06:25:57 -05:00
Atul Pratap Singh
477cf0b44d Merge branch 'QA_4_3' 2015-01-08 07:18:38 +05:30
Atul Pratap Singh
c2afea9040 Fix bug#4695 Changing ['DefaultTabTable'] doesn't update link and title 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-08 07:15:53 +05:30
Ann + J.M
9d13de4ead Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-12-02 20:10:55 +01:00
Marc Delisle
36f2f91c1a Merge branch 'QA_4_3' 2014-12-02 10:28:34 -05:00
Marc Delisle
85c866fb8f Bug Undefined index navwork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-02 10:28:03 -05:00
Hugues Peccatte
23754602ef Reduce nested levels in Node.class.php 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-17 18:57:19 +01:00
Hugues Peccatte
396c063d9a Reduce nested levels in Node.class.php. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-13 22:18:25 +01:00
Madhura Jayaratne
ab3a82fb25 Eliminate duplicates 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-10 16:33:19 +05:30
Madhura Jayaratne
19e146ee4b Correctly match with separator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-10 16:21:07 +05:30
Madhura Jayaratne
53f1364cff Fix bugs in navigation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-06 13:31:29 -08:00
Madhura Jayaratne
e46ff7db49 Sort database list 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-06 12:37:37 +05:30
Madhura Jayaratne
7d800ed62f Adhere to search clause and only db directive 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-06 11:16:55 +05:30
Madhura Jayaratne
26bece5805 Use GRANTs to determine the list of dbs to show. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-06 10:47:00 +05:30
Madhura Jayaratne
0bca6a096f Determine the databases the user has access to based on GRANTs and query only for them 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-06 08:13:58 +05:30
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
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
Marc Delisle
5b5953b371 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-16 10:47:28 -04:00
Madhura Jayaratne
9b428aa6b3 Use caps for SQL keywords 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-14 15:18:50 +05:30
Madhura Jayaratne
1f235fb30b Show tables based getData implementation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-11 20:52:58 +05:30
Madhura Jayaratne
1ddf4fea57 Adhere to NavigationTreeEnableGrouping 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 14:16:04 +05:30
Madhura Jayaratne
b4150ea75c Use upper case for SQL key words 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 13:20:48 +05:30
Madhura Jayaratne
9373830149 Make SHOW DATABASES aware of only_db and hide_db 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 13:11:06 +05:30
Madhura Jayaratne
719013f656 User Server reference 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:56:36 +05:30
Madhura Jayaratne
19432a02cc Revert "The DisableIS directive is being deprecated" 
This reverts commit 3065a3edcf.

Conflicts:
	libraries/DatabaseInterface.class.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:32:45 +05:30
Madhura Jayaratne
62b15dc2f6 Revert "The DisableIS directive is being deprecated" 
This reverts commit 8fd0d79405.

Conflicts:
	libraries/navigation/Nodes/Node.class.php
	test/classes/navigation/PMA_Node_test.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:31:33 +05:30
Chirayu Chiripal
4522900ef0 RFE-1426: Navigation state lost on reload + Bugfix-4439 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-26 12:06:31 +05:30
Michal Čihař
64cce57669 Fix Node self referencing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:23:33 +02:00
Michal Čihař
e5ddfc87dc Remove dead code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:23:33 +02:00
Michal Čihař
a56ec50fb2 Move code for geting navigation node icon into Node class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 09:42:53 +02:00
Michal Čihař
e82c53f93d Move navigation node CSS class generation to Node object 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 09:34:37 +02:00
Hugues Peccatte
9870cb5142 Update DB group queries format. 
Update DB group test.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-23 21:30:12 +02:00
Hugues Peccatte
8873df3581 Update queries about DB navigation. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-22 21:20:56 +02:00