gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,284 Commits 12 Branches 481 Tags 2.4 GiB
51cade77fd
Commit Graph

129 Commits

Author SHA1 Message Date
Michal Čihař
adf30f161c Update to pragmarx/google2fa 3.0.1 
This has changed license to MIT making it compatible with our GPL2.

Fixes #14074

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-03-16 10:52:49 +01:00
Michal Čihař
9b36dfba69 Merge branch 'QA_4_7' 2018-02-12 14:27:35 +01:00
Michal Čihař
0870b2b0ae Set system locales separately 
The motranslator no longer does this, see
https://github.com/phpmyadmin/motranslator/issues/24

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-02-12 14:17:43 +01:00
Michal Čihař
6240580784 Merge branch 'QA_4_7' 2018-01-22 14:17:55 +01:00
Michal Čihař
dcc13ddc50 Clatify license in composer.json 
We are still GPL-2.0 only, so document that properly.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-01-22 14:14:21 +01:00
Michal Čihař
8b8e68c6bf Use PSR-4 for loading selenium tests and adjust their names 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-18 13:09:01 +01:00
Michal Čihař
d1ac2f84a0
Merge pull request #13867 from nijel/selenium 
Try to use more recent phpunit-selenium
 2017-12-15 13:25:38 +01:00
Michal Čihař
0b5b287049 Merge branch 'QA_4_7' 2017-12-15 11:10:00 +01:00
Michal Čihař
39b8020857 Fixed displaying of formatted numeric values for some locales 
The code was wrongly assuming that . is always decimal separator, what
it is not and can be even thousands separator.

Fixes #13865

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 11:05:54 +01:00
Michal Čihař
f0da46277c Use more recent phpunit-selenium 
We can't yet use 4.0 due to it's dependency on current phpunit, but at
least upgrade to 3.0.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-12-15 10:24:24 +01:00
Gabriel Caruso
930af7ec27 Support PHPUnit 5 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2017-12-12 06:34:20 -02:00
Maurício Meneghini Fauth
fe62e84062 Use PSR-4 for Twig classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-30 16:33:26 -02:00
Michal Čihař
63f5b90ad5 Merge branch 'QA_4_7' 2017-11-29 12:51:31 +01:00
Michal Čihař
7bff1263c8 Revert limitation on phpseclib dependency 
Only 2.0.8 is broken, so conflict with that.

Fixes #13846

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 12:50:15 +01:00
Michal Čihař
6aeae463d1 Merge branch 'QA_4_7' 2017-11-29 09:44:46 +01:00
Michal Čihař
f8ccc4db13 Stick with phpseclib < 2.0.8 in 4.7 branch 
We can not remove PHP 5.5 support from maintenance branch, so there is
no other way than sticking with older phpseclib.

See https://github.com/phpseclib/phpseclib/issues/1218

Issue #13846

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 09:35:39 +01:00
Michal Čihař
8bc91e9b58 Revert "Compatibility with phpseclib 2.0.8" 
This reverts commit a450935e53.

We really need to stick on 2.0.7 for 4.7 branch to keep PHP 5.5 support.

Issue #13846
 2017-11-29 09:34:44 +01:00
Michal Čihař
a8f358e2c6 Merge branch 'QA_4_7' 2017-11-29 09:21:53 +01:00
Michal Čihař
a450935e53 Compatibility with phpseclib 2.0.8 
Apparently upgrade from 2.0.7 to 2.0.8 changed API in several ways.

See https://github.com/phpseclib/phpseclib/issues/1218

Fixes #13846

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 09:13:23 +01:00
Michal Čihař
b0312fb8c5 Add u2f/2fa deps to require-dev 
This way they do not have to be manually installed on Travis.
 2017-11-23 16:56:52 +01:00
Michal Čihař
6ba00988fc Allow older version of symfony-expression language 
This is to stay compatible with (slightly) older PHP versions. Also this
is same as used in phpmyadmin/motranslator.

Fixes #13812

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-16 11:26:53 +01:00
Michal Čihař
540b78dc2e Add support for FIDO U2F authentication 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:31 +01:00
Michal Čihař
869131f59c Add support for HOTP and TOTP authentication 
This supports Google Authenticator and similar applications.

Issue #6197

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:18 +01:00
Michal Čihař
4249773137 Merge branch 'QA_4_7' 2017-10-10 15:05:05 +02:00
Michal Čihař
f5d950da6f Update SQL parser to 4.2.3 
- Fixed copying tables with specific PARTITION definition

