Commit Graph

91372 Commits

Author SHA1 Message Date
Marc Delisle
d73ce2f52f Merge commit 'a2fa1aa' 2014-04-10 11:29:24 -04:00
Marc Delisle
b4b0ee5b68 Merge commit '2558b3b' 2014-04-10 11:29:12 -04:00
Weblate
a2fa1aa1ef Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-04-10 17:18:54 +02:00
Michal Čihař
e1acfb1203 Translated using Weblate (Swedish)
Currently translated at 99.8% (2747 of 2750)
2014-04-10 17:18:52 +02:00
Michal Čihař
f17c814361 Translated using Weblate (Korean)
Currently translated at 78.5% (2161 of 2750)
2014-04-10 17:18:49 +02:00
Michal Čihař
e9a01ad655 Translated using Weblate (Indonesian)
Currently translated at 79.9% (2198 of 2750)
2014-04-10 17:18:47 +02:00
Michal Čihař
3a58c1ec70 Translated using Weblate (Hungarian)
Currently translated at 98.0% (2697 of 2750)
2014-04-10 17:18:46 +02:00
Marc Delisle
ac4ca3f3a5 Merge pull request #1132 from ashutoshdhundhara/bug_4359
Bug Fix: #4359 Notices on create table page.
2014-04-10 11:18:44 -04:00
Marc Delisle
5b8f6ba18e Translated using Weblate (French)
Currently translated at 100.0% (2765 of 2765)
2014-04-10 16:48:52 +02:00
Michal Čihař
295e688eaf Try to fix wrong stripping of request variables
- the list of walked array keys can not be static as this can prevent of
  processing of some elements
- we need to flag all processed elements as after reordering they can
  come again
2014-04-10 13:31:55 +02:00
Michal Čihař
a3e05a32ef Add test for double call of PMA_arrayWalkRecursive
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-04-10 13:30:44 +02:00
Michal Čihař
2fa4a0084c Simplify condition for running stripslashes
- get_magic_quotes_gpc is always present in supported PHP versions
- get_magic_quotes_gpc returns false since PHP 5.4.0 where related
  setting has been removed

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-04-10 13:30:44 +02:00
Ashutosh Dhundhara
2558b3b044 Bug Fix: #4359 Notices on create table page.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-04-10 16:13:54 +05:30
Weblate
65e592757c Merge remote-tracking branch 'origin/master' 2014-04-10 12:13:22 +02:00
Kristjan Räts
e2a6cc09aa Translated using Weblate (Estonian)
Currently translated at 100.0% (2765 of 2765)
2014-04-10 12:13:19 +02:00
Marc Delisle
f895eedaa6 Merge commit 'f7c1399' 2014-04-10 06:12:32 -04:00
Marc Delisle
9115548f00 Merge commit 'abe4702' 2014-04-10 06:12:01 -04:00
Marc Delisle
8827ef7c76 Merge commit 'b1cc09c' 2014-04-10 06:11:47 -04:00
Marc Delisle
05912b5c2c Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-04-10 06:11:24 -04:00
Marc Delisle
4a2454c3bd Merge commit 'e1de0e9' 2014-04-10 06:10:06 -04:00
Marc Delisle
f7c1399fee Merge branch 'QA_4_1' of https://github.com/phpmyadmin/phpmyadmin into QA_4_1 2014-04-10 06:09:12 -04:00
Marc Delisle
abe4702d87 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-04-10 06:08:52 -04:00
Marc Delisle
4e363fc47f ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-04-10 06:05:45 -04:00
Weblate
b1cc09c16a Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-04-10 12:03:54 +02:00
Giovanni Sora
6dcf2c9355 Translated using Weblate (Interlingua)
Currently translated at 43.4% (1194 of 2750)
2014-04-10 12:03:51 +02:00
Marc Delisle
cf5452afbc Merge pull request #1131 from smita786/QA_4_1
bugfix 4346: if execTimeLimit is set to zero then export timeout won't
2014-04-10 06:03:48 -04:00
Dieter Adriaenssens
47fc00dcb0 Translated using Weblate (Dutch)
Currently translated at 100.0% (2765 of 2765)
2014-04-10 11:10:03 +02:00
Michal Čihař
57565beb1c Translated using Weblate (Czech)
Currently translated at 100.0% (2765 of 2765)
2014-04-10 09:41:56 +02:00
Panagiotis Papazoglou
9d00abbe5c Translated using Weblate (Greek)
Currently translated at 100.0% (2765 of 2765)
2014-04-10 08:40:33 +02:00
Kristjan Räts
c891637f7c Translated using Weblate (Estonian)
Currently translated at 100.0% (2765 of 2765)
2014-04-10 07:42:00 +02:00
Domen
182e0c143e Translated using Weblate (Slovenian)
Currently translated at 100.0% (2765 of 2765)
2014-04-10 01:36:05 +02:00
Matías Bellone
f2fbf57af2 Translated using Weblate (Spanish)
Currently translated at 100.0% (2765 of 2765)
2014-04-09 22:51:05 +02:00
Burak Yavuz
b027ddc324 Translated using Weblate (Turkish)
Currently translated at 100.0% (2765 of 2765)
2014-04-09 21:17:53 +02:00
Marc Delisle
b5a25e7f7f Update po files 2014-04-09 15:00:10 -04:00
Marc Delisle
40986c0769 Make message translatable
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-04-09 14:59:45 -04:00
Weblate
8820f84524 Merge remote-tracking branch 'origin/master' 2014-04-09 20:18:39 +02:00
Matías Bellone
e422281660 Translated using Weblate (Spanish)
Currently translated at 100.0% (2764 of 2764)
2014-04-09 20:18:36 +02:00
Giovanni Sora
6de931e43d Translated using Weblate (Interlingua)
Currently translated at 46.7% (1292 of 2764)
2014-04-09 20:18:34 +02:00
Marc Delisle
4f4f6567db 4.2.0-alpha1 release
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-04-09 14:18:17 -04:00
Smita Kumari
b21c43245d bugfix 4346: if exeTimeLimit is set to zero then export timeout won't occur so need to check for it
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-04-09 22:07:38 +05:30
Burak Yavuz
132c6932a0 Translated using Weblate (Turkish)
Currently translated at 100.0% (2764 of 2764)
2014-04-09 18:09:09 +02:00
Matías Bellone
c68bc37fa4 Translated using Weblate (Spanish)
Currently translated at 100.0% (2764 of 2764)
2014-04-09 17:58:44 +02:00
Marc Delisle
511db69725 Translated using Weblate (French)
Currently translated at 100.0% (2764 of 2764)
2014-04-09 16:56:25 +02:00
Dieter Adriaenssens
5f9eac2aa4 Translated using Weblate (Dutch)
Currently translated at 100.0% (2764 of 2764)
2014-04-09 16:48:14 +02:00
Panagiotis Papazoglou
2a789189d1 Translated using Weblate (Greek)
Currently translated at 100.0% (2764 of 2764)
2014-04-09 16:29:16 +02:00
Marc Delisle
1c2eec253b Update po files 2014-04-09 08:31:40 -04:00
Marc Delisle
9bd40e3c76 Add hints
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-04-09 08:31:12 -04:00
Marc Delisle
ecf13347de Revert to the original message which is better
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-04-09 08:02:38 -04:00
Michal Čihař
4efc9937cb Merge pull request #1130 from WhaleWatching/navigation
Fix test
2014-04-09 07:11:04 +02:00
Edward Cheng
df30698c8e The element Selenium waiting for is under .drop_list, and it was invisible.
Change target container will clear this error.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
2014-04-09 11:08:43 +08:00