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 |
|
Edgaras
|
620c6e6db7
|
Fix typo
|
2012-09-25 17:40:40 +03:00 |
|
Marc Delisle
|
43fb11a842
|
Merge branch 'QA_3_5'
|
2012-09-25 04:11:48 -04:00 |
|
Marc Delisle
|
d2d77de352
|
Merge branch 'MAINT_3_5_3' into QA_3_5
|
2012-09-25 04:11:08 -04:00 |
|
Marc Delisle
|
1868a29868
|
Fix problem with js compressor, thanks to Atul and Michal
|
2012-09-25 04:09:29 -04:00 |
|
Madhura Jayaratne
|
569c5474cb
|
Fix typo
|
2012-09-25 06:36:22 +05:30 |
|
Michal Čihař
|
050800d3c9
|
Fix typo
|
2012-09-24 20:12:18 +02:00 |
|
Madhura Jayaratne
|
48354457a8
|
Merge branch 'QA_3_5'
|
2012-09-24 22:02:18 +05:30 |
|
Madhura Jayaratne
|
50abc1cbb3
|
bug #3569577 [edit] Add routine parameter headers not valid for "function"
|
2012-09-24 21:56:17 +05:30 |
|
Madhura Jayaratne
|
3fe7816596
|
bug #3570212 [edit] uuid_short() is a no-arguments function
|
2012-09-24 21:39:39 +05:30 |
|
Michal Čihař
|
05e21a0762
|
Fix typo
|
2012-09-24 17:21:14 +02:00 |
|
Michal Čihař
|
74ab4addba
|
Properly escape quotes
|
2012-09-24 16:12:35 +02:00 |
|
Michal Čihař
|
f093153c01
|
Add missing ;
|
2012-09-24 14:21:54 +02:00 |
|
Michal Čihař
|
e64d4c09fb
|
Drop not used function
|
2012-09-24 14:20:55 +02:00 |
|
Michal Čihař
|
6783226bbf
|
Remove not used variables
|
2012-09-24 14:20:55 +02:00 |
|
Michal Čihař
|
2e902574ac
|
Add verbose mode to yui compressor
|
2012-09-24 14:20:55 +02:00 |
|
Marc Delisle
|
e46884a15a
|
Fix merge conflicts
|
2012-09-24 07:19:11 -04:00 |
|
Marc Delisle
|
25e8815f36
|
Merge branch 'QA_3_5'
|
2012-09-24 07:18:33 -04:00 |
|
Marc Delisle
|
2caf953171
|
3.5.4-dev
|
2012-09-24 07:17:20 -04:00 |
|
Marc Delisle
|
f411272936
|
Merge branch 'MAINT_3_5_3' into QA_3_5
|
2012-09-24 07:15:45 -04:00 |
|
Marc Delisle
|
def0d618d7
|
3.5.3-rc1
|
2012-09-24 07:13:44 -04:00 |
|
Michal Čihař
|
d67b3ee301
|
Use double quotes here
|
2012-09-24 12:27:15 +02:00 |
|
Michal Čihař
|
aa2477817d
|
Fix typo
|
2012-09-24 12:26:47 +02:00 |
|
