Commit Graph

438 Commits

Author SHA1 Message Date
Chanaka Indrajith
4457f40ef4 Support for export server/db/table without views
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-02-06 23:03:04 +05:30
Chanaka Indrajith
55151381fa rfe-1403 : Support for export only triggers/stored procedures
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-02-04 22:47:00 +05:30
Chanaka Indrajith
2988aebc86 rfe-1483 : Export database without triggers
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-01-28 23:09:59 +05:30
Marc Delisle
379f8b6704 Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-15 08:53:00 -05:00
Marc Delisle
144e00e5da bug #4221 Bzip2 export cannot be directly imported (so withdraw bz2 export)
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-15 08:39:42 -05:00
Marc Delisle
b2305dcefc Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-18 12:45:03 -05:00
Marc Delisle
9876aeb550 Finish removing the gather suboption of the error handler
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-18 12:37:01 -05:00
Marc Delisle
2a8962aa95 Signed-off-by: Marc Delisle <marc@infomarc.info>
Added warning about the mysql extension being deprecated
and removed the extension directive
2013-12-14 14:26:12 -05:00
Madhura Jayaratne
4a8e3ce39a Fix docs
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2013-12-12 07:14:10 +05:30
Chanaka Indrajith
30522c8d5f Rename the global variable from row_action_type to RowActionType
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2013-12-05 23:31:50 +05:30
Marc Delisle
d34e84e75c Move the MaxNavigationItems directive to the Navigation panel section (doc and default config) 2013-11-24 06:59:19 -05:00
Marc Delisle
ebc5e9a5c7 We do not need a separate ErrorReporting directive 2013-11-20 06:14:53 -05:00
Marc Delisle
85ea82a409 Remove the ShowDatabasesCommand directive 2013-11-06 12:47:27 -05:00
Marc Delisle
d8fd82a9f5 The DisableIS directive is removed 2013-11-05 12:44:04 -05:00
Mohamed Ashraf
d90126ebd7 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting
Conflicts:
	ChangeLog
	scripts/create-release.sh
2013-09-21 00:49:01 +02:00
Dieter Adriaenssens
4b43310d6f fix coding style : use lowercase null 2013-09-06 17:53:54 +02:00
Mohamed Ashraf
088166f0a3 Merge remote-tracking branch 'origin/master' into error_reporting
Conflicts:
	ChangeLog
2013-09-01 13:07:52 +02:00
Marc Delisle
e25db4a004 Fix merge conflicts 2013-08-27 10:54:59 -04:00
Marc Delisle
18c35b7689 Merge branch 'QA_4_0' 2013-08-27 08:11:33 -04:00
Michal Čihař
c921f6f807 Increase default maximal number of navigation items
The load times should not be that big issue with 250 items and it helps
loading all tables/databases for most users.
2013-08-27 11:10:32 +02: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
Marc Delisle
15de2de0fc Merge pull request #605 from ibennetch/ssl
Improved SSL communication between MySQL and phpMyAdmin
2013-08-17 12:31:32 -07:00
Isaac Bennetch
8fd8c4d525 Improved SSL communication between MySQL and phpMyAdmin 2013-08-16 23:20:21 -04:00
Jerald Johnson
294d33c2f6 Update config.default.php
Since 2010 (at least) 0 has been used for unlimited in maxmem

However, unlimited is actually -1 and can cause issues in certain environment.
2013-08-14 12:47:41 -05:00
Michal Čihař
d7c3b58337 Dropped MySQL manual type configuration
Nothing but default settings is really working now:

- most formats are no longer available on MySQL formats
- for downloadable doc our links are in most cases broken and nobody
  noticed this, so I assume nobody is using this
- anyway most current installations don't have troubles with internet
  access what was main motivation for this configuration directive
2013-08-07 08:32:01 +02:00
Mohamed Ashraf
1bbb3816a8 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting
Conflicts:
	ChangeLog
	libraries/Scripts.class.php
	libraries/config.default.php
2013-08-07 01:05:48 +02:00
Michal Čihař
b8ea23ab9f Drop $cfg['SQP']['fmtType']
It has no effect anyway and in case we would want to make syntax
highlighting optional, it needs to be done in javascript and needs
better configuration name than this one.
2013-08-06 13:35:09 +02:00
Michal Čihař
cc3645592f Drop no longer used config for SQP CSS 2013-08-06 13:21:14 +02:00
Michal Čihař
351acd74af Demo server support
This merges messages used in demo server to allow their translations and
consistent handling like other messages. Messages are enabled by
$cfg['DBG']['demo'].
2013-07-30 14:09:06 +02:00
Michal Čihař
d5b2f8daca Add mb_convert_encoding support to charset conversion 2013-07-30 13:42:31 +02:00
Isaac Bennetch
0174f102aa Merge pull request #546 from kasunchathuranga/exportView
Export views as if they were tables
2013-07-29 21:14:21 -07:00
Mohamed Ashraf
b83f0eb463 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting
Conflicts:
	ChangeLog
	doc/config.rst
	js/messages.php
	libraries/config/setup.forms.php
	version_check.php

changed 'libraries/Util.class.php' to accept the newly renamed proxy variables
2013-07-29 18:12:04 +02:00
Michal Čihař
5c51f4fecb Merge remote-tracking branch 'origin/QA_4_0'
Conflicts:
	libraries/config/setup.forms.php
2013-07-29 15:00:53 +02:00
Michal Čihař
240b8332db Readd AllowThirdPartyFraming option
We want by default no framing of phpMyAdmin, but still some sites might
need to embed it, so configuration option (with appropriate security
warning) is there.

This basically reverts d7e0bed284.
2013-07-29 14:55:22 +02:00
Kasun Chathuranga
f14e777e87 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin into exportView 2013-07-29 09:07:42 +05:30
Kasun Chathuranga
558c4df1bb Allow exporting views as if they were tables 2013-07-29 09:06:09 +05:30
Marc Delisle
269d0c89fe Fix merge conflicts 2013-07-28 06:17:38 -04:00
Marc Delisle
836529be42 Fix merge conflicts 2013-07-28 05:55:40 -04:00
Kasun Chathuranga
0cc2cc69a5 Change feature name from 'navigation' to 'navigationhiding' 2013-07-27 21:11:44 +05:30
Kasun Chathuranga
04c2e88d67 Change tables name from 'navigation' to 'navigationhiding' 2013-07-25 21:26:23 +05:30
Kasun Chathuranga
dd39bdd717 Use 'show' instead of 'unhide' in messages and method comments 2013-07-25 06:52:29 +05:30
Kasun Chathuranga
342e0a6b33 Configuration values for hide/unhide navigation items feature 2013-07-20 17:10:43 +05:30
Marc Delisle
dc92c72e8a Merge commit '77e67c3' 2013-07-19 09:13:51 -04:00
Marc Delisle
77e67c3f2c - bug #4019 Create database if not exists (export): add an option to the
interface to enable generating CREATE DATABASE and USE (false by default)
2013-07-19 09:09:24 -04:00
Marc Delisle
90d968b447 Fix merge conflicts 2013-07-17 15:18:09 -04:00
Kasun Chathuranga
d25583a23e Add new tables as configurations 2013-07-05 11:56:54 +05:30
Mohamed Ashraf
fe37de2640 Removed 'VersionCheck' profix from proxy variables 2013-06-29 14:49:02 +02:00
Mohamed Ashraf
b9bf9e0bcc Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting 2013-06-25 07:19:30 +02:00
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