Commit Graph

147 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
Mohamed Ashraf
8f4ff6b8c9 Added Error reporting settings for deployers with docs
Enabling and disabling settings for error reporting has been added to the setup
script as well as to the sample configuration file and to the config.rst file in
the docs.
2013-06-14 17:59:45 +02: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
Michal Čihař
5d54482c66 Drop $cfg['MainPageIconic']. 2012-04-11 15:34:27 +02:00
Michal Čihař
cfee08c781 Drop $cfg['ErrorIconic'] 2012-04-11 15:27:23 +02:00
Jo Michael
10baa48564 + rfe #3516187 show tables last check time in db_structure 2012-04-09 23:09:52 +02:00
Jo Michael
d4658e5b2e + rfe #3516187 show tables creation time in db_structure 2012-04-09 23:09:51 +02:00
Jo Michael
061d49f225 + rfe #3516187 show tables last update time in db_structure 2012-04-09 23:09:50 +02:00
Dieter Adriaenssens
43b41a8cbb cleanup package tags 2012-03-14 15:37:36 +01:00
Marc Delisle
81d27b3593 RetainQueryBox in setup and user prefs 2012-01-07 07:38:00 -05:00
Marc Delisle
6f7ca79218 patch #3410688 [interface] Improving field size for character columns 2011-10-30 05:35:00 -04:00
Marc Delisle
c380102816 Setup for controlhost 2011-10-29 08:24:11 -04:00
Michal Čihař
e56949f160 Use package name PhpMyAdmin
Needed to match phpdoc rules as package name must begin with upper case.
2011-10-25 10:13:17 +02:00
Marc Delisle
d1aa3e3b02 [interface] Remove DefaultPropDisplay feature 2011-10-08 06:40:10 -04:00
Aris Feryanto
3f10465d71 Fix merge conflict with origin/master 2011-08-12 15:56:26 +08:00
Aris Feryanto
fe7eadab72 Add configuration for maximum tbl_uiprefs records, as suggested by Piotr 2011-08-12 15:49:53 +08:00
Dieter Adriaenssens
fd383934af Merge branch 'QA_3_4' 2011-08-10 20:58:45 +02:00
Dieter Adriaenssens
556636457a Remove library PHPExcel, due to license issues
Remove native Excel exportand import modules (xls and xlsx formats)
2011-08-10 20:53:51 +02:00
Aris Feryanto
0e39df6ca4 add configuration in 'user preferences' and 'setup' to show/hide the Hint created with PMA_createqTip function 2011-08-04 16:27:47 +08:00
Aris Feryanto
4b0cd86ea7 Merge branch 'grid' into aris 2011-07-26 18:30:51 +08:00
Aris Feryanto
cb090c7e21 Grid edit: add configuration to save edited cell(s) at once 2011-07-26 18:30:40 +08:00
Michal Čihař
d55306252b Replace tabs with spaces, cleanup identation 2011-07-22 10:15:08 +02:00
Marc Delisle
b2d8e0b60f Clarify directive name: ShowDisplayDir -> ShowDisplayDirection 2011-07-13 09:19:38 -04:00
Aris Feryanto
c4ee218fb5 Navigation bar: more compact, display horizontal/vertical mode only when configured 2011-07-01 11:31:30 +08:00
Michal Čihař
088e58b023 Configuration of DisableMultiTableMaintenance 2011-06-06 11:21:35 +02:00
Michal Čihař
d5f18d4e7f Merge branch 'integration'
Conflicts:
	libraries/config/setup.forms.php
	libraries/config/user_preferences.forms.php
