Commit Graph

498 Commits

Author SHA1 Message Date
Marc Delisle
f9c9a098e9 Missing definition in default configuration
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-03-03 05:31:38 -05:00
Marc Delisle
f5a9002209 Merge pull request #1520 from madhuracj/rfe1441
rfe #1441 Add regexp match when using AllowArbitraryServer
2015-02-28 06:17:36 -05:00
Madhura Jayaratne
1b939fb3d3 rfe #1441 Add regexp match when using AllowArbitraryServer
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-26 17:02:09 +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
Madhura Jayaratne
073712a442 Use empty string as the default value. Otherwise it gives trouble importing stored settings
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-23 18:23:39 +05:30
Dennis Broeks
8955c0935f Feature request 1312: Added configuration option for setting the timezone of the current database connection.
Signed-off-by: Dennis Broeks <dennis@uitzendbureau.nl>
2015-02-10 15:43:47 +01:00
Madhura Jayaratne
0ad24870e6 rfe #1260 Setting LoginCookieValidity > session.gc_maxlifetime
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-02 16:13:50 +05:30
Marc Delisle
bdce26898e rfe #1596 Make "Options > Relational" configurable
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-28 08:48:17 -05:00
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
8177dafb9a Maybe 250 is too high, but 25 is very low and will create pagination trouble, so setting it to 100, see https://sourceforge.net/p/phpmyadmin/mailman/message/31333321/
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2015-01-19 03:55:36 +05:30
Atul Pratap Singh
2abe91a499 Add configuration option ShowNavigationAsTree with true as default
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2015-01-15 23:45:35 +05:30
Hugues Peccatte
7053381719 Merge branch 'f1591_master' 2015-01-13 22:43:19 +01:00
Madhura Jayaratne
6d12882946 Remove display direction
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-12 14:31:44 +05:30
Hugues Peccatte
44b4f7f7eb Update setup and documentation.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-01-11 16:19:42 +01:00
Hugues Peccatte
bc634d8fc0 Update default value.
Fix style.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-01-11 16:02:15 +01:00
Hugues Peccatte
61618c4948 rfe #1591 Shortcut link to search page
Add second icon in navigation tree.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-01-11 15:55:29 +01:00
Marc Delisle
1bb664ada8 This directive should not be inside the server-specific section
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-06 13:45:21 -05:00
Marc Delisle
79974aa6ac Merge commit 'c69cf0b' 2015-01-01 10:46:26 -05:00
Marc Delisle
c69cf0b74d Based on http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci, changed the default connection collation
to improve sort accuracy.

Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-01 10:42:44 -05:00
Madhura Jayaratne
1b87db5724 bug #4675 phpMyAdmin should be able to work without 'examples' DIR - move SQL scripts to sql directory
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-30 22:55:33 +05:30
Marc Delisle
5429d91ce1 bug ['Error_Handler']['display'] no longer necessary
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-20 13:32:34 -05:00
Madhura Jayaratne
6df7ff8044 Set the default value of 'FirstLevelNavigationItems' configuration to a lower value to avoid too much databases from loading in the initial page
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-03 23:55:26 -08:00
Hugues Peccatte
74f0beda8f Fix syntax error.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-20 20:56:12 +02:00
Hugues Peccatte
d936df12d2 Manage option to read SQL as a multibytes string or not.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-18 20:31:54 +02:00
Madhura Jayaratne
3ac46455cf Revert "The DisableIS directive is removed"
This reverts commit d8fd82a9f5.

Conflicts:
	ChangeLog
	doc/config.rst
	libraries/config.default.php
	libraries/config/messages.inc.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-09 18:29:55 +05:30
