nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,475 Commits 1 Branch 0 Tags
e076ec85e174038c7ffe17f701342e52f4413afe
Commit Graph

1036 Commits

Author SHA1 Message Date
Herman van Rink
b477c4cb1a Merge branch 'blinky/master' into gsoc2010-blinky 
Conflicts:
	Documentation.html - renumbered 6.28 to 6.29
 2010-08-25 16:59:54 +02:00
Michal Čihař
0b015eeb5d These refer to no longer existing error message. 2010-08-23 13:39:14 +02:00
Michal Čihař
e1c7efb807 This FAQ is describing some ancient versions. 2010-08-23 13:33:51 +02:00
Michal Čihař
a750fc2fdb Fix html. 2010-08-23 13:28:50 +02:00
Michal Čihař
cde7019f3c Better anchor. 2010-08-23 13:28:36 +02:00
Michal Čihař
132884f394 Fix html. 2010-08-23 13:28:09 +02:00
Michal Čihař
209019efef Advanced authentication is gone for ages. 2010-08-23 13:27:23 +02:00
Michal Čihař
03d3062a65 Credits and changelog for Lori. 2010-08-23 11:17:15 +02:00
Michal Čihař
4a75c9b26e Changelog and credits for schema export. 2010-08-23 11:14:30 +02:00
Michal Čihař
5a51858352 [relations] Dropped WYSIWYG-PDF configuration variable. 2010-08-23 11:05:12 +02:00
Marc Delisle
2c345d1087 credit for user preferences; new terminology (configuration storage) 2010-08-21 08:09:24 -04:00
Marc Delisle
82acbb2ba3 fix merge conflicts 2010-08-21 07:46:57 -04:00
Michal Čihař
5f837f08c9 Merge branch 'QA_3_3' 2010-08-20 11:02:50 +02:00
Michal Čihař
a29323a1a6 bug #3044189 [doc] Cleared documentation for hide_db. 2010-08-20 11:02:38 +02:00
Crack
b8cee3086b Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	js/functions.js
	js/tooltip.js
	libraries/config.default.php
	libraries/config.values.php
	libraries/display_export.lib.php
	setup/lib/forms.inc.php
	setup/lib/messages.inc.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
 2010-08-19 14:45:18 +02:00
Martynas Mickevicius
b32e5879fd Merge commit 'origin/master' into local 2010-08-16 01:01:30 +03:00
Martynas Mickevicius
6c9f949613 added entry in the faq 2010-08-15 15:10:32 +03:00
lorilee
c424dbee38 Added documentation for quick/custom export 2010-08-14 14:52:12 -07:00
Michal Čihař
b51a217c36 Use html entities for utf-8. 2010-08-14 21:53:48 +02:00
Michal Čihař
a918991d86 Add closing HTML tags. 2010-08-14 21:52:38 +02:00
Marc Delisle
ba038ed6e1 fix merge conflict 2010-08-07 07:10:18 -04:00
Marc Delisle
789d3a4131 Withdraw or edit FAQ entries related to older MySQL or PHP 2010-08-07 07:08:11 -04:00
Crack
97c939f8df Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-08-06 15:24:15 +02:00
Marc Delisle
d46bb6d877 remove custom MIME type change for BLOB streaming because in its current version it can be a very costly operation 2010-08-03 16:21:17 -04:00
Marc Delisle
b2a55f1ef2 For BLOB streaming, LONGBLOB colum must be nullable 2010-08-03 12:43:45 -04:00
Isaac Bennetch
6383f23035 patch #3038293 [doc] Language and grammar fixes 2010-08-03 12:39:02 -04:00
Crack
53e8d75c0f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/db_links.inc.php
	libraries/tbl_links.inc.php
 2010-08-01 23:19:21 +02:00
Marc Delisle
57f51bfda5 clarify the doc 2010-07-31 14:22:45 -04:00
Michal Čihař
39aa4355a9 Convert default queries to unified expansion. 2010-07-27 10:01:58 +02:00
Crack
7db978de3f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/config.values.php
 2010-07-26 20:24:57 +02:00
Michal Čihař
cfc7fd7a2d The linked-tables infrastructure is now called phpMyAdmin configuration storage. 2010-07-26 17:16:55 +02:00
Crack
2d67cb58c4 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/relation.lib.php
 2010-07-24 18:34:52 +02:00
Marc Delisle
aec1adb0e0 credit for new BLOB streaming support 2010-07-23 10:13:49 -04:00
Marc Delisle
9232e02372 BLOB streaming doc 2010-07-23 09:10:24 -04: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
Michal Čihař
a1e1e44149 Cleanup SQL validator documentation. 2010-07-21 13:50:33 +02:00
Michal Čihař
1faec011d0 SQL validator works also with SOAP PHP extension. 2010-07-21 13:17:15 +02:00
Michal Čihař
dba7151245 Document new format strings. 2010-07-21 10:05:55 +02:00
Michal Čihař
5908ab72bc Clarify database upgrade instructions. 
We don't want to maintain all new tables in upgrade script as well.
 2010-07-21 09:07:59 +02:00
Crack
fab6eb09ea Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-20 12:30:03 +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
Michal Čihař
11e53fb141 [core] Dropped AllowAnywhereRecoding configuration variable. 
It really does not make sense these days, now the recoding of
export/import is available when the necessary extensions are loaded and
it is possible to disable it using RecodingEngine directive.
 2010-07-20 12:05:07 +02:00
Michal Čihař
a4055b4773 [core] RecodingEngine now accepts none as valid option. 2010-07-20 11:56:21 +02:00
Michal Čihař
d7192b3a95 DefaultCharset is not used anywhere. 2010-07-20 11:52:33 +02:00
Crack
4376f6ce14 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-19 16:04:50 +02:00
Marc Delisle
828d008838 3.3.6-dev 2010-07-18 14:34:32 -04:00
Marc Delisle
04fc2f62b0 fix merge conflict 2010-07-17 09:56:24 -04:00
Marc Delisle
0b9cf14f75 typo 2010-07-17 09:54:54 -04:00
Crack
74eb921e68 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-12 14:04:16 +02:00
Marc Delisle
638fe75a8b fix merge conflict 2010-07-07 09:47:12 -04:00