lorilee
aa49b85fad
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
...
Conflicts:
libraries/display_export.lib.php
2010-07-20 15:23:12 -07:00
lorilee
6ed0cb3726
Corrected syntax for checking if a checkbox is checked
2010-07-20 13:56:28 -07:00
lorilee
d229f6ca24
ACcidentally deleted these files
2010-07-20 13:10:34 -07:00
lorilee
2ebf96d242
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
...
Conflicts:
libraries/display_export.lib.php
libraries/display_import.lib.php
2010-07-20 13:04:03 -07:00
lorilee
b8022422f7
Updated enum/set editor (submit button has only one function, escapes special characters, has more instructions for formatting
2010-07-20 12:22:39 -07:00
Michal Čihař
0b86b981bb
This comment looks totally irellevant.
2010-07-20 15:29:06 +02:00
Michal Čihař
3e57a8eca9
No @uses __('Something').
2010-07-20 15:06:34 +02:00
Michal Čihař
60b2d5a3a4
Merge branch 'QA_3_3'
...
Conflicts:
Documentation.html
README
libraries/Config.class.php
translators.html
2010-07-20 14:39:46 +02:00
Michal Čihař
ef500cd23f
bug #3031705 [core] Do not use CONCAT for DECIMAL fields.
2010-07-20 14:37:53 +02:00
Michal Čihař
59428bb433
Whitespace cleanup.
2010-07-20 14:36:44 +02:00
Michal Čihař
0305c10f91
rfe #3016457 [interface] Define tab order in SQL form to allow easier tab navigation.
2010-07-20 14:19:46 +02:00
Michal Čihař
29ccdfc1ff
Focus SQL query area after dom is ready.
2010-07-20 14:14:44 +02:00
Michal Čihař
318dc4b650
Drop @version tag from docblocks.
2010-07-20 13:59:17 +02:00
Michal Čihař
95c0b5125d
This function is not used anywhere.
2010-07-20 13:57:25 +02:00
Michal Čihař
79a23fcd01
Forgotten occurence.
2010-07-20 12:20:06 +02:00
Michal Čihař
ee99ed3d39
libiconv is gone as of PHP 4.0.5, no need to support that
2010-07-20 12:19:35 +02:00
Michal Čihař
be6e0eb8f3
Standard warnings for missing extensions.
2010-07-20 12:13:29 +02:00
Michal Čihař
f152dbcf84
The configuration directive is handled by generic config loading.
2010-07-20 12:10:41 +02:00
Michal Čihař
75593e3603
Do not die if RecodingEngine is auto and no engine is found.
2010-07-20 12:09:22 +02:00
Michal Čihař
42532065ab
No section for loading extensions.
...
The dl has been deprecated long time and the code for it removed as well
so we can simplify loading much.
2010-07-20 12:08:43 +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
Michal Čihař
df4a6efe47
Drop convcharset/pma_charset handling.
...
This code had no real use, it was used for converting strings from MySQL
to browser encoding.
2010-07-20 11:46:11 +02:00
Michal Čihař
4603f7e881
This function is not used anywhere.
2010-07-20 11:42:53 +02:00
Michal Čihař
c9aa65668c
Fix comment.
2010-07-20 11:42:38 +02:00
lorilee
cb25753966
Sets the default export method if it is not set in config.inc.php
2010-07-19 17:17:04 -07:00
Marc Delisle
4e5061d323
Generate password only available if JS is enabled
2010-07-19 10:03:17 -04:00
Marc Delisle
828d008838
3.3.6-dev
2010-07-18 14:34:32 -04:00
lorilee
09b43c7cb1
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
2010-07-16 16:56:38 -07:00
lorilee
8397112a67
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee
2010-07-16 16:54:59 -07:00
lorilee
60f95aa432
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2010-07-16 16:54:36 -07:00
lorilee
7786d9421e
Changed the default CSV column separator from a comma to a semi-colon
2010-07-16 00:12:13 -07:00
lorilee
7b46075360
Fixed bug where non-footnote notices were being hidden; footnotes given their own div classes
2010-07-16 00:09:58 -07:00
Dieter Adriaenssens
e31dcc11ef
Merge branch 'QA_3_3'
...
Conflicts:
libraries/import.lib.php
2010-07-14 22:32:10 +02:00
Dieter Adriaenssens
dbe5daaad3
Converting number of Excel column names no longer limited
2010-07-14 22:29:26 +02:00
lorilee
8adaaf548f
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
2010-07-14 11:34:35 -07:00
lorilee
5fab0e993c
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
2010-07-14 11:33:45 -07:00
Michal Čihař
a038d59f7a
Add Uyghur description.
2010-07-14 13:29:25 +02:00
lorilee
ecb4cdc764
Added option in config.inc.php to set the default export method to quick, custom, or custom-no-form
2010-07-13 18:21:34 -07:00
lorilee
5ad3a70718
Improved tooltip for JavaScript-enabled browsers (superscripts changed to icons)
2010-07-13 17:44:05 -07:00
Dieter Adriaenssens
17fc1370f3
Merge branch 'QA_3_3'
...
Conflicts:
ChangeLog
libraries/import.lib.php
2010-07-13 23:27:15 +02:00
Dieter Adriaenssens
6648c620d9
Convert Excel column name correctly
2010-07-13 23:23:51 +02:00
Dieter Adriaenssens
8b8562b435
cleanup (re)moved files
2010-07-13 20:35:14 +02:00
Dieter Adriaenssens
64a2832ac8
Update library PHPExcel to version 1.7.3c
2010-07-13 20:07:41 +02:00
Dieter Adriaenssens
ee0b2895ce
Update library PHPExcel to version 1.7.3
2010-07-13 20:02:18 +02:00
Dieter Adriaenssens
b90a1b496b
upgrade to PHPExcel 1.7.2
2010-07-13 19:42:07 +02:00
Dieter Adriaenssens
798def6e45
upgrade to PHPExcel 1.7.0
2010-07-13 19:39:40 +02:00
lorilee
27bc09c939
Merge branch 'master' of http://repo.or.cz/r/phpmyadmin
2010-07-12 12:40:27 -07:00
Marc Delisle
6ea41018b2
Merge branch 'QA_3_3'
2010-07-12 09:01:05 -04:00