Commit Graph

3727 Commits

Author SHA1 Message Date
ninadsp
bcbf327139 Merge remote branch 'origin/master' 2010-06-29 23:54:01 +05:30
Dieter Adriaenssens
16ed06531a remove author names 2010-06-28 20:36:12 +02:00
Marc Delisle
4986ee0174 lang directory no longer exists; I guess this mechanism is no longer needed 2010-06-28 09:25:45 -04:00
ninadsp
9a4b524db7 Hacked the PMA_generate_slider_effect() code to work with jQuery. Ajax
queries were failing due to the use of document.write(). Need to find a
better solution with $.append()
2010-06-28 01:59:52 +05:30
ninadsp
a5ae31a220 Added an empty div which will be filled with the results of the SQL
query by jQuery
2010-06-28 01:22:55 +05:30
ninadsp
a3dd431bdb Modified PMA_showMessage so that it can show the sql query even in an
ajax request, by using output buffering.
Added a function to handle the output buffer for the ajax request.
Fixed a typo in PMA_ajaxResponse
2010-06-27 23:03:20 +05:30
ninadsp
ac7cab7160 Revert "Revert "Merge remote branch 'origin/master'""
This reverts commit 4214d83e12.
2010-06-26 15:45:27 +05:30
ninadsp
4214d83e12 Revert "Merge remote branch 'origin/master'"
This reverts commit c850b8be8b, reversing
changes made to dcdde2f99f.
2010-06-26 15:43:52 +05:30
ninadsp
c850b8be8b Merge remote branch 'origin/master'
Conflicts:
	po/tr.po
2010-06-26 15:38:12 +05:30
Marc Delisle
1be2d538df fix merge conflicts 2010-06-24 10:09:19 -04:00
Stéphane Pontier
4c0e653de0 patch #2932113 Slow export when having lots of databases 2010-06-24 10:01:21 -04:00
ninadsp
cf15d940cd Bug noticed by Marc Delisle in PMA_ajaxResponse fixed 2010-06-22 11:41:55 +05:30
ninadsp
603b6bf47b Added the PMA_ajaxResponse function for Ajax requests that change the
database charset. Required for db_operations.php
2010-06-21 02:04:45 +05:30
Michal Čihař
8b1b49a6b2 Merge branch 'MAINT_3_3_4' into QA_3_3
Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
2010-06-20 16:24:28 +02:00
Marc Delisle
12edc03e2f 3.3.5-dev 2010-06-20 06:25:07 -04:00
Marc Delisle
d10de675ce 3.3.4-rc1 2010-06-20 06:20:39 -04:00
Marc Delisle
b95666b22d 3.3.4-rc1 2010-06-20 06:01:52 -04:00
ninadsp
266447bcd9 Added a function to echo a json output for an ajax request. 2010-06-17 00:16:13 +05:30
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
Marc Delisle
485e1736b6 make inline editing work for all cases of fmtType 2010-06-12 08:45:24 -04:00
Michal Čihař
8dfdcca68b Merge branch 'QA_3_3' 2010-06-11 12:41:33 +02:00
Michal Čihař
1e2731dc96 [engines] Fix getting InnoDB status. 2010-06-11 12:41:18 +02:00
ninadsp
834b36bd6a Merge remote branch 'origin/master' 2010-06-09 22:49:38 +05:30
Marc Delisle
5ed4790db0 move remaining old-format messages to the script that uses them, when possible 2010-06-08 12:32:18 -04:00
Michal Čihař
1649a0a1c4 Add description for Welsh. 2010-06-07 20:22:16 +02:00
ninadsp
42de77813c Merge remote branch 'origin/master' 2010-06-06 20:01:39 +05:30
Marc Delisle
f50d6694e7 bug #3011126 [display] Edit link missing after long query 2010-06-05 08:28:24 -04:00
Marc Delisle
c3ea6fb22b bug #3011126 [display] Edit link missing after long query 2010-06-05 08:20:36 -04:00
ninadsp
50dabaf4e7 Removed the inline JavaScript confirmLinkDropDB() call and added an id
"drop_db_anchor" to the tab
2010-06-05 14:56:08 +05:30
ninadsp
049c90ee0b Edited PMA_generate_html_tab() to add the id parameter
Necessary for attaching Ajax calls with jQuery to some tab links
2010-06-04 21:27:25 +05:30
Dieter Adriaenssens
662f3d4da3 merge with master 2010-06-03 21:21:34 +02:00
Dieter Adriaenssens
b4d8e58a72 Update library PHPExcel to version 1.7.3c 2010-06-03 20:35:06 +02:00
ninadsp
160f4314eb Merge remote branch 'origin/master' 2010-06-03 22:34:52 +05:30
Marc Delisle
caa98445d8 conform to relational terminology regarding columns and rows 2010-05-31 14:33:21 -04:00
Michal Čihař
c6a28b42e6 Single place to define PDF schema form. 2010-05-31 14:05:41 +02:00
Marc Delisle
d18a3eb3c0 Merge branch 'QA_3_3' 2010-05-30 08:44:33 -04:00
Marc Delisle
cfcec687fa bug #2986383 Not all data being shown / counted 2010-05-30 08:43:41 -04:00
Marc Delisle
024120107c removed code that was adding all fields, even untouched ones, in the UPDATE statement 2010-05-29 07:45:56 -04:00
ninadsp
bd139f2465 document.write() conflicts with jQuery.
Instead, appending Inline Edit to parent div (class="tools") with
$.append(), the recommended method.
$('body').append() is executed late, and hence, not used.
2010-05-29 01:44:51 +05:30
ninadsp
d5b50587e7 Revert "document.write conflicts with jQuery. Use $(body).append() instead at"
This reverts commit 20fce4cdcd.
2010-05-29 01:40:05 +05:30
ninadsp
20fce4cdcd document.write conflicts with jQuery. Use $(body).append() instead at
the same place to inject inline HTML with JavaScript.
2010-05-29 01:28:57 +05:30
ninadsp
6276ad45a6 Suppress the output if in an Ajax request 2010-05-28 13:05:04 +05:30
Dieter Adriaenssens
c676b181a5 cleanup (re)moved files 2010-05-26 21:24:26 +02:00
ninadsp
5ab3a60612 Header and Footr output is suppressed if it is an Ajax request 2010-05-26 11:38:58 +05:30
Dieter Adriaenssens
9c6e8bc186 Update library PHPExcel to version 1.7.3 2010-05-25 22:10:48 +02:00
Michal Čihař
f8d0e57a3d Can not use text as index here.
We already get translated string.
2010-05-25 16:56:29 +02:00
Michal Čihař
94b9b5e705 Fixup transformations generator. 2010-05-25 14:38:30 +02:00
Michal Čihař
f36bd4a641 Readd privdesc messages. 2010-05-25 13:21:21 +02:00