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

194 Commits

Author SHA1 Message Date
Mohamed Ashraf
a2659d7ba5 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting 
Conflicts:
	ChangeLog
 2013-09-29 23:13:05 +02:00
Michal Čihař
017e387048 Link to existing page on Wikipedia 2013-09-25 16:32:27 +02:00
Michal Čihař
8d26080f46 Remove not needed of 2013-09-25 15:28:33 +02:00
Michal Čihař
c7dab76355 Add link to wiki 2013-09-25 15:04:08 +02:00
Michal Čihař
66427dd542 Mention XAMMP as easy way to install on Windows 2013-09-25 15:04:08 +02:00
Michal Čihař
c4763baaff Incorporate distro specific docs from website 2013-09-25 15:04:08 +02: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
Michal Čihař
32e9769353 Documentation improvement 2013-09-11 16:24:56 +02:00
Michal Čihař
688ff7532a Document that ForceSSL might need PmaAbsoluteUri. 2013-09-10 08:25:28 +02:00
Mohamed Ashraf
088166f0a3 Merge remote-tracking branch 'origin/master' into error_reporting 
Conflicts:
	ChangeLog
 2013-09-01 13:07:52 +02:00
Madhura Jayaratne
44cb804ad7 Merge pull request #648 from ibennetch/pdfDoc 
Document PDFDefaultPageSize and PDFPageSizes; bug 3938
 2013-08-27 08:47:39 -07:00
Marc Delisle
09e14a6113 Fix typo 2013-08-27 11:00:37 -04:00
Marc Delisle
e25db4a004 Fix merge conflicts 2013-08-27 10:54:59 -04:00
Isaac Bennetch
e285e56497 Document PDFDefaultPageSize and PDFPageSizes; bug 3938 2013-08-27 10:18:05 -04:00
Marc Delisle
18c35b7689 Merge branch 'QA_4_0' 2013-08-27 08:11:33 -04:00
Marc Delisle
0232b5d32d Document new default value 2013-08-27 08:10:50 -04: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
94a309b077 We are already talking about PHP, no need to mention it 2013-08-24 06:30:01 -04:00
Marc Delisle
eae2f1bc28 Fix merge conflicts 2013-08-24 06:27:15 -04:00
Marc Delisle
dd39ca8da0 The ctype extension is not required but only suggested for performance 2013-08-24 06:22:50 -04: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
Michal Čihař
0b37eaab3d Adjust doc to be in sync with config (issue #595) 2013-08-15 11:30:44 +02:00
Michal Čihař
85b45b5603 This is question 2013-08-12 17:13:12 +02: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ř
2783d92621 Drop no longer used $cfg['SQP']['fmtColor'] 2013-08-06 13:31:10 +02:00
Michal Čihař
cc3645592f Drop no longer used config for SQP CSS 2013-08-06 13:21:14 +02:00
Marc Delisle
a1dc57bfdf We no longer supply a .htaccess in libraries 2013-08-03 05:27:53 -04:00
Marc Delisle
ad1136e908 Merge pull request #550 from nijel/demoserver 
Demo server support
 2013-07-30 05:39:11 -07:00
Marc Delisle
917d8033eb Fix merge conflicts 2013-07-30 08:30:32 -04:00
Marc Delisle
baf3dd9b6a Bug #4036 Call to undefined function mb_detect_encoding (clarify the doc) 2013-07-30 08:27:12 -04: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
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ř
f08ff304f9 Merge branch 'MAINT_4_0_5' into QA_4_0 2013-07-29 14:55:41 +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
Marc Delisle
e73bfee67c 4.0.6-dev 2013-07-28 09:34:39 -04:00
Marc Delisle
52b9b6c81f 4.0.5-rc1 2013-07-28 09:31:06 -04:00
Kasun Chathuranga
04c2e88d67 Change tables name from 'navigation' to 'navigationhiding' 2013-07-25 21:26:23 +05:30
Kasun Chathuranga
d0522a779c Revert half done commit 2013-07-25 07:22:40 +05:30
Kasun Chathuranga
1ae59ad063 Merge branch 'hideTables' of github.com:kasunchathuranga/phpmyadmin into hideTables 
Conflicts:
	libraries/navigation/Nodes/Node_Database.class.php
	libraries/relation.lib.php
 2013-07-25 07:08:04 +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
Isaac Bennetch
9525e09e1b Typo 2013-07-16 10:58:30 -04:00
Kasun Chathuranga
027117c94a Document new configurations 2013-07-05 12:24:37 +05:30
Michal Čihař
0f3754a271 Raise requirements to PHP 5.3 2013-07-01 15:29:47 +02:00
Mohamed Ashraf
fe37de2640 Removed 'VersionCheck' profix from proxy variables 2013-06-29 14:49:02 +02:00