gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,045 Commits 12 Branches 481 Tags 2.4 GiB
511a005281
Commit Graph

414 Commits

Author SHA1 Message Date
Dieter Adriaenssens
4b43310d6f fix coding style : use lowercase null 2013-09-06 17:53:54 +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
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
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
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