nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,514 Commits 1 Branch 0 Tags
fdd8b51b005dc189f0882c8daef79bab0161cb4a
Commit Graph

3740 Commits

Author SHA1 Message Date
ninadsp
47142291a1 Merge remote branch 'origin/master' 
Conflicts:
	po/af.po
	po/ar.po
	po/az.po
	po/be.po
	po/be@latin.po
	po/bg.po
	po/bn.po
	po/bs.po
	po/ca.po
	po/cs.po
	po/cy.po
	po/da.po
	po/de.po
	po/el.po
	po/en_GB.po
	po/es.po
	po/et.po
	po/eu.po
	po/fa.po
	po/fi.po
	po/fr.po
	po/gl.po
	po/he.po
	po/hi.po
	po/hr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/ka.po
	po/ko.po
	po/lt.po
	po/lv.po
	po/mk.po
	po/mn.po
	po/ms.po
	po/nb.po
	po/nl.po
	po/phpmyadmin.pot
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ro.po
	po/ru.po
	po/si.po
	po/sk.po
	po/sl.po
	po/sq.po
	po/sr.po
	po/sr@latin.po
	po/sv.po
	po/ta.po
	po/te.po
	po/th.po
	po/tr.po
	po/tt.po
	po/uk.po
	po/ur.po
	po/uz.po
	po/uz@latin.po
	po/zh_CN.po
	po/zh_TW.po
 2010-07-07 18:31:09 +05:30
ninadsp
e049c1d158 Merge remote branch 'origin/master' 
Conflicts:
	po/fr.po
	po/sl.po
 2010-07-03 21:00:08 +05:30
ninadsp
6e9e3836e5 We don't need to buffer the output in PMA_showMessage() when making an SQL query. Added a global variable which is set in sql.php during an ajax request. 2010-07-03 02:51:02 +05:30
Marc Delisle
9e857f9f84 fix merge conflicts 2010-07-02 12:32:00 -04:00
Marc Delisle
6ea9467949 bug #3024344 [setup] Setup forces numeric MemoryLimit 2010-07-02 12:26:54 -04:00
Marc Delisle
01d6fed4e2 fix merge conflicts 2010-06-30 11:37:53 -04:00
Marc Delisle
108f3305e9 bug: avoid loading twice a js file 2010-06-30 11:35:46 -04:00
ninadsp
466d3f7ae5 Discarded the unused PMA_ajaxOutputBuffelHandler() function. 2010-06-30 21:00:45 +05:30
ninadsp
bcbf327139 Merge remote branch 'origin/master' 2010-06-29 23:54:01 +05:30
Marc Delisle
116d1297af solve merge conflicts 2010-06-29 08:23:47 -04:00
Marc Delisle
852ed51c27 bug [replication] Do not offer information_schema in the list of databases 2010-06-29 08:14:31 -04:00
Marc Delisle
f368184a12 fix typo; remove Id 2010-06-29 07:57:45 -04:00
Marc Delisle
90ac3d39a0 bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible 2010-06-29 07:56:10 -04:00
Marc Delisle
f463b1cc7a bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible 2010-06-29 07:48:28 -04:00
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