Commit Graph

74908 Commits

Author SHA1 Message Date
Marc Delisle
58a3c57e7a Fix merge conflicts 2012-04-18 08:48:28 -04:00
Marc Delisle
3c587da09b bug #3518983 [designer] Error messages do not appear in the Designer 2012-04-18 08:46:01 -04:00
Michal Čihař
9b0e9788aa Update po files 2012-04-18 13:13:54 +02:00
Michal Čihař
241844782f Merge remote-tracking branch 'origin/QA_3_5' 2012-04-18 13:12:45 +02:00
Marcin Kozioł
564bc89d90 Translated using Weblate. 2012-04-18 13:12:17 +02:00
Michal Čihař
bf68c8b809 Merge remote-tracking branch 'origin/master' 2012-04-18 13:10:53 +02:00
Marcin Kozioł
76759270bf Translated using Weblate. 2012-04-18 13:10:49 +02:00
Michal Čihař
16550186a1 Merge pull request #32 from alexukf/features
export mediawiki outputs content and structure
2012-04-18 04:10:44 -07:00
Michal Čihař
0c3a5d38df Merge remote-tracking branch 'origin/QA_3_5' 2012-04-18 10:22:43 +02:00
Marcin Kozioł
91b711b703 Translated using Weblate. 2012-04-18 10:22:03 +02:00
Madhura Jayaratne
37ab09d857 Translated using Weblate. 2012-04-18 10:21:46 +02:00
Marcin Kozioł
6a6cf36044 Translated using Weblate. 2012-04-18 10:21:46 +02:00
Yuichiro Takahashi
efd23fdbfe Translated using Weblate. 2012-04-18 10:21:45 +02:00
Julio Guerra
8698cde4ac Translated using Weblate. 2012-04-18 10:21:44 +02:00
MoA Chung
ae7dc1887d Translated using Weblate. 2012-04-18 10:21:43 +02:00
Michal Čihař
1b4396ca1d Merge remote-tracking branch 'origin/master' 2012-04-17 23:19:06 +02:00
Marc Delisle
c7b4767eb6 Merge pull request #39 from honzap/suhosin_warn
Remove PMA_sanitize from Suhosin warning (escaping is made twice)
2012-04-17 14:18:59 -07:00
Michal Čihař
97357ba3b0 Merge remote-tracking branch 'origin/master' 2012-04-17 23:06:24 +02:00
Madhura Jayaratne
210217f9f6 Translated using Weblate. 2012-04-17 23:06:20 +02:00
Julio Guerra
ed689b1f8b Translated using Weblate. 2012-04-17 23:06:17 +02:00
Marc Delisle
aa86149819 Merge pull request #35 from alexukf/fixes
import-export related fixes
2012-04-17 14:06:12 -07:00
Jan Pecek
085111e988 Remove PMA_sanitize from Suhosin warning (escaping is made twice) 2012-04-17 17:07:06 +02:00
Michal Čihař
f0c8b48e9d Merge remote-tracking branch 'origin/master' 2012-04-17 12:52:54 +02:00
Marc Delisle
033a502e4d No longer depend on grab_globals 2012-04-17 06:52:42 -04:00
Michal Čihař
15d013e6df Merge remote-tracking branch 'origin/master' 2012-04-17 12:42:37 +02:00
Yuichiro Takahashi
d308bec201 Translated using Weblate. 2012-04-17 12:42:32 +02:00
MoA Chung
3b889267e3 Translated using Weblate. 2012-04-17 12:42:28 +02:00
Marc Delisle
0c0e9c3d4d Unused code 2012-04-17 06:42:17 -04:00
Michal Čihař
c8b686577c Move common includes to root files rather than to library (which should not be lodaded separately) (issue #36) 2012-04-17 09:02:29 +02:00
Michal Čihař
e80e5c5b0e Merge remote-tracking branch 'origin/QA_3_5' 2012-04-17 08:38:51 +02:00
Michal Čihař
e7178c0583 Fix format string 2012-04-17 08:38:06 +02:00
Michal Čihař
f36b54a4d4 Merge remote-tracking branch 'origin/QA_3_5' 2012-04-17 08:12:15 +02:00
Julio Guerra
005be332fb Translated using Weblate. 2012-04-17 01:09:12 +02:00
Julio Guerra
0e6a0bfc79 Translated using Weblate. 2012-04-17 00:59:57 +02:00
Michal Čihař
498585a5fe Merge remote-tracking branch 'origin/master' 2012-04-17 00:59:02 +02:00
Madhura Jayaratne
fc3cb28df8 Translated using Weblate. 2012-04-17 00:58:59 +02:00
Julio Guerra
5fe6bc74c9 Translated using Weblate. 2012-04-17 00:58:58 +02:00
Michal Čihař
5d393c9186 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-04-17 00:58:52 +02:00
Madhura Jayaratne
735bc8b0cd Translated using Weblate. 2012-04-17 00:58:49 +02:00
Julio Guerra
4ceb0027ae Translated using Weblate. 2012-04-17 00:58:48 +02:00
Rouslan Placella
ad9fc9df19 Merge branch 'QA_3_5' 2012-04-16 23:58:28 +01:00
Rouslan Placella
eca291ce82 Fixed bug #3518484 - PMA_sqlAddSlashes() does not quote the table names correctly 2012-04-16 23:58:03 +01:00
Julio Guerra
80e3446c1f Translated using Weblate. 2012-04-17 00:10:31 +02:00
Julio Guerra
8ab0f404d1 Translated using Weblate. 2012-04-17 00:10:17 +02:00
Julio Guerra
cbac9b8443 Translated using Weblate. 2012-04-16 23:34:29 +02:00
Julio Guerra
07bf28d93c Translated using Weblate. 2012-04-16 23:34:16 +02:00
Julio Guerra
e6dfcdd4e3 Translated using Weblate. 2012-04-16 23:31:51 +02:00
Julio Guerra
5a2709bec6 Translated using Weblate. 2012-04-16 23:31:34 +02:00
Alex Marin
384e32f92a export mediawiki outputs content and structure 2012-04-16 21:19:59 +03:00
Michal Čihař
331a7ce477 Merge remote-tracking branch 'origin/master' 2012-04-16 19:41:14 +02:00