Commit Graph

66 Commits

Author SHA1 Message Date
Michal Čihař
e9da696911 Various coding style fixes 2013-08-07 11:59:01 +02:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Michal Čihař
a5f572e132 Factor out text showing detection as well 2013-07-30 15:07:44 +02:00
Michal Čihař
7a97781c23 Share code for checking whether to show icons 2013-07-30 14:54:21 +02:00
Madhura Jayaratne
b72638c6e1 Fix test failures 2013-07-17 17:03:50 +05:30
Kasun Chathuranga
45645a192b Escape values in SQL queries 2013-07-16 06:43:05 +05:30
Kasun Chathuranga
3e8325afb0 Move User groups related functionality to a separate sub menu tab 2013-07-12 18:37:48 +05:30
Kasun Chathuranga
62b12b4d21 Fix error introduced while resolving merge conflicts 2013-07-12 17:04:00 +05:30
Kasun Chathuranga
f56891acec Merge branch 'master' into configurableMenus
Conflicts:
	libraries/Menu.class.php
	libraries/Util.class.php
2013-07-12 17:01:03 +05:30
Michal Čihař
c0ce163e05 Drop some unused local variables
Found by PMD on our CI server
2013-07-10 14:53:05 +02:00
Marc Delisle
bbabfa80ca There might be other reasons to use the SQL query box on an empty database 2013-07-10 07:20:19 -04:00
Kasun Chathuranga
b756916c46 Manage user groups 2013-07-08 15:28:57 +05:30
Kasun Chathuranga
08cd261856 Allow setting user groups when creating and editing users 2013-07-08 01:20:31 +05:30
Kasun Chathuranga
7cfdbc03ec Fix checkstyle errors 2013-07-05 12:32:01 +05:30
Kasun Chathuranga
160e2cb8d8 Fix checkstyle errors 2013-07-05 12:28:18 +05:30
Kasun Chathuranga
e4f52e7d4c Use empty to avoid notices 2013-07-05 10:28:22 +05:30
Kasun Chathuranga
5e6bdf1b24 Display menu items according to the user group configuration 2013-07-02 23:58:26 +05:30
Kasun Chathuranga
41a497d169 Implement 'find and replace in a column' feature 2013-06-26 20:30:28 +05:30
Michal Čihař
bebba32337 Merge remote-tracking branch 'origin/QA_4_0'
Conflicts:
	libraries/config.values.php
	libraries/sql_query_form.lib.php
	server_binlog.php
	server_databases.php
	tbl_structure.php
	test/classes/PMA_DisplayResults_test.php
2013-06-24 10:41:54 +02:00
Marc Delisle
d4d5a03766 Bug #3960 NavigationBarIconic config not honored 2013-06-21 10:00:41 -04:00
Marc Delisle
4a91c5753c Fix merge conflicts 2013-06-08 13:36:15 -04:00
Marc Delisle
30e0e3648d bug #3921 Call to undefined function PMA_isSuperuser() if default server is not set 2013-06-08 13:27:29 -04:00
Marc Delisle
c690e5279a Fix merge conflict 2013-06-08 08:43:56 -04:00
Marc Delisle
a5839bf236 Start to fix bug #3921 2013-06-08 08:38:12 -04:00
Madhura Jayaratne
3dd99512f0 These constants are better as a part of DatabaseInterface class 2013-05-26 21:15:24 +05:30
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Kasun Chathuranga
03fc9b9256 PMA_is_system_schema --> PMA_isSystemSchema 2013-05-12 08:51:54 +05:30
Michal Čihař
8f663d55b1 Merge remote-tracking branch 'origin/QA_4_0' 2013-05-10 08:20:08 +02:00
Spun Nakandala
5b82f4359a Bug #3918 Greyed out tabs when there are no rows fixed 2013-05-10 02:09:14 +05:30
Kasun Chathuranga
fbe4438628 PMA_DBI_fetch_result --> PMA_DBI_fetchResult 2013-05-01 00:05:16 +05:30
Kasun Chathuranga
a85d9eaa2c PMA_DBI_get_tables --> PMA_DBI_getTables 2013-04-30 23:29:55 +05:30
Rouslan Placella
b621d2b56c Split the server staus monitor features into a separate page 2012-12-14 19:05:04 +00:00
Rouslan Placella
2e1bc1bd8d Refactored menuPrepare and menuResize into a jQuery plugin
Also integrated this plugin with both the main menu and the resizable
menu on the table structure page
2012-11-24 17:25:37 +00:00
Marc Delisle
c4ff4bee20 Remove the Synchronize feature 2012-11-07 13:09:47 -05:00
Rouslan Placella
886f926c0b Implemented menu caching 2012-10-30 20:24:00 +00:00
Rouslan Placella
2737754356 Displaying the $message is not the job of the Menu class 2012-10-30 20:07:01 +00:00
Chanaka Indrajith
0ff571a128 Modify classes with property 2012-09-16 15:29:56 +05:30
Rouslan Placella
5ed8c9815c Fixed display of table comments in the menu 2012-08-09 10:41:51 +02:00
Rouslan Placella
2428a6f4c2 Dropped pointless lazy getter (if the menu is instanciated, we'll have to get a reference to the common functions anyway) 2012-08-02 19:02:14 +02:00
Rouslan Placella
ba7a49e81c Fixed order of tabs in the top menu for empty databases 2012-08-02 18:57:24 +02:00
Madhura Jayaratne
d32f413857 Activate search tab for both ordinary table search and zoom search 2012-08-01 23:09:52 +05:30
Marc Delisle
03f34c4ef0 Unused method: setCommonFunctions() 2012-07-10 12:36:27 -04:00
Chanaka Indrajith
106265a7f8 Resolve conflicts 2012-06-30 11:30:39 +05:30
J.M
bbb4a6c5aa PMA_DRIZZLE is not always defined in libraries/Menu.class.php#428
Use of undefined constant PMA_DRIZZLE - assumed 'PMA_DRIZZLE'

Backtrace

.\libraries\Menu.class.php#104: PMA_Menu->_getServerTabs()
.\libraries\Menu.class.php#75: PMA_Menu->_getMenu()
.\libraries\Header.class.php#315: PMA_Menu->getDisplay()
.\libraries\Response.class.php#244: PMA_Header->getDisplay()
.\libraries\Response.class.php#257: PMA_Response->_getDisplay()
.\libraries\Response.class.php#308: PMA_Response->_htmlResponse()
.\libraries\OutputBuffering.class.php#110: PMA_Response::response()
PMA_OutputBuffering::stop()
2012-06-28 14:55:28 +02:00
Chanaka Indrajith
39d37fafcc Resolved conflicts 2012-06-27 21:53:59 +05:30
Chanaka Indrajith
1cc49d32d9 Resolved conflicts 2012-06-27 07:06:34 +05:30
Marc Delisle
948f5c31cf Sometimes the row count was not correct 2012-06-24 07:19:26 -04:00
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Marc Delisle
dbc7758f12 PMA_generateHtmlTabs() becomes PMA_getHtmlTabs() 2012-06-17 08:39:31 -04:00
Rouslan Placella
41cb6e20b0 Added PMA_OutputBuffering class, dropped ob.lib.php 2012-06-11 14:06:03 +01:00