nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,025 Commits 1 Branch 0 Tags
d025833063e4920b51e6597e5ca1a61e60ec649c
Commit Graph

1075 Commits

Author SHA1 Message Date
Crack
97c939f8df Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-08-06 15:24:15 +02:00
ninadsp
a458147969 Merge from upstream. Resolved a conflict in js/functions.js 2010-08-05 23:51:14 +05:30
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
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
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
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
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
ninadsp
e7b130baf7 Merge remote branch 'origin/master' 2010-07-19 21:54:37 +05:30
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
ninadsp
f06bb69bb8 Merge remote branch 'origin/master' 2010-07-12 22:47:17 +05:30
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
Marc Delisle
104b0ee99a remove reference to some old stuff 2010-07-07 09:44:44 -04:00
Marc Delisle
f95dc8d8a1 Merge branch 'QA_3_3' 2010-07-07 07:04:04 -04:00
Marc Delisle
3d23bcf1da improve English 2010-07-07 07:03:31 -04:00
Crack
93d49e8ca8 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-05 19:37:03 +02:00
ninadsp
e049c1d158 Merge remote branch 'origin/master' 
Conflicts:
	po/fr.po
	po/sl.po
 2010-07-03 21:00:08 +05:30
Marc Delisle
9e857f9f84 fix merge conflicts 2010-07-02 12:32:00 -04:00
Marc Delisle
43e41e0654 document MemoryLimit as being a string value 2010-07-02 12:28:44 -04:00
Marc Delisle
6f76793a18 XHTML compliance 2010-07-01 07:56:16 -04:00
Marc Delisle
616091bae1 Merge branch 'QA_3_3' 2010-07-01 07:51:23 -04:00
Marc Delisle
a7afb107eb new FAQ 6.26, selecting a range of rows 2010-07-01 07:50:29 -04:00
Marc Delisle
b014b4c661 Merge branch 'QA_3_3' 2010-07-01 07:35:39 -04:00
Marc Delisle
f007adce6b typo 2010-07-01 07:34:55 -04:00
Marc Delisle
63b6abb326 Merge branch 'QA_3_3' 2010-06-30 09:36:11 -04:00
Marc Delisle
b2fdf039db clarify what is meant by "put the table name" 2010-06-30 09:35:44 -04:00
Crack
e5238f3845 add $cfg['UserprefsDisallow'] and allow setting it in setup script 
correct IE opacity issue for "restore default value" button
fix regressions introduced in previous commit
 2010-06-21 19:12:25 +02:00
ninadsp
78b39d71ea Merge remote branch 'origin/master' 2010-06-21 00:06:15 +05:30
Crack
f920e44af4 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-06-20 18:45:41 +02:00