Commit Graph

77272 Commits

Author SHA1 Message Date
Michal Čihař
a0bc94c2b2 Merge remote-tracking branch 'origin/master' 2012-07-07 15:25:13 +02:00
Marcelo Altmann
062e1ebe62 Translated using Weblate. 2012-07-07 15:25:12 +02:00
Ashiyane Digital Security Team
3f530b4103 Translated using Weblate. 2012-07-07 15:25:12 +02:00
Nicholas Arnesen
296ec835d0 Translated using Weblate. 2012-07-07 15:25:11 +02:00
Hunar kirkuk
d1ac4e958a Translated using Weblate. 2012-07-07 15:25:11 +02:00
Aputsiaq Niels Janussen
cadbc5ec56 Translated using Weblate. 2012-07-07 15:25:10 +02:00
Xavier Navarro
5438136521 Translated using Weblate. 2012-07-07 15:25:09 +02:00
Marc Delisle
676715b7f2 Merge branch 'QA_3_5' 2012-07-07 09:23:08 -04:00
Marc Delisle
3ecfb9f36a 3.5.2 release 2012-07-07 09:22:22 -04:00
Marc Delisle
b7b5f75ea5 Merge branch 'MAINT_3_5_2' into QA_3_5 2012-07-07 09:21:46 -04:00
Marc Delisle
c03538c1ed 3.5.2 release 2012-07-07 09:09:51 -04:00
Antón Méixome
8107ead4b7 Translated using Weblate. 2012-07-06 02:49:02 +02:00
Michal Čihař
15ab6eea39 Merge remote-tracking branch 'origin/master' 2012-07-04 17:25:32 +02:00
Marc Delisle
0c9effac86 Missing global variables for additional criteria lines 2012-07-04 11:25:14 -04:00
Michal Čihař
9a94bf19a8 Merge remote-tracking branch 'origin/master' 2012-07-04 17:07:18 +02:00
Marc Delisle
5223035aeb Missing global variables 2012-07-04 11:07:01 -04:00
Michal Čihař
0d0b72e558 Merge remote-tracking branch 'origin/master' 2012-07-04 16:10:47 +02:00
Marcelo Altmann
391da535df Translated using Weblate. 2012-07-04 16:10:46 +02:00
Ashiyane Digital Security Team
356d4aacf8 Translated using Weblate. 2012-07-04 16:10:46 +02:00
Nicholas Arnesen
5c07a3876c Translated using Weblate. 2012-07-04 16:10:44 +02:00
Marc Delisle
75e283ab9c Merge commit '7a87b4df33301107c62a01ecb7ea73774381cd7f' 2012-07-04 10:09:27 -04:00
Ashiyane Digital Security Team
4cac418d17 Translated using Weblate. 2012-07-04 11:22:17 +02:00
Ashiyane Digital Security Team
0bffc59cb6 Translated using Weblate. 2012-07-04 10:58:57 +02:00
Ashiyane Digital Security Team
1cdf4f802c Translated using Weblate. 2012-07-04 10:50:26 +02:00
Ashiyane Digital Security Team
549b5de9f8 Translated using Weblate. 2012-07-04 09:28:19 +02:00
Michal Čihař
ec127a18cc Merge remote-tracking branch 'origin/master' 2012-07-04 09:16:37 +02:00
Michal Čihař
7a803ea9e0 Merge remote-tracking branch 'origin/master' 2012-07-04 09:16:16 +02:00
Ashiyane Digital Security Team
35a8af4799 Translated using Weblate. 2012-07-04 09:16:15 +02:00
Michal Čihař
fbbc965020 Merge remote-tracking branch 'weblate/master' 2012-07-04 09:16:08 +02:00
Michal Čihař
51775c5aa9 Merge remote-tracking branch 'chanaka/master' 2012-07-04 09:15:23 +02:00
Atul Pratap Singh
7a87b4df33 Merge remote-tracking branch 'upstream/master' 2012-07-04 09:00:16 +05:30
Atul Pratap Singh
0a8dd19414 Use PMA_CommonFunctions in libraries/db_search.lib.php 2012-07-04 08:55:01 +05:30
Michal Čihař
adac02548d Merge remote-tracking branch 'origin/master' 2012-07-04 02:54:01 +02:00
Ashiyane Digital Security Team
7ee2568b9c Translated using Weblate. 2012-07-04 02:54:00 +02:00
Nicholas Arnesen
7ff3160f70 Translated using Weblate. 2012-07-04 02:53:59 +02:00
Aputsiaq Niels Janussen
682adac5e2 Translated using Weblate. 2012-07-04 02:53:55 +02:00
Marc Delisle
312c09dfb2 Merge pull request #78 from alexukf/plugins-and-OOP
fix get extensions for import plugins
2012-07-03 17:53:42 -07:00
Alex Marin
ddb58362f1 Add README for export plugins 2012-07-04 01:30:59 +03:00
Alex Marin
35d2b031f9 Add README for import plugins 2012-07-04 01:05:56 +03:00
Atul Pratap Singh
21eff5b2fc Resolve conlicts in db_search.php 2012-07-04 01:19:37 +05:30
Alex Marin
e591f31f69 fix get extensions for import plugins 2012-07-03 21:28:25 +03:00
Chanaka Indrajith
9009aff1ba Merge remote branch 'upstream/master' 2012-07-03 20:42:36 +05:30
Chanaka Indrajith
1c245c06f3 Test for _getPlacedLinks function in PMA_DisplayResults class 2012-07-03 20:41:13 +05:30
Chanaka Indrajith
d357356e45 Test for _mimeDefaultFunction function in PMA_DisplayResults class 2012-07-03 20:37:47 +05:30
Michal Čihař
00b8ea2172 Merge remote-tracking branch 'origin/QA_3_5' 2012-07-03 16:35:56 +02:00
Michal Čihař
0fe2b92b59 Translated using Weblate. 2012-07-03 16:35:29 +02:00
Ashiyane Digital Security Team
9fb1a9640a Translated using Weblate. 2012-07-03 16:35:28 +02:00
Michal Čihař
d4416967c8 Translated using Weblate. 2012-07-03 16:35:25 +02:00
Michal Čihař
e82a483e80 Translated using Weblate. 2012-07-03 16:35:13 +02:00
Ashiyane Digital Security Team
a14f1befea Translated using Weblate. 2012-07-03 16:35:12 +02:00