Commit Graph

15514 Commits

Author SHA1 Message Date
ninadsp
fdd8b51b00 Trying to resolve a merge. 2010-07-07 18:32:41 +05:30
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
4f1c348074 Added an id to the edit users form so that the check all/uncheck all
calls to setCheckboxes() will work.
2010-07-04 01:50:11 +05:30
ninadsp
224fdfd286 Hide query box on retrieving results. Ajaxified results table sorting. 2010-07-04 01:12:00 +05:30
ninadsp
99eff08c0c Added a string for sql.js 2010-07-03 21:53:07 +05:30
ninadsp
e049c1d158 Merge remote branch 'origin/master'
Conflicts:
	po/fr.po
	po/sl.po
2010-07-03 21:00:08 +05:30
Marc Delisle
3e9e18aebb regenerate .po files 2010-07-03 09:01:25 -04:00
ninadsp
4f3b8b96ae If in an ajax query, we need to show the query and the time taken to process the query. Added code to get this working 2010-07-03 02:52:09 +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
43e41e0654 document MemoryLimit as being a string value 2010-07-02 12:28:44 -04:00
Marc Delisle
6ea9467949 bug #3024344 [setup] Setup forces numeric MemoryLimit 2010-07-02 12:26:54 -04:00
Marc Delisle
dbd813095a Merge branch 'QA_3_3' 2010-07-02 11:23:11 -04:00
Marc Delisle
1db012abc8 clarify code behavior 2010-07-02 11:22:36 -04:00
ninadsp
379d392b3f Added a string for db_search.js 2010-07-02 03:38:56 +05:30
ninadsp
034e189bcb Added a basic script to retrieve db search results via ajax 2010-07-02 03:35:30 +05:30
ninadsp
4767612d3c Added a division to include the search results in, suppressed some
output in an ajax request.
2010-07-02 03:34:44 +05:30
Marc Delisle
7d4c3174f7 Translation update done using Pootle. 2010-07-01 19:56:35 +02:00
Marc Delisle
f96cc039b1 Translation update done using Pootle. 2010-07-01 19:56:00 +02:00
Marc Delisle
ae476e8319 Translation update done using Pootle. 2010-07-01 19:55:05 +02:00
Marc Delisle
1c3e7d756a Translation update done using Pootle. 2010-07-01 19:54:48 +02:00
Marc Delisle
7671d89bc3 Translation update done using Pootle. 2010-07-01 19:54:18 +02:00
Marc Delisle
1074c56408 Translation update done using Pootle. 2010-07-01 19:53:56 +02:00
Marc Delisle
7b5ba3ae32 Translation update done using Pootle. 2010-07-01 19:53:42 +02:00
Marc Delisle
e96b2c396c Translation update done using Pootle. 2010-07-01 19:53:00 +02:00
Marc Delisle
2490394c0e Translation update done using Pootle. 2010-07-01 19:52:48 +02:00
Marc Delisle
0a701be61f Translation update done using Pootle. 2010-07-01 19:52:24 +02:00
Marc Delisle
762e68a226 Translation update done using Pootle. 2010-07-01 19:52:04 +02:00
Marc Delisle
29bbd03831 Translation update done using Pootle. 2010-07-01 19:51:42 +02:00
Marc Delisle
f74bd00d67 Translation update done using Pootle. 2010-07-01 19:51:05 +02:00
Marc Delisle
07429d9a0a Translation update done using Pootle. 2010-07-01 19:50:48 +02:00
Marc Delisle
a099f9c459 Translation update done using Pootle. 2010-07-01 19:50:36 +02:00
Marc Delisle
ec6023e71b Translation update done using Pootle. 2010-07-01 19:50:31 +02:00
Marc Delisle
1e74e685ca Translation update done using Pootle. 2010-07-01 19:50:25 +02:00
Marc Delisle
6f21637bfb Translation update done using Pootle. 2010-07-01 19:50:22 +02:00
Marc Delisle
b72eecf32c Translation update done using Pootle. 2010-07-01 19:50:18 +02:00
Marc Delisle
9c108969f8 Translation update done using Pootle. 2010-07-01 19:50:14 +02:00
Marc Delisle
4d7b217e13 Translation update done using Pootle. 2010-07-01 19:50:11 +02:00
Marc Delisle
7ad8f7d8d9 Translation update done using Pootle. 2010-07-01 19:50:07 +02:00
Marc Delisle
fff3db6335 Translation update done using Pootle. 2010-07-01 19:50:03 +02:00
Marc Delisle
837e537ff4 Translation update done using Pootle. 2010-07-01 19:49:59 +02:00
Marc Delisle
452a5e6f4a Translation update done using Pootle. 2010-07-01 19:49:56 +02:00
Marc Delisle
a38c1805d8 Translation update done using Pootle. 2010-07-01 19:49:51 +02:00
Marc Delisle
67a4bb47c5 Translation update done using Pootle. 2010-07-01 19:49:48 +02:00
Marc Delisle
dcdad95973 Translation update done using Pootle. 2010-07-01 19:49:44 +02:00
Marc Delisle
ba28f0c43c Translation update done using Pootle. 2010-07-01 19:49:40 +02:00
Marc Delisle
73768210ea Translation update done using Pootle. 2010-07-01 19:49:36 +02:00
Marc Delisle
6e067a617e Translation update done using Pootle. 2010-07-01 19:49:32 +02:00
Marc Delisle
8fcb1e61b5 Translation update done using Pootle. 2010-07-01 19:49:28 +02:00
Marc Delisle
5c77e6dd5f Translation update done using Pootle. 2010-07-01 19:49:24 +02:00