Commit Graph

79240 Commits

Author SHA1 Message Date
Dieter Adriaenssens
e5d1c6a240 Merge pull request #95 from nhodges/patch-1
Update libraries/display_import.lib.php
2012-10-11 08:39:30 -07:00
Nuri Hodges
54c3d4d18c Update libraries/display_import.lib.php
Grammar syntax correction.
2012-10-10 18:51:03 -07:00
Chanaka Indrajith
26852195c4 Remove unnecessary character 2012-10-10 22:41:12 +05:30
J.M
853d6dc263 Update status of checkall checkbox in server privileges after dropping or adding a user 2012-10-09 22:00:23 +02:00
Chanaka Indrajith
1668c3c89f Fix some code violations 2012-10-09 23:01:03 +05:30
Chanaka Indrajith
15d8495df7 Add LIKE-wildcard operator to number search operators 2012-10-09 22:05:11 +05:30
Marc Delisle
1a10305090 Merge branch 'QA_3_5' 2012-10-08 11:16:43 -04:00
Marc Delisle
5e3ebd0fd7 3.5.3 release 2012-10-08 11:16:28 -04:00
Marc Delisle
511bf24dfa Merge branch 'MAINT_3_5_3' into QA_3_5 2012-10-08 11:15:51 -04:00
Marc Delisle
a65a9721a9 3.5.3 release 2012-10-08 11:15:22 -04:00
Marc Delisle
aee2ab3dbd Remove author names 2012-10-08 10:10:07 -04:00
Marc Delisle
7f0526a975 Typos 2012-10-08 10:01:46 -04:00
Marc Delisle
996232b21a bug #3563799 [interface] Grid editing destroying huge amount of data 2012-10-08 09:58:23 -04:00
Nuno Ferreira
96c103fa49 Translated using Weblate. 2012-10-08 09:19:06 +02:00
Madhura Jayaratne
266227903b Merge branch 'QA_3_5'
Conflicts:
	po/lt.po
	po/pt.po
	po/pt_BR.po
2012-10-04 21:47:18 +05:30
Madhura Jayaratne
f795458f89 Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 2012-10-04 21:44:14 +05:30
Madhura Jayaratne
5bfdc6dd38 Merge branch 'MAINT_3_5_3' into QA_3_5 2012-10-04 21:42:49 +05:30
Madhura Jayaratne
6ea8fad3f9 triggers, routines, events : escape drop sql 2012-10-04 21:41:22 +05:30
Weblate
2bdd1b7192 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-10-03 20:49:47 +02:00
Sergio Martins
fc266c2437 Translated using Weblate. 2012-10-03 20:49:44 +02:00
Sergio Martins
fb6ac5ac15 Translated using Weblate. 2012-10-03 20:49:41 +02:00
Edgaras Janušauskas
1c35e1d890 Translated using Weblate. 2012-10-03 20:49:39 +02:00
Dieter Adriaenssens
97f8db7086 Merge branch 'QA_3_5'
Conflicts:
	libraries/rte/rte_events.lib.php
	libraries/rte/rte_routines.lib.php
	libraries/rte/rte_triggers.lib.php
	po/ru.po
2012-10-03 20:44:59 +02:00
Dieter Adriaenssens
b27785affb Merge branch 'MAINT_3_5_3' into QA_3_5 2012-10-03 20:23:07 +02:00
Dieter Adriaenssens
cfd688d251 triggers, routines, events : escape sql queries in error messages 2012-10-03 20:22:25 +02:00
Madhura Jayaratne
2ec2ba304c Improve doc blocks. Fix method names 2012-10-03 21:42:08 +05:30
Weblate
ba9b500fe9 Merge remote-tracking branch 'origin/master' 2012-10-03 12:08:35 +02:00
kaewan shamsaddin
35ee73adc8 Translated using Weblate. 2012-10-03 12:08:31 +02:00
Chanaka Indrajith
e6afd60299 Call to undefined function backquote() 2012-10-03 06:08:09 -04:00
Weblate
a7b4b69d40 Merge remote-tracking branch 'origin/master' 2012-10-02 02:35:53 +02:00
Victor Volkov
cf7c51edf9 Translated using Weblate. 2012-10-02 02:35:50 +02:00
Sergio Martins
26faa4414a Translated using Weblate. 2012-10-02 02:35:48 +02:00
Sergio Martins
efb4ce5622 Translated using Weblate. 2012-10-02 02:35:43 +02:00
Madhura Jayaratne
3dc8b3fe34 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-10-02 06:05:08 +05:30
Victor Volkov
1b399f958a Translated using Weblate. 2012-09-29 15:19:51 +02:00
Victor Volkov
d5380e81c9 Translated using Weblate. 2012-09-29 15:17:35 +02:00
Madhura Jayaratne
f4d9301ea8 Doc block fix 2012-09-27 06:35:05 +05:30
Madhura Jayaratne
10d426e91d Remove extra new lines 2012-09-27 06:31:46 +05:30
Madhura Jayaratne
bc5de586c6 Doc block improvements (mostly specifying return types) 2012-09-26 22:55:04 +05:30
Madhura Jayaratne
2a281df2d8 Wrap some long lines 2012-09-26 22:18:39 +05:30
Madhura Jayaratne
e08ba66aa9 clean php javascript mix 2012-09-26 22:05:20 +05:30
Madhura Jayaratne
117962762f Remove html php mix 2012-09-26 21:50:56 +05:30
Madhura Jayaratne
f475ef27d4 Fix doc comment 2012-09-26 21:25:00 +05:30
Madhura Jayaratne
12224e2663 Remove some extraneous new lines 2012-09-26 21:11:59 +05:30
Weblate
43fde053c9 Merge remote-tracking branch 'origin/master' 2012-09-25 20:36:38 +02:00
Edgaras Janušauskas
d8fc7ab697 Translated using Weblate. 2012-09-25 20:36:34 +02:00
Michal Čihař
f53757c985 Merge pull request #93 from garas/PMA_fixes
Missing variable
2012-09-25 11:36:12 -07:00
Michal Čihař
b6a7833c23 Merge pull request #92 from garas/620c6e6db7989e7f23cde1350e2dfeb8014e357f
Setup script marks all settings as not overridable
2012-09-25 11:35:19 -07:00
Edgaras Janušauskas
1fbe74ef9b Advisor support for Windows endlines 2012-09-25 21:18:36 +03:00
Edgaras Janušauskas
403bbcd066 Missing variable 2012-09-25 19:33:54 +03:00