ninadsp
c9253c0a0e
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
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
ninadsp
c0ee037c59
Resolved a Merge Conflict
2010-08-17 18:25:03 +05:30
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
ninadsp
95a8521f11
Merge remote branch 'origin/master'
2010-08-10 00:55:22 +05:30
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
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
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
Michal Čihař
cfc7fd7a2d
The linked-tables infrastructure is now called phpMyAdmin configuration storage.
2010-07-26 17:16:55 +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
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
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
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
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
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
ninadsp
78b39d71ea
Merge remote branch 'origin/master'
2010-06-21 00:06:15 +05:30
Marc Delisle
12edc03e2f
3.3.5-dev
2010-06-20 06:25:07 -04:00
Marc Delisle
b95666b22d
3.3.4-rc1
2010-06-20 06:01:52 -04:00
