Commit Graph

108425 Commits

Author SHA1 Message Date
osaid
02125d2fc9 restoring instance after mock object is used
Signed-off-by: osaid <osaid.nasir@gmail.com>
2017-01-06 14:12:44 +05:30
osaid
149916cbda making method non-static 2017-01-05 21:42:48 +05:30
osaid
0f3b55c81a made mock before testing function
Signed-off-by: osaid <osaid.nasir@gmail.com>
2017-01-05 21:08:43 +05:30
osaid
f1863bf6ac calling class method using
Signed-off-by: osaid <osaid.nasir@gmail.com>
2017-01-04 15:21:02 +05:30
osaid
1616ecb79b headerlocation_test inherits from PMATestCase
Signed-off-by: osaid <osaid.nasir@gmail.com>
2017-01-04 10:59:07 +05:30
osaid
2a62427b67 added mockResponse function for sharing code and used it in headerlocationtest Signed-Off-By: Osaid <osaid.nasir@gmail.com> 2017-01-03 22:23:40 +05:30
osaid
eb54c43fb6 Removed PMA_TEST_HEADERS checking as they have been defined 2016-12-24 22:31:38 +05:30
Michal Čihař
b168fc5f58 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-12-23 11:47:02 +01:00
Michal Čihař
cd3723de5d Merge branch 'QA_4_6' 2016-12-23 11:46:52 +01:00
Weblate
9afde5746e Merge remote-tracking branch 'origin/master' 2016-12-23 11:46:46 +01:00
Marco Filipe Ferreira Fidalgo
bafe60c5e2 Translated using Weblate (Portuguese)
Currently translated at 53.1% (1721 of 3239 strings)

[CI skip]
2016-12-23 11:46:45 +01:00
Michal Čihař
9b5547eae0 Do not modify dictionary while iterating
Needed for Python 3 compatibility

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-23 11:46:16 +01:00
Michal Čihař
b4704c0284 Translated using Weblate (Romanian)
Currently translated at 53.2% (1724 of 3239 strings)

[CI skip]
2016-12-22 15:58:47 +01:00
Michal Čihař
bba609050e Translated using Weblate (Romanian)
Currently translated at 53.6% (1729 of 3222 strings)

[CI skip]
2016-12-22 15:58:42 +01:00
Michal Čihař
647abe2681 Merge branch 'QA_4_6' 2016-12-22 15:21:15 +01:00
Weblate
401a18464e Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-12-22 15:15:55 +01:00
Oasisone Doe
671d82f8cc Translated using Weblate (Romanian)
Currently translated at 53.6% (1729 of 3222 strings)

[CI skip]
2016-12-22 15:15:55 +01:00
Daniel Miloca
066b71535f Translated using Weblate (Portuguese (Brazil))
Currently translated at 93.0% (2999 of 3222 strings)

[CI skip]
2016-12-22 15:15:55 +01:00
Giovanni Sora
9ebdb20eb5 Translated using Weblate (Interlingua)
Currently translated at 75.5% (2434 of 3222 strings)

[CI skip]
2016-12-22 15:15:54 +01:00
Weblate
137f42d56f Merge remote-tracking branch 'origin/master' 2016-12-22 15:15:50 +01:00
Oasisone Doe
e1902cb575 Translated using Weblate (Romanian)
Currently translated at 53.2% (1724 of 3239 strings)

[CI skip]
2016-12-22 15:15:50 +01:00
Giovanni Sora
a06ff906da Translated using Weblate (Interlingua)
Currently translated at 75.7% (2452 of 3239 strings)

[CI skip]
2016-12-22 15:15:49 +01:00
Michal Čihař
98ef4de075 Merge branch 'QA_4_6' 2016-12-22 15:15:34 +01:00
Michal Čihař
1fb040a1df Fixed editing of virtual columns
Fixes #12847

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-22 15:15:20 +01:00
Stefano Martinelli
e312264e55 Translated using Weblate (Italian)
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
2016-12-22 10:33:07 +01:00
Domen
fd8b11907c Translated using Weblate (Slovenian)
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
2016-12-22 00:03:27 +01:00
Weblate
830a7b332b Merge remote-tracking branch 'origin/master' 2016-12-21 19:01:17 +01:00
Daniel Miloca
bca84af8bd Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.5% (2999 of 3239 strings)

[CI skip]
2016-12-21 19:01:16 +01:00
Michal Čihař
4befa5c4fc Fix object name
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-21 19:01:01 +01:00
dingo thirteen
abf70b9230 Translated using Weblate (Dutch)
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
2016-12-21 18:44:09 +01:00
Burak Yavuz
6fe9e68e76 Translated using Weblate (Turkish)
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
2016-12-21 17:29:51 +01:00
Michal Čihař
67dd7facc5 Update po files
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-21 17:07:07 +01:00
Michal Čihař
65e245a184 Merge branch 'QA_4_6' 2016-12-21 17:06:42 +01:00
Daniel Miloca
a5f9c0273b Translated using Weblate (Portuguese (Brazil))
Currently translated at 93.0% (2997 of 3222 strings)

[CI skip]
2016-12-21 17:06:16 +01:00
Michal Čihař
a950a5952b Translated using Weblate (German)
Currently translated at 99.5% (3206 of 3222 strings)

[CI skip]
2016-12-21 17:06:15 +01:00
dingo thirteen
2e8c8af9b8 Translated using Weblate (Dutch)
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
2016-12-21 17:06:14 +01:00
Michal Čihař
19ff794893 Translated using Weblate (Czech)
Currently translated at 93.8% (3024 of 3222 strings)

[CI skip]
2016-12-21 17:06:14 +01:00
Michal Čihař
aea2a28974 Make the string look like an error message
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-21 17:05:45 +01:00
Daniel Miloca
700ad1ee88 Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.3% (2992 of 3239 strings)

[CI skip]
2016-12-21 17:05:35 +01:00
Michal Čihař
69be32050a Translated using Weblate (German)
Currently translated at 99.2% (3215 of 3239 strings)

[CI skip]
2016-12-21 17:05:33 +01:00
dingo thirteen
29875ef785 Translated using Weblate (Dutch)
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
2016-12-21 17:05:33 +01:00
Michal Čihař
729a1d423e Translated using Weblate (Czech)
Currently translated at 93.0% (3015 of 3239 strings)

[CI skip]
2016-12-21 17:05:32 +01:00
Lou Master la vida
cd63028042 Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.3% (2990 of 3239 strings)

[CI skip]
2016-12-21 17:01:09 +01:00
Rogerio Marques
8973db0651 Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.9% (2995 of 3222 strings)

[CI skip]
2016-12-21 17:00:58 +01:00
Michal Čihař
3a7cb1072a Update jquery.fullscreen to 1.1.5
Also changed API calls to it.

Issue #12447

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-21 14:47:24 +01:00
Michal Čihař
33f8d3d3f8 Update jQuery Timepicker Addon to 1.6.3
Issue #12447

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-21 14:32:34 +01:00
Michal Čihař
dfb06c4433 Update jQuery Validation Plugin to 1.15.1
Issue #12447

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-21 14:31:03 +01:00
Michal Čihař
1008ed1bbc Update jQuery Mousewheel to 3.1.13
Issue #12447

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-21 14:29:23 +01:00
Michal Čihař
c77d8cff25 Do not use deprecated $.parseJSON
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-21 14:27:39 +01:00
Michal Čihař
5f9ce26268 Add jQuery Migrate to support some older code
Issue #12447

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-21 14:19:37 +01:00