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

386 Commits

Author SHA1 Message Date
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
41d64851fa Number of rows dropdown, to improve usability 2013-06-19 12:36:04 -04:00
Marc Delisle
b065bff077 Change MaxRows default value to 25 to fit with the upcoming selector 2013-06-19 11:44:49 -04:00
Marc Delisle
3216740323 No longer need to confirm at the PHP level 2013-06-13 12:34:05 -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
Michal Čihař
bfa6282083 Merge branch 'QA_4_0' 2013-06-05 10:04:57 +02:00
Michal Čihař
eb29af585a Allow customization of CSP headers 
This is useful for inserting custom javascript in header/footer files.
 2013-06-05 10:04:06 +02:00
Michal Čihař
1c0eb2a467 Default to none PHP highlighting 2013-05-24 09:59:38 +02: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
Marc Delisle
b48affc999 Merge pull request #216 from ayushchd/reserved_words_issue 
Reserved words issue
 2013-03-21 09:45:57 -07:00
ayushchd
27967e7f79 Added ability to disable MySQL reserved word warning 
Disable MySQL reserved word warning $cfg['ReservedWordDisableWarning'],
documentation and ability to change from prefs pane
 2013-03-21 18:29:24 +05:30
ayushchd
665ffd4b4c Reserved word warning config 
This commit removes reserved word warning from the Browse pages and the
warning on structure page can be switched on/off using the config
variable $cfg['ReservedWordWarning']
 2013-03-10 19:45:19 +05:30
Marc Delisle
da0f681fc7 Remove the database ordering sub-feature of the only_db directive 2013-03-09 07:48:08 -05:00
Marc Delisle
bcfba0d46c Fix merge conflicts 2013-02-09 07:50:16 -05:00
Michal Čihař
57a97a7057 Use up to date links to bugs and feature requests 2013-02-04 11:52:47 +01:00
Marc Delisle
be42bf2035 This is now called the navigation panel 2013-01-17 06:32:09 -05:00
Marc Delisle
e610174ef2 Default value for NavigationDisplayServers now set to true 2013-01-17 06:28:41 -05:00
Marc Delisle
2723495a4f Removed the AjaxEnable directive 2012-12-21 16:04:57 -05:00
Michal Čihař
61a601fc73 Implement linking to new documentation 2012-11-12 09:48:05 +01:00
Marc Delisle
3a5843a7cd rfe #1052091 [config] Double-underscores in PMA table names 2012-11-11 08:57:41 -05:00
Michal Čihař
8bab2af87b Fix description of frames 2012-11-09 13:37:45 +01:00
Rouslan Placella
c1ea4f00f9 Renamed configuration directive: LeftDisplayDatabaseFilterMinimum => NavigationTreeDisplayDbFilterMinimum 2012-10-30 20:16:57 +00: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
Rouslan Placella
9e3a9ee52f Dropped main.php 2012-10-30 20:10:20 +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