Michal Čihař
|
46bfb2598e
|
Merge remote-tracking branch 'origin/QA_3_5'
|
2012-08-13 14:22:49 +02:00 |
|
shanyan baishui
|
30ed38d00c
|
Translated using Weblate.
|
2012-08-13 14:22:25 +02:00 |
|
Weblate
|
5473bfc91f
|
Merge remote-tracking branch 'origin/master'
|
2012-08-13 14:17:22 +02:00 |
|
shanyan baishui
|
cabc50d872
|
Translated using Weblate.
|
2012-08-13 14:17:18 +02:00 |
|
Michal Čihař
|
aa3071a95d
|
Saner color for error messages (and consistent with default theme)
|
2012-08-13 14:17:06 +02:00 |
|
Marc Delisle
|
bb98205389
|
Fix merge conflicts for security patch
|
2012-08-13 07:51:35 -04:00 |
|
Michal Čihař
|
2df005b9e5
|
Merge remote-tracking branch 'alex/plugins-and-OOP'
|
2012-08-13 11:47:08 +02:00 |
|
Michal Čihař
|
2eeddb7c5f
|
Merge remote-tracking branch 'yasitha/master'
|
2012-08-13 11:46:49 +02:00 |
|
Weblate
|
c1a70c49bf
|
Merge remote-tracking branch 'origin/master'
|
2012-08-13 11:44:54 +02:00 |
|
shanyan baishui
|
bd18f6fb26
|
Translated using Weblate.
|
2012-08-13 11:44:51 +02:00 |
|
Michal Čihař
|
a8c9bded2f
|
Merge remote-tracking branch 'chanaka/master'
|
2012-08-13 11:43:56 +02:00 |
|
Alex Marin
|
8ebbab0c30
|
oop: fix getTableDefStandIn for ExportSql
|
2012-08-13 09:42:22 +03:00 |
|
Alex Marin
|
c26356e9ca
|
oop: fix properties object in plugin_interface
|
2012-08-13 09:36:29 +03:00 |
|
Michal Čihař
|
29ea192a81
|
These look obviously wrong
|
2012-08-13 07:19:37 +02:00 |
|
Chanaka Indrajith
|
054fab3ffe
|
Merge remote branch 'upstream/master'
|
2012-08-12 23:57:17 +05:30 |
|
Chanaka Indrajith
|
fde2a58bab
|
Improve some tests for functions in PMA_DisplayResults class
|
2012-08-12 23:56:31 +05:30 |
|
Marc Delisle
|
7bf3fe03a4
|
Merge branch 'QA_3_5'
|
2012-08-12 09:26:11 -04:00 |
|
Marc Delisle
|
9ca1bee3c2
|
Fix merge conflicts
|
2012-08-12 09:25:37 -04:00 |
|
Marc Delisle
|
5289a032ce
|
3.5.2.2 release
|
2012-08-12 09:22:10 -04:00 |
|
Marc Delisle
|
6c73243bb0
|
Merge remote branch 'security/MAINT_3_5_2-security' into MAINT_3_5_2
|
2012-08-12 09:19:16 -04:00 |
|
Marc Delisle
|
dde8fc471d
|
Merge branch 'QA_3_5'
|
2012-08-12 09:18:04 -04:00 |
|
Marc Delisle
|
cdf9bf3b83
|
Merge branch 'MAINT_3_5_2' into QA_3_5
|
2012-08-12 09:17:19 -04:00 |
|
Marc Delisle
|
6f200703a3
|
Fix merge conflicts
|
2012-08-12 09:17:02 -04:00 |
|
Marc Delisle
|
46819b311c
|
Merge branch 'QA_3_4' into MAINT_3_5_2
|
2012-08-12 09:15:38 -04:00 |
|
Marc Delisle
|
cc97d82fd1
|
3.4.11.1 release
|
2012-08-12 09:14:23 -04:00 |
|
Dieter Adriaenssens
|
e094f34bed
|
[security] properly escape name of newly created table, see PMASA-2012-4
|
2012-08-12 13:52:46 +02:00 |
|
Marc Delisle
|
d84b98d340
|
Fix for Empty and Drop vulnerabilities on db Structure and Operations, see PMASA-2012-4
|
2012-08-12 13:48:59 +02:00 |
|
Chanaka Indrajith
|
20b196daf5
|
Fixed some code violations in PMA_DisplayResults class
|
2012-08-12 10:10:14 +05:30 |
|
Madhura Jayaratne
|
d56335691c
|
[security] Properly escape content of tooltips in GIS visualization
|
2012-08-12 06:40:36 +05:30 |
|
Chanaka Indrajith
|
54dfe9eb0f
|
Merge remote branch 'upstream/master'
|
2012-08-11 23:36:54 +05:30 |
|
Chanaka Indrajith
|
62ea33921d
|
Sortable ability for server processlist
|
2012-08-11 23:35:45 +05:30 |
|
Weblate
|
0a9a7e8530
|
Merge remote-tracking branch 'origin/master'
|
2012-08-11 10:07:16 +02:00 |
|
gilberto dos santos alves
|
06430452d7
|
Translated using Weblate.
|
2012-08-11 10:07:13 +02:00 |
|
Ashiyane Digital Security Team
|
6984256915
|
Translated using Weblate.
|
2012-08-11 10:07:11 +02:00 |
|
Madhura Jayaratne
|
b02f8ca018
|
File is being conditionally included; use "include_once" instead
|
2012-08-11 13:36:10 +05:30 |
|
Madhura Jayaratne
|
2d3ae33c9a
|
Fix indentation
|
2012-08-11 13:34:35 +05:30 |
|
Madhura Jayaratne
|
099dee48fd
|
Merge branch 'QA_3_5'
|
2012-08-11 13:33:41 +05:30 |
|
Weblate
|
10ce4259e6
|
Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5
|
2012-08-11 10:02:11 +02:00 |
|
Anusuk Sangubon
|
7444b78a45
|
Translated using Weblate.
|
2012-08-11 10:02:08 +02:00 |
|
Ashiyane Digital Security Team
|
e084583f4e
|
Translated using Weblate.
|
2012-08-11 10:02:04 +02:00 |
|
Nathan Wu
|
4612247ac1
|
Translated using Weblate.
|
2012-08-11 10:01:59 +02:00 |
|
Madhura Jayaratne
|
1228f48c78
|
bug #3555104 [edit] Cannot copy a DB with table & views
|
2012-08-11 13:31:04 +05:30 |
|
Yasitha Pandithawatta
|
ab79c0897d
|
Test class for
|
2012-08-10 23:12:09 +05:30 |
|
Yasitha Pandithawatta
|
1ca8692aba
|
test class for gettext_reader
|
2012-08-10 20:29:48 +05:30 |
|
Rouslan Placella
|
1aec25f5f2
|
[security] properly escape query error message when creating new trigger, see PMASA-2012-4
|
2012-08-10 16:26:11 +02:00 |
|
Dieter Adriaenssens
|
dca22c5046
|
[security] properly escape name of newly created table, see PMASA-2012-4
|
2012-08-10 16:04:54 +02:00 |
|
Michal Čihař
|
c7b04ee165
|
Update po files
|
2012-08-10 13:00:29 +02:00 |
|
Michal Čihař
|
236af3b22c
|
Another no longer translated strings
|
2012-08-10 12:59:49 +02:00 |
|
Michal Čihař
|
1d838cce9b
|
Whitespace cleanup
|
2012-08-10 12:58:18 +02:00 |
|
Michal Čihař
|
7784587ea1
|
Make action names translatable
|
2012-08-10 12:58:10 +02:00 |
|
