80 Commits

Author SHA1 Message Date
Gabor Gyorvari
8721f7b160 patch #3430291 [import] Handle conflicts in some open_basedir situations 2011-11-05 10:33:19 -04:00
Michal Čihař
dc6c1e8b5c I think htmlspecialchars should be used here 2011-06-21 12:08:48 +02:00
Michal Čihař
ac58a3d9f3 Merge branch 'QA_3_3' 2011-02-11 14:54:06 +01:00
Michal Čihař
7f975c8107 Force bookmark ID to be integer 2011-02-11 14:53:47 +01:00
Michal Čihař
d17fba309c Fix permissions.
Most files were made executable somewhere in ninadsp tree, reverting
this.
2010-08-30 09:53:37 +02:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Marc Delisle
084c0dbcf5 functions.js included automatically 2010-07-24 08:11:48 -04:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +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
ninadsp
a8d6f9ff4c Merge remote branch 'origin/master' 2010-06-15 15:39:51 +05:30
Marc Delisle
f1d8953670 fix conflicts 2010-06-13 08:59:05 -04:00
Marc Delisle
ae8ddbf15b bug #2986422 [import] Results for query are not displayed 2010-06-13 08:42:24 -04:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet
only added a few comments
2010-05-23 01:22:01 +05:30
Marc Delisle
9735acdda4 missing escape for quote 2010-05-14 13:38:48 -04:00
Marc Delisle
b05a903dc3 gettext conversion 2010-05-14 07:47:50 -04:00
Marc Delisle
632211d065 gettext conversion 2010-05-09 16:24:32 -04:00
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Marc Delisle
f55823f47f strings to gettext, first batch 2010-05-03 12:57:46 -04:00
Philip Frank
c77216d532 [interface] Convert upload progress bar to jQuery.
patch #2986073
2010-04-15 10:36:23 +02:00
Marc Delisle
7e77192187 rfe 2958013 After import, also list uploaded filename 2010-03-18 13:02:13 -04:00
Marc Delisle
0645a4f119 bug #2941101 import timeout when table already created and several data lines 2010-01-31 16:42:06 +00:00
Marc Delisle
bc7722584e bug #2941101 import timeout when table already created and several data lines 2010-01-31 16:42:06 +00:00
Michal Čihař
201d0e892c Load mootools in every page. 2010-01-25 11:49:46 +00:00
Michal Čihař
78b00824eb [core] Updated mootools to fix some glitches with Safari.
Mootools are now in separate files as distributed upstream.
2010-01-04 15:35:23 +00:00
Marc Delisle
526dce65cb 3.3 2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4 3.3 2009-12-31 13:09:18 +00:00
Tomas Srnka
818a664b3d Updated JS code for displaying upload and import information 2009-09-13 12:28:35 +00:00
Marc Delisle
15441ded5d do not try to display a tab that was not built 2009-08-22 11:22:50 +00:00
Marc Delisle
60536d78e1 patch #2798592 [import] Progress bar 2009-07-02 12:12:06 +00:00
Marc Delisle
5f10bfdd81 undefined import_handle when importing zip file 2009-06-20 11:23:06 +00:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Michal Čihař
37315b0c79 Document some require/includes as phpdoc otherwise takes random block before to document it. 2008-11-24 10:02:56 +00:00
Marc Delisle
5e88c70a15 bug #2315549 [import] fclose() error with "Create PHP code" 2008-11-21 17:35:47 +00:00
Marc Delisle
966549e1ac bug #2222230 [import] Assigning a value in import.php 2008-11-04 20:52:08 +00:00
Marc Delisle
415071a21b correct fix for bug 2143882 2008-10-09 11:45:58 +00:00
Marc Delisle
ea463a1bf3 patch #2143882 [import] Temporary uploaded file not deleted 2008-10-04 13:44:49 +00:00
Marc Delisle
6208585d04 no longer useful since all lang files are UTF-8 2008-10-01 20:48:40 +00:00
Marc Delisle
9e83516255 bug #2033962 [import] Cannot import zip file 2008-08-09 17:14:28 +00:00
Sebastian Mendel
32c61a2ff6 reworked bookmarking 2008-05-09 12:37:30 +00:00
Sebastian Mendel
4f685307b4 cleanup 2007-10-17 14:14:59 +00:00
Sebastian Mendel
0f18e49843 make use of PMA_Message 2007-10-17 09:06:00 +00:00
Sebastian Mendel
107fc46ad9 make use of PMA_Message 2007-10-16 12:14:19 +00:00
Sebastian Mendel
ec7a30f4fd make use of new third 'class' parameter for PMA_showMessage() 2007-10-09 12:16:10 +00:00
Sebastian Mendel
40b3ce9fd1 use array to define included JavaScript libraries 2007-10-04 09:22:50 +00:00
Sebastian Mendel
1e81ce19e3 removed MySQL < 5 code 2007-10-02 09:57:19 +00:00
Sebastian Mendel
fa30ac8c33 store browse state in session per query 2007-05-15 11:16:10 +00:00
Sebastian Mendel
538830d387 $db and $table is always set, no need to check 2007-04-01 11:17:34 +00:00
Sebastian Mendel
adb39168cc coding standard: no braces around include 2007-04-01 09:51:41 +00:00
Sebastian Mendel
b2f3ae5fcf make $sql_query persistent (init it, never unset it, always assume it is set) 2007-04-01 09:26:14 +00:00