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

104 Commits

Author SHA1 Message Date
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
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
Kasun Chathuranga
04c2e88d67 Change tables name from 'navigation' to 'navigationhiding' 2013-07-25 21:26:23 +05:30
Kasun Chathuranga
342e0a6b33 Configuration values for hide/unhide navigation items feature 2013-07-20 17:10:43 +05:30
Kasun Chathuranga
d25583a23e Add new tables as configurations 2013-07-05 11:56:54 +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
Michal Čihař
fab879f924 Simplify reCaptcha configuration 
Once private and public keys are in place, it is enabled. I see no need
for per server setup.
 2013-06-12 09:38:10 +02:00
Michal Čihař
d08730780a Consistent config naming with other config options (issue #369) 2013-06-11 15:30:14 +02:00
Michal Čihař
65a083f6d4 Merge branch 'RECAPTCHA2' of git://github.com/pbojan/phpmyadmin into pbojan-RECAPTCHA2 
Conflicts:
	libraries/Header.class.php
 2013-06-11 15:28:19 +02:00
Marc Delisle
140eb64350 Merge commit '078da8d' 2013-05-23 02:57:02 -04:00
Marc Delisle
078da8d57f bug #3933 Do not translate "Open Document" in export settings 2013-05-23 02:54:47 -04:00
Michal Čihař
0068e8b567 Merge remote-tracking branch 'origin/QA_4_0' 
Conflicts:
	libraries/config/messages.inc.php
 2013-05-21 14:01:40 +02:00
Marc Delisle
6d890c3626 bug #3917 CountTables directive is deprecated 2013-05-20 13:28:44 -04:00
Marc Delisle
57e144edde Merge pull request #270 from roccivic/version-check-proxy 
Implemented rfe #1416 config.inc.php proxy settings for version_check.ph...
 2013-05-14 09:48:22 -07:00
Bojan Petkovski
ab55c635e6 ReCaptcha config from setup script 
Added config setting to be available from the ./setup script. Captcha
public and private keys are added in the Features->Security tab, the
captchaLogin is available in the New Server tab where you can enable or
disable reCaptcha for that server.
 2013-05-11 17:53:33 +02:00
Kasun Chathuranga
adb2e43f7d Implement feature request #1414 - Allow specifying crontrolport 
Set the value of controlport based on the value of controlhost
 2013-05-02 21:36:05 +05:30
Rouslan Placella
8309413bfb Implemented rfe #1416 config.inc.php proxy settings for version_check.php 2013-04-18 19:47:32 +01:00
Michal Čihař
d89da8f1d8 Consistent defaults with current create_tables script (bug #3795) 2013-01-31 10:36:10 +01:00
Marc Delisle
2723495a4f Removed the AjaxEnable directive 2012-12-21 16:04:57 -05:00
Marc Delisle
91a4ca445d Replace "frame" with "panel" and "left" with "navi" or "navigation" 2012-11-03 07:27:17 -04:00
Rouslan Placella
3dc9897561 Renamed configuration directive: LeftRecentTable => NumRecentTables 2012-10-30 20:16:57 +00:00
Rouslan Placella
41ddd1cc6a Renamed configuration directive: LeftDisplayServers => NavigationDisplayServers 2012-10-30 20:16:57 +00:00
Rouslan Placella
4f8896b98a Renamed configuration directive: LeftLogoLinkWindow => NavigationLogoLinkWindow 2012-10-30 20:16:57 +00:00
Rouslan Placella
5940cf29bb Renamed configuration directive: LeftLogoLink => NavigationLogoLink 2012-10-30 20:16:57 +00:00
Rouslan Placella
b0f5dd28ec Renamed configuration directive: LeftDisplayLogo => NavigationDisplayLogo 2012-10-30 20:16:57 +00:00
Rouslan Placella
d364d849f1 Renamed configuration directive: LeftDisplayTableFilterMinimum => NavigationTreeDisplayItemFilterMinimum 2012-10-30 20:16:57 +00:00
Rouslan Placella
8012c6fb62 Renamed configuration directive: LeftDefaultTabTable => NavigationTreeDefaultTabTable 2012-10-30 20:16:57 +00:00
Rouslan Placella
8035eecf87 Renamed configuration directive: LeftPointerEnable => NavigationTreePointerEnable 2012-10-30 20:16:57 +00:00
Rouslan Placella
8d4da3ea67 Renamed configuration directive: LeftFrameTableLevel => NavigationTreeTableLevel 2012-10-30 20:16:57 +00:00
Rouslan Placella
31a3f1d73c Renamed configuration directive: LeftFrameTableSeparator => NavigationTreeTableSeparator 2012-10-30 20:16:57 +00:00
Rouslan Placella
4f4671b284 Renamed configuration directive: LeftFrameDBSeparator => NavigationTreeDbSeparator 2012-10-30 20:16:57 +00:00
Rouslan Placella
6f8544c5ef Renamed configuration directive: LeftFrameDBTree => NavigationTreeEnableGrouping 2012-10-30 20:16:57 +00:00
Rouslan Placella
90b6718bfb Added configuration directive: MaxNavigationItems 2012-10-30 20:16:56 +00:00
Rouslan Placella
5f66444f5b Dropped configuration directives: ShowTooltipAliasDB and ShowTooltipAliasTB 2012-10-30 20:16:56 +00:00
Rouslan Placella
9f360c30f5 Dropped configuration directive: DisplayDatabasesList 2012-10-30 20:16:56 +00:00
Rouslan Placella
c9edec6e65 Dropped configuration directive: LeftFrameLight 2012-10-30 20:16:56 +00:00
Rouslan Placella
d7e0bed284 Dropped configuration directive: AllowThirdPartyFraming 2012-10-30 20:16:56 +00:00
Jim Nelin
8e6d434159 Added $cfg['ServerLibraryDifference_DisableWarning'] to make it possible to hide the warning about differences in MySQL library and server version. 2012-10-22 17:22:03 +02:00
Marc Delisle
6b56856b1d Grid editing mode: configuration 
Move SaveCellsAtOnce to a better place in the configuration file
 2012-10-20 07:12:14 -04:00
Marc Delisle
b4f51cada5 Remove ReplaceHelpImg directive; this is a behavior that belongs to the themes 2012-04-27 15:44:20 -04:00
Marc Delisle
28d45840ac Remove VerboseMultiSubmit configuration directive 2012-04-26 12:37:07 -04:00
Marc Delisle
b6925193d6 Remove SuggestDBName configuration directive 2012-04-21 08:21:28 -04:00
Marc Delisle
1751bf2ac9 Finish implementation of HideStructureActions 2012-04-16 10:54:26 -04:00
Marc Delisle
049a222648 Remove LightTabs configuration directive 2012-04-15 19:57:06 -04:00
Marc Delisle
d3266a202d verbose_check is no longer needed 2012-04-14 10:06:58 -04:00
Jo Michael
8744f8cf66 + rfe #3517354 [interface] Allow disabling CodeMirror with $cfg['CodemirrorEnable'] = false 2012-04-13 01:43:32 +02:00