Commit Graph

39585 Commits

Author SHA1 Message Date
Michal Čihař
088e58b023 Configuration of DisableMultiTableMaintenance 2011-06-06 11:21:35 +02:00
Michal Čihař
cefdbde71c The *_cnt variables are gone from parser 2011-06-06 11:15:37 +02:00
Piotr Przybylski
8b47a1dbd4 Remove $mysql_charsets_count and $mysql_collations_count 2011-06-06 00:31:52 +02:00
Piotr Przybylski
610614c95f Removed global variables with array counts in sqlparser.lib.php 2011-06-06 00:25:52 +02:00
Marc Delisle
47528c2048 Document DisableMultiTableMaintenance 2011-06-05 07:02:19 -04:00
Gábor Kövesdán
4294f8ea41 patch #3271804 New DisableMultiTableMaintenance directive 2011-06-05 06:53:34 -04:00
Marc Delisle
1e0cff6161 Merge branch 'QA_3_4' 2011-06-05 06:30:23 -04:00
Jo Michael
7996a36575 patch #3311539 Inline Edit does not escape backslash 2011-06-05 06:29:46 -04:00
Marc Delisle
82823d67fe Merge branch 'QA_3_4' 2011-06-05 06:14:33 -04:00
Marc Delisle
86d3b7e58c bug #3307616 [edit] Inline edit updates multiple duplicate rows 2011-06-05 06:13:11 -04:00
Marc Delisle
a7a2098006 - ChangeLog entry for "AJAX for Add a user in Database privileges
- Fix whitespace inside function calls
2011-06-05 05:40:55 -04:00
Thilanka Kaushalya
b9c0f5b01a Modified the indentation of the sever privileges js 2011-06-05 07:57:52 +05:30
Thilanka Kaushalya
ba71acb32e Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-04 23:14:58 +05:30
Thilanka Kaushalya
48f5745492 Fixed the bug at add user in db ckeck privileges 2011-06-04 23:13:39 +05:30
Marc Delisle
8d07c5bd77 Merge branch 'QA_3_4' 2011-06-04 06:39:24 -04:00
Marc Delisle
60089624dd bug #3304544 [parser] master is not a reserved word 2011-06-04 06:39:09 -04:00
Marc Delisle
8ae25cd89a Merge branch 'QA_3_4' 2011-06-04 05:59:55 -04:00
Yuichiro
2bdfe06982 patch #3304473 [setup] Redefine a lable that was wrong 2011-06-04 05:59:34 -04:00
Madhura Jayaratne
75091e52fd Merge branch 'QA_3_4'
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/ml.po
	po/mn.po
	po/ms.po
	po/nb.po
	po/nl.po
	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/ug.po
	po/uk.po
	po/ur.po
	po/uz.po
	po/uz@latin.po
	po/zh_CN.po
	po/zh_TW.po
2011-06-04 00:36:51 +05:30
Madhura Jayaratne
612f8f3d67 Partial fix for bug #3291306 - Inline edit does not honor bit fields. Works with mysqli extension. 2011-06-04 00:02:11 +05:30
Thilanka Kaushalya
67b67faa71 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-03 22:50:39 +05:30
Thilanka Kaushalya
65c8851e03 Bug fixed on header warning 2011-06-03 22:48:18 +05:30
Marc Delisle
c16138f9fd bug #3311170 [sync] Missing helper icons in Synchronize 2011-06-03 13:02:19 -04:00
Marc Delisle
ab1a2394c3 bug #3311170 [sync] Missing helper icons in Synchronize 2011-06-03 13:00:56 -04:00
Michal Čihař
c6493e39d3 Remove not used code 2011-06-03 15:42:18 +02:00
Michal Čihař
8f54092c2d Remove forgotten references to $charset 2011-06-03 15:41:59 +02:00
Michal Čihař
0841fce11a Another use of $charset 2011-06-03 15:38:02 +02:00
Michal Čihař
15ef12542e Merge branch 'MAINT_3_4_2' into QA_3_4 2011-06-03 15:14:31 +02:00
Michal Čihař
b8c45c434a Update from master 2011-06-03 15:14:22 +02:00
Michal Čihař
3a87a1b447 Fix format string 2011-06-03 15:13:29 +02:00
Martin Lacina
c52e109f5d Translation update done using Pootle. 2011-06-03 14:53:21 +02:00
Martin Lacina
d8c8ca9446 Translation update done using Pootle. 2011-06-03 14:51:09 +02:00
Martin Lacina
8365485105 Translation update done using Pootle. 2011-06-03 14:48:45 +02:00
Martin Lacina
1f65a057fa Translation update done using Pootle. 2011-06-03 14:47:15 +02:00
Martin Lacina
4398f59495 Translation update done using Pootle. 2011-06-03 14:46:45 +02:00
Martin Lacina
c1c8f49490 Translation update done using Pootle. 2011-06-03 14:45:55 +02:00
Martin Lacina
8f30ff2013 Translation update done using Pootle. 2011-06-03 14:45:22 +02:00
Martin Lacina
76fbe5ce54 Translation update done using Pootle. 2011-06-03 14:44:57 +02:00
Martin Lacina
2b52b31099 Translation update done using Pootle. 2011-06-03 14:44:03 +02:00
Martin Lacina
5506eb1dc6 Translation update done using Pootle. 2011-06-03 14:43:04 +02:00
Michal Čihař
bbbf2c49ed Drop $GLOBALS['charset'].
It was anyway always set to utf-8 so it does not make sense to keep it
as a variable.
2011-06-03 14:04:29 +02:00
Michal Čihař
4841ee9d5f Use standard mechanism for loading javascript to prevent multiple requests to server 2011-06-03 13:32:53 +02:00
Michal Čihař
7bda45ba66 Czech translation update 2011-06-03 11:59:28 +02:00
Michal Čihař
bbe878d703 Merge remote-tracking branch 'origin/QA_3_4' 2011-06-03 10:41:30 +02:00
Michal Čihař
3f214f9e7d Merge remote-tracking branch 'origin/MAINT_3_4_2' into QA_3_4 2011-06-03 10:39:55 +02:00
Michal Čihař
e1569f10ba Merge remote-tracking branch 'pootle/master' 2011-06-03 10:36:15 +02:00
Michal Čihař
afa8f310ee Apply CSS fixes from pmahomme to original theme as well 2011-06-03 10:07:55 +02:00
kiange
8730d37e81 Translation update done using Pootle. 2011-06-03 09:09:55 +02:00
kiange
c50ef83cad Translation update done using Pootle. 2011-06-03 09:09:40 +02:00
kiange
b835a5752e Translation update done using Pootle. 2011-06-03 09:09:13 +02:00