gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,504 Commits 12 Branches 481 Tags 2.4 GiB
90cc1636c0
Commit Graph

110504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
90cc1636c0 Add missing mock 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 09:36:50 +02:00
Michal Čihař
4a83171c30 Merge branch 'QA_4_7' 2017-08-01 09:09:19 +02:00
Michal Čihař
0348c8b36d Merge remote-tracking branch 'origin/QA_4_7' 2017-08-01 09:08:31 +02:00
Michal Čihař
70e9349936 Changelog entry for #13414 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 09:02:25 +02:00
Michal Čihař
738b35b4ec Avoid runkit installation on PHP 7.2 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:54:42 +02:00
Michal Čihař
73181a26c1 Do not manipulate with session settings when running tests 
Those can't be executed on PHP 7.2 after headers have been sent.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:54:42 +02:00
Michal Čihař
76e0e6dbc8 Implement Countable interface in OptionsPropertyGroup 
This is really needed in OptionsPropertyRootGroup, but makes sense here
as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:54:42 +02:00
Michal Čihař
b188c18fb0 Fix mocked return value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:50:26 +02:00
Michal Čihař
fc2ac9f4c6 Hide differences in PHP 7.2 error reporting 
It adds (this will throw an Error in a future version of PHP)
to undefined constant error.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:50:26 +02:00
Michal Čihař
456ec18cb1 Add missing mock 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:50:26 +02:00
Michal Čihař
53613a402c Add missing mock 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:50:26 +02:00
Michal Čihař
f96886a445 Fix check for null 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:50:26 +02:00
Michal Čihař
e85fc1cdff Fix mocked value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:50:26 +02:00
Michal Čihař
4b037582d9 Avoid counting null (default) value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:50:26 +02:00
Michal Čihař
aea00fb90f Add PHP 7.2 to test matrix 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:50:26 +02:00
Weblate
31797657c4 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-07-31 16:36:30 +02:00
Lalu-Ahirwar
76fcbebcc6 Translated using Weblate (Hindi) 
Currently translated at 37.3% (1198 of 3205 strings)

[CI skip]
 2017-07-31 16:36:28 +02:00
Michal Čihař
c146127b73 Merge branch 'QA_4_7' 2017-07-31 16:36:09 +02:00
Michal Čihař
4f1ff6df85 Merge remote-tracking branch 'origin/QA_4_7' 2017-07-31 16:36:07 +02:00
Michal Čihař
f2433304b6 Missing newline in ALTER exports 
Fixes #13523

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-31 16:35:34 +02:00
Michal Čihař
33a545d4b4 Use case insentive comparison 
See #13531 and #13425

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-31 16:16:26 +02:00
Victor Gomez
601ed5db6e Alphabetic sorting of Export dropdown (#13531) 
Made the Export dropdown menu alphabetically sorted, related to this issue https://github.com/phpmyadmin/phpmyadmin/issues/13425

Signed-off-by: Victor Gomez <victor.gomez.spain@gmail.com>
 2017-07-31 15:28:22 +02:00
Michal Čihař
be2d9b7952 Merge pull request #13526 from devenbansod/fix_import_selenium 
Fix Import-related selenium tests
 2017-07-31 15:26:58 +02:00
Weblate
743adb8839 Merge remote-tracking branch 'origin/master' 2017-07-31 15:22:37 +02:00
Lalu-Ahirwar
7d2a8ab84d Translated using Weblate (Hindi) 
Currently translated at 37.1% (1194 of 3213 strings)

[CI skip]
 2017-07-31 15:22:33 +02:00
Michal Čihař
d36dd8a354 Merge pull request #13532 from CommanderRoot/patch-1 
Fix unnecessary escaping of html content
 2017-07-31 15:22:18 +02:00
Spider Linux
e3da40937c Translated using Weblate (Kurdish Sorani) 
Currently translated at 31.0% (995 of 3205 strings)

[CI skip]
 2017-07-30 03:46:08 +02:00
Spider Linux
0bab45855a Translated using Weblate (Kurdish Sorani) 
Currently translated at 30.8% (992 of 3213 strings)

[CI skip]
 2017-07-30 03:46:01 +02:00
Володимир Бриняк
1b71c5ba4b Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-07-29 12:47:36 +02:00
Володимир Бриняк
c919cb9236 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3213 of 3213 strings)

[CI skip]
 2017-07-29 12:47:28 +02:00
Spider Linux
d341e8fa74 Translated using Weblate (Kurdish Sorani) 
Currently translated at 30.8% (991 of 3213 strings)

[CI skip]

Ahmed Wolf
 2017-07-29 01:04:46 +02:00
ssantos
7fb297a292 Translated using Weblate (German) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-07-29 00:45:38 +02:00
ssantos
40b093ac91 Translated using Weblate (German) 
Currently translated at 100.0% (3213 of 3213 strings)

[CI skip]
 2017-07-29 00:45:20 +02:00
CommanderRoot
732c0c6cf2 Fix unnecessary escaping of html content 
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
 2017-07-28 09:03:45 +02:00
ssantos
e57cc96029 Translated using Weblate (German) 
Currently translated at 100.0% (3213 of 3213 strings)

[CI skip]
 2017-07-28 00:21:06 +02:00
anonymous
88e28bbf3c Translated using Weblate (German) 
Currently translated at 99.9% (3212 of 3213 strings)

[CI skip]
 2017-07-28 00:17:58 +02:00
Tobias Groza
36bc01dbf1 Translated using Weblate (German) 
Currently translated at 99.9% (3212 of 3213 strings)

[CI skip]
 2017-07-28 00:16:58 +02:00
anonymous
c7433140f6 Translated using Weblate (German) 
Currently translated at 99.9% (3212 of 3213 strings)

[CI skip]
 2017-07-28 00:15:21 +02:00
ssantos
cec3a184ab Translated using Weblate (German) 
Currently translated at 99.9% (3212 of 3213 strings)

[CI skip]
 2017-07-28 00:14:12 +02:00
ssantos
0a9fa8b605 Translated using Weblate (German) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-07-27 23:56:34 +02:00
dingo thirteen
0ff5228e76 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-07-27 18:44:39 +02:00
Daniel Grønlund Johansen
3a5b4aab00 Translated using Weblate (Danish) 
Currently translated at 93.6% (3000 of 3205 strings)

[CI skip]
 2017-07-27 15:44:36 +02:00
Deven Bansod
8c247a17f8 Don't mark incomplete tests and skipped tests as Failed on browerstack 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-27 18:08:07 +05:30
Deven Bansod
65a4b3ca32 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2017-07-27 17:08:04 +05:30
Deven Bansod
88149373bb Mark failed selenium tests on Browerstack as failed 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-27 17:07:31 +05:30
Deven Bansod
7f830b1094 Prevent possible stale element error in tracking 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-27 17:07:22 +05:30
Maurício Meneghini Fauth
2afb9ab574 Merge pull request #13527 from mauriciofauth/templates 
Port some templates to Twig
 2017-07-26 17:48:05 -03:00
Maurício Meneghini Fauth
cc48840350 Port some templates to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-26 16:47:11 -03:00
Deven Bansod
c28e2d4235 Fix Import-related selenium tests 
* Use $cfg['uploadDir'] = "./test/test_data" while importing
* Prevents use of FileDetectors in remote file detectors etc.

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-26 20:24:22 +05:30
Deven Bansod
6246c84021 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2017-07-26 20:20:05 +05:30