Commit Graph

78112 Commits

Author SHA1 Message Date
Michal Čihař
29ea192a81 These look obviously wrong 2012-08-13 07:19:37 +02:00
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
Madhura Jayaratne
d56335691c [security] Properly escape content of tooltips in GIS visualization 2012-08-12 06:40:36 +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
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
Michal Čihař
18b7a27fe0 Fix corrupted file caused by wrong merge 2012-08-10 12:50:50 +02:00
Weblate
c0184e30a0 Merge remote-tracking branch 'origin/master' 2012-08-10 11:06:42 +02:00
Nathan Wu
a45da95415 Translated using Weblate. 2012-08-10 11:06:33 +02:00
Rouslan Placella
65ebb20809 Disable header and footer when showing phpinfo() 2012-08-10 11:05:47 +02:00
Marc Delisle
ee306681d0 Fix for Empty and Drop vulnerabilities on db Structure and Operations, see PMASA-2012-4 2012-08-09 13:13:08 -04:00
Rouslan Placella
50d1a48843 Fix for trigger page vulnerability, see PMASA-2012-4 2012-08-09 13:08:31 -04:00
Rouslan Placella
211f15f296 Dropped dead code 2012-08-09 13:03:42 +02:00
Rouslan Placella
5ed8c9815c Fixed display of table comments in the menu 2012-08-09 10:41:51 +02:00
Rouslan Placella
3a3aa643dd Fixed double confirmation message display on table options form submission 2012-08-09 10:27:21 +02:00
Panagiotis Papazoglou
b7f580e8b5 Translated using Weblate. 2012-08-09 08:45:45 +02:00
Aputsiaq Niels Janussen
4df208ed4c Translated using Weblate. 2012-08-09 08:26:49 +02:00
Weblate
73a884ebbe Merge remote-tracking branch 'origin/master' 2012-08-08 14:10:58 +02:00
Panagiotis Papazoglou
0005bc676c Translated using Weblate. 2012-08-08 14:10:54 +02:00
Michal Čihař
0dc6cbff68 Merge remote-tracking branch 'origin/QA_3_5' 2012-08-08 14:10:06 +02:00
Panagiotis Papazoglou
8431884c8d Translated using Weblate. 2012-08-08 14:01:20 +02:00
Weblate
68f40c2bf7 Merge remote-tracking branch 'origin/master' 2012-08-08 10:12:15 +02:00
Michal Čihař
e9c264aae8 Merge remote-tracking branch 'yasitha/master' 2012-08-08 10:11:13 +02:00
Weblate
00e2bd2d0c Merge remote-tracking branch 'origin/master' 2012-08-08 10:10:43 +02:00
Anusuk Sangubon
8c91c10ceb Translated using Weblate. 2012-08-08 10:10:40 +02:00
Michal Čihař
21210b32be Merge remote-tracking branch 'alex/plugins-and-OOP' 2012-08-08 10:10:21 +02:00