Madhura Jayaratne
3ea2e7d81f rfe #3120 Events are not exported when using xml
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-07 18:30:10 +05:30
Hugues Peccatte
5985894160 Fix typos.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-07 00:31:45 +02:00
Chanaka Dharmarathna
7969336d04 rfe-1502 : Smart sorting for int keys
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
2014-08-26 21:44:05 +05:30
Ashutosh Dhundhara
35dab58bf5 RFE#1492: Remove the distinct query window.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-08-12 01:47:20 +05:30
Ashutosh Dhundhara
7a9569f6b5 RFE#1123: Zeroconf PMA tables support.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-08-11 18:33:59 +05:30
Bimal Yashodha
2028b6d75c Set default values for schema export options
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
2014-08-10 08:40:38 +05:30
Madhura Jayaratne
dfe8dc283a Add 'collapse all' and 'link with main panel' buttons to navigation
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-07-28 09:58:24 +05:30
Marc Delisle
8453488a26 Merge commit '5b1fe4e' 2014-06-29 07:26:54 -04:00
Shivam Dixit
3f21378e4c Fix for bug 4027
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-29 07:14:39 -04:00
Marc Delisle
8ce1e316a6 Merge branch 'QA_4_2' 2014-06-26 09:58:01 -04:00
Marc Delisle
18e6cfd5c5 mcrypt: remove the requirement (64-bit) and the related warning
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-26 09:56:24 -04:00
Madhura Jayaratne
521a77d8bd Merge pull request #1232 from kb-yashodha/multipages1
Complete multipages functionality in designer
2014-06-16 15:22:13 +05:30
Bimal Yashodha
48dd4f354d Remove references to designer_coords and designerwork
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
2014-06-16 11:39:39 +05:30
Michal Čihař
234cfbf73f Document AES usage
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-12 14:43:10 +02:00
Marc Delisle
a83ca5d73b Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-10 12:43:07 -04:00
Chirayu Chiripal
ff688b18fb Bug-4448: Dump binary columns in hexadecimal notation not working and hex_for_blob -> hex_for_binary
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-10 19:00:16 +05:30
Michal Čihař
96366ce7bc Remove no longer used caching configuration
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-06-10 11:57:15 +02:00
Marc Delisle
93ce1a69de Merge pull request #1195 from smita786/gsoc_central_columns_list
Gsoc central columns list
2014-05-26 15:14:04 -04:00
Smita Kumari
200737bcce gsoc:central list of columns, added sync and remove column list on db_structure page
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fixing indentation in mult_submits.inc.php

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

naming convention,typos, indentaion fix and removed unnecessory file db_sync_central_columns.php

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

check if central columns storage is configured, if not configured don't show the option to sync/remove

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

add/remove columns to central list of columns from tbl_structure page

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added icon image for central columns add/delete

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

add/remove of columns option in tbl_structure page in columns rows depending upon if column is already present in central columns or not

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fixed php notices, apporiprate message when a non existing column is removed and when a existing column is added to cenral list

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

documentation added for central_columns configuration

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

regenerated sprite

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

changed central_columns table structure + modified functions to add to central column as per new tbl def

updated delete and other function as per new db structure

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

remove notices

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

sprintf for variable message

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix unit test failure errors

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fixed whitespace issues plus function definition

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

refactoring code plus fixing coding style issues

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-05-26 23:13:03 +05:30
Chirayu Chiripal
85390a7169 rfe-982: Support for editing binary fields in hexadecimal
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-05-21 21:42:21 +05:30
Atul Pratap Singh
9d76696650 We decided to display pagination after 250, see http://sourceforge.net/p/phpmyadmin/mailman/message/31333321/
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-04-27 05:33:12 +05:30
Marc Delisle
48cee9be09 Now that MaxNavigationItems is no longer related to the number of databases, it makes more sense to lower its default value
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-04-25 06:13:51 -04:00
Hugues Peccatte
ebc2739c89 Update documentation.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-04-22 21:36:26 +02:00
Hugues Peccatte
6cb5756e7d Manage a config proporty to limit the number of items at first level in navigation panel.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-04-21 22:14:31 +02:00