Fixes #13725

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-10 15:02:19 +02:00
Maurício Meneghini Fauth
c00245fa0a Move PMATestCase to PhpMyAdmin\Tests\PmaTestCase 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-09-30 16:34:53 -03:00
Michal Čihař
342328f76a Merge branch 'QA_4_7' 2017-09-28 12:43:15 +02:00
Michal Čihař
f250fe71ba Use released version of codacy/coverage 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-28 12:42:46 +02:00
Michal Čihař
7139bcff1e Adjust codesniffer dependency 
See https://github.com/phpmyadmin/coding-standard/issues/3 and
https://github.com/phpmyadmin/coding-standard/pull/5

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-28 11:29:01 +02:00
Michal Čihař
c7b721da96 Update latest code sniffer 
See https://github.com/phpmyadmin/coding-standard/issues/3 and
https://github.com/phpmyadmin/coding-standard/pull/5

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-28 11:13:44 +02:00
Michal Čihař
03904620d4 Merge branch 'QA_4_7' 2017-09-28 09:48:38 +02:00
Michal Čihař
6be60fc9ff Increase SQL parser dependency to get fix for #13539 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-28 09:47:31 +02:00
Maurício Meneghini Fauth
14ffa1f232 Add test/PMATestCase.php to autoload-dev 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-09-20 11:20:57 -03:00
Michal Čihař
1c00728163 Make hash extension required 
It is anyway shipped by default and carrying implementation of hash_hmac
is not really a good idea long term.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-05 14:46:46 +02:00
Michal Čihař
0c32545c25 Documnent ctype dependency 
It is required by Twig.

Fixes #13611

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 12:13:42 +02:00
Michal Čihař
3d0cd91475 Merge branch 'QA_4_7' 2017-08-30 12:36:37 +02:00
Michal Čihař
6580cc26a5 Add support for loading MariaDB contexts in SQL parser 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-30 12:34:27 +02:00
Michal Čihař
0e892f30ab Merge branch 'QA_4_7' 2017-08-21 12:56:31 +02:00
Michal Čihař
d05fb82b98 Increase SQL parser dependency 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-21 12:56:28 +02:00
Maurício Meneghini Fauth
f0b1a7db18 Remove PMA namespace 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-21 08:15:34 -03:00
Maurício Meneghini Fauth
74b292a0d7 Add PhpMyAdmin\Tests namespace 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-21 08:10:34 -03:00
Maurício Meneghini Fauth
452bf6b2d0 Add PhpMyAdmin\Setup namespace 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-21 08:04:58 -03:00
Michal Čihař
77d035240e Merge branch 'QA_4_7' 2017-07-12 16:57:11 +02:00
Michal Čihař
5f34bb20a8 Update sql-parser dependency 
Needed for fixing #13385, #13483, #13485, #13486, #13487

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-12 16:56:08 +02:00
Maurício Meneghini Fauth
13c0f7bc3c Move classes to PhpMyAdmin namespace 
- Move Advisor to PhpMyAdmin namespace
- Move Bookmark to PhpMyAdmin namespace
- Move Charsets to PhpMyAdmin namespace
- Move Config class to PhpMyAdmin namespace
- Move Console class to PhpMyAdmin namespace
- Move Core to PhpMyAdmin namespace
- Move DatabaseInterface to PhpMyAdmin namespace
- Move DbList to PhpMyAdmin namespace
- Move DbQbe to PhpMyAdmin namespace
- Move DbSearch to PhpMyAdmin namespace
- Move DisplayResults to PhpMyAdmin namespace
- Move Encoding to PhpMyAdmin namespace
- Move Error to PhpMyAdmin namespace
- Move ErrorHandler to PhpMyAdmin namespace
- Move File to PhpMyAdmin namespace
- Move Font to PhpMyAdmin namespace
- Move Footer to PhpMyAdmin namespace
- Move Header to PhpMyAdmin namespace
- Move Index to PhpMyAdmin namespace
- Move IndexColumn to PhpMyAdmin namespace
- Move LanguageManager to PhpMyAdmin namespace
- Move Language to PhpMyAdmin namespace
- Move Linter to PhpMyAdmin namespace
- Move ListAbstract to PhpMyAdmin namespace
- Move ListDatabase to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-28 21:17:18 -03:00
Michal Čihař
990b8163b4 Merge branch 'QA_4_7' 2017-06-15 16:45:35 +02:00
Michal Čihař
3675c1ef94 Remove coveralls support 
Their PHP code seems unmaintained and Codecov serves better our purposes
(it can better track pull request changes).

Fixes #12716

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-15 16:44:34 +02:00
Michal Čihař
2a7fe79890 Merge branch 'QA_4_7' 2017-06-06 16:46:22 +02:00
Michal Čihař
2bf3356879 Use new SQL mode constants in SQL parser 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-06 16:46:18 +02:00
Michal Čihař
7cea5eb9af Replace our mbstring polyfills with symfony/polyfill-mbstring 
The symfony/polyfill-mbstring is anyway pulled in through Twig, so this
doesn't add additional dependencies.

Fixes #12386

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-17 10:03:30 +02:00