2011-06-02 11:41:31 +02:00
Rouslan Placella
860250f020 Fix bug #3302961 - Row check boxes missing when table row links are disabled 2011-06-02 11:39:57 +02:00
Aris Feryanto
e4ba1dc066 Add table pma_ui_prefs for remembering table sorting persistently 2011-05-27 18:52:00 +07:00
Aris Feryanto
81f9537778 Add new configuration field for RememberSorting 2011-05-24 14:50:47 +07:00
Aris Feryanto
04bbe91b52 Recently used tables (fix bug & add pma_recent in /setup) 2011-05-08 22:40:46 +07:00
Aris Feryanto
21bceed414 Recently used tables (now with configuration) 2011-05-07 14:52:07 +07:00
Michal Čihař
42c8e65139 Make version check configurable. 2011-02-02 14:32:46 +01:00
Marc Delisle
0b7d8e5bf4 Conditional Ajax parameter in setup 2011-01-29 15:04:08 -05:00
Herman van Rink
8017a61253 patch #3055886 [config] update, changed boolean to integer for more precise control 2010-12-02 16:31:49 +01:00
Crack
b1aa4d72bb add user preference for accepted patch #3055886 (LeftDisplayTableFilter) 2010-09-02 23:49:38 +02:00
Michal Čihař
7f1b1df69f [core] Remove last remaining parts of profiling code which was removed in 2006. 2010-08-30 11:01:31 +02:00
Crack
b17a2e4a85 user preferences: improve styling of fieldset headers, change Export form layout 2010-08-29 12:35:02 +02:00
Crack
4c6310e349 add Export/quick_export_onserver and Export/quick_export_onserver_overwrite to user preferences 2010-08-29 02:18:04 +02:00
Crack
e344696016 account for changes introduced when merging lori/gsoc branch 2010-08-19 16:36:41 +02:00
Crack
4a5ffa7a12 File comments:
- remove @license and @version from comments
- add vim settings
- change descriptions in form definition files
2010-08-03 00:55:57 +02:00
Crack
2e55d85ab5 Developers tab no longer depends on UserprefsDisallow, introduced UserprefsDeveloperTab setting 2010-07-22 20:04:16 +02:00
Crack
7ac7e24d8c more styling for disabled options
new "Developer" tab (by default all options are disabled, users can't modify them)
fixed UserprefsDisallow export in setup script
2010-07-22 01:29:36 +02:00
Crack
7b0135ed6a fix port number validation
correct naming mistake (authentication != authorization)
setup script: move server authentication settings to new tab
2010-07-21 16:11:02 +02:00
Crack
600bdbd57e Setup script: AllowThirdPartyFraming
User preferences and setup script: new tab - Warnings, with options to disable mcrypt, Suhosin and pmadb warnings
2010-07-21 14:01:53 +02:00
Crack
43a7629da9 Users can disable: AllowUserDropDatabase, UseDbSearch, QueryHistoryDB, ShowPhpInfo, ShowChgPassword
Users can change: QueryHistoryMax (must be lower than value from file config)
2010-07-20 21:57:05 +02:00
Crack
a8ed8e6123 SQL Validator forms 2010-07-20 16:36:22 +02:00
Crack
c0ba57f040 add config options for charset in Import and Export 2010-07-20 12:42:18 +02:00
Crack
52550eff13 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Resolved conflicts:
	setup/lib/forms.inc.php
	setup/lib/messages.inc.php
2010-07-20 12:19:21 +02:00
Crack
afca401bc8 parametrized validators
valdiation by regular expressions
shorter text fields for numeric inputs
2010-07-17 11:39:30 +02:00
Crack
c5bef4d2da fix "restore default" button, should be visible only when field has custom value
added missing validations for setup script
added two field descriptions
added SkipLockedTables to user preferences
2010-07-16 20:28:11 +02:00
Crack
68d9c40113 moved Import by LOAD DATA settings to CSV category
moved PMA_array_* functions to core.lib.php
moved PMA_read_userprefs_fieldnames() to user_preferences.lib.php
server/database/table filename templates are saved to pmadb when "remember template" is checked
2010-07-04 21:56:46 +02:00
Crack
47cd7c9a20 styling
moved some options (SQL Queries and SQL Box forms)
2010-07-03 23:22:20 +02:00
Crack
2fab9fbf28 Export options 2010-07-03 22:45:14 +02:00
Crack
b13dee72f3 Import settings 2010-07-01 22:24:18 +02:00
Crack
3a8de5a716 make form definition structure the same for setup script and user preferences 2010-06-21 15:24:07 +02:00
Crack
9f44d864b6 user preferences saving and integration 2010-06-20 21:34:13 +02:00
Crack
3ff76ffcf5 moved forms definition files 2010-06-18 19:33:24 +02:00