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

113966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hosted Weblate
c9b2aff36b
Merge branch 'origin/master' into Weblate 2018-10-24 19:03:26 +02:00
Robert Antoni Buj Gelonch
05a12c38bf
Translated using Weblate (Catalan) 
Currently translated at 100.0% (3298 of 3298 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ca/
Signed-off-by: Robert Antoni Buj Gelonch <robert.buj@gmail.com>
 2018-10-24 19:03:23 +02:00
Tazo Todua
17b85ab50c Improve AllowThirdPartyFraming configuration (#14688) 
The only correct way to check the frame-options. The existing version was incorrect. Even setting to value to "blabla", it bypassed the ! check in php. So, at first, it should be checked if the "sameorigin" is value, and after that, everything other than true should DENY the frame.

Signed-off-by: Tazo Todua <tazotodua@gmail.com>
 2018-10-24 14:03:12 -03:00
Maurício Meneghini Fauth
03ae1f6c64 Add ChangeLog entry for #14417 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-23 16:35:22 -03:00
Lakshay arora
2a07cee164 Automatically add index while editing an existing row and setting auto increment (#14417) 
* Automates the addition of PRIMARY KEY index when user tries to edit an existing row and set AUTO INCREMENT.
* Disables the popup on insert new column page when user sets AUTO INCREMENT and automatically sets the index to PRIMARY KEY.

Signed-off-by: Lakshay arora <arora.lakshya123@gmail.com>
 2018-10-23 16:33:36 -03:00
Maurício Meneghini Fauth
87c742d12f Add SVG 2FA QRCode generation as a fallback 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-22 12:31:07 -03:00
Maurício Meneghini Fauth
e9db0d0561 Revert "Fix for #14171 - 2FA QR PHPGD" 
This reverts commit 49fae81505.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-22 12:15:18 -03:00
Maurício Meneghini Fauth
3c55ce5bf7 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-18 22:28:05 -03:00
Maurício Meneghini Fauth
3386cdc324 Add PHP 7.3 to test matrix 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-18 22:16:39 -03:00
Maurício Meneghini Fauth
d2a55f01e5
Merge pull request #14674 from caugner/14337-theme-metro-login-w-2fa 
Fixes the Metro theme login screen with enabled 2FA
 2018-10-18 21:36:51 -03:00
Maurício Meneghini Fauth
acb968f74e
Merge pull request #14661 from mauriciofauth/travisci-windows 
Add Windows to test matrix on Travis CI
 2018-10-18 20:16:21 -03:00
Hugo Peixoto
9c92c1d2df
Translated using Weblate (Portuguese) 
Currently translated at 57.6% (1899 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/pt/
Signed-off-by: Hugo Peixoto <hugopeixoto@capsula.pt>
 2018-10-18 17:36:11 +02:00
Maurício Meneghini Fauth
4c6993b2c2 Fix some tests on Windows 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-17 23:15:37 -03:00
Maurício Meneghini Fauth
3976b37536 Add Windows to test matrix on Travis CI 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-17 21:44:29 -03:00
Maurício Meneghini Fauth
8b2336a989 Remove unsed Util method 
Removes PhpMyAdmin\Util::containsNonPrintableAscii static method.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-17 21:42:07 -03:00
Claas Augner
9944cb620e Theme metro: fix login container text color 
Signed-off-by: Claas Augner <git@caugner.de>
 2018-10-17 20:59:16 +02:00
Claas Augner
758199945e Theme metro: fix login container height 
Signed-off-by: Claas Augner <git@caugner.de>
 2018-10-17 20:59:09 +02:00
Maurício Meneghini Fauth
e19a777765 Fix OSX build on Travis 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
(cherry picked from commit df1adb4dfe)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-16 18:38:57 -03:00
ButterflyOfFire
d9ffc76527
Translated using Weblate (Azerbaijani) 
Currently translated at 50.0% (1648 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/az/
Signed-off-by: ButterflyOfFire <ButterflyOfFire@protonmail.com>
 2018-10-16 12:22:54 +02:00
ButterflyOfFire
63e2a999d6
Translated using Weblate (Azerbaijani) 
Currently translated at 49.9% (1647 of 3298 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/az/
Signed-off-by: ButterflyOfFire <ButterflyOfFire@protonmail.com>
 2018-10-16 12:22:53 +02:00
Maurício Meneghini Fauth
df1adb4dfe Fix OSX build on Travis 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-13 17:12:20 -03:00
Maurício Meneghini Fauth
c1926fe2c4
Merge pull request #14595 from williamdes/refactor-selenium 
Selenium tests
 2018-10-12 16:46:19 -03:00
Maurício Meneghini Fauth
36cc111da0
Merge pull request #14653 from mauriciofauth/google2fa-v4 
Upgrade pragmarx/google2fa to v4
 2018-10-11 23:03:15 -03:00
William Desportes
ea830e70b3
Try multiple browsers 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-10-11 11:30:38 +02:00
William Desportes
cdeff3e5a2
Try a new Travis setup 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-10-11 11:30:08 +02:00
William Desportes
f48cc814a5
Removed some phpstan ignores 
- Using reportUnmatchedIgnoredErrors: true

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-10-11 11:30:07 +02:00
William Desportes
862788d782
Migrate tests to facebook/webdriver 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-10-11 11:30:06 +02:00
William Desportes
5fc0150a56
Update Browserstack script 
Source : https://www.browserstack.com/local-testing and man of executable.
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-10-11 11:30:05 +02:00
William Desportes
d9153ae069
Add TESTSUITE_PORT for selenium tests 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-10-11 11:30:05 +02:00
Maurício Meneghini Fauth
62120a3a4a Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-10 23:35:09 -03:00
Hosted Weblate
4bfde39a70
Merge branch 'origin/QA_4_8' into Weblate 2018-10-11 04:33:05 +02:00
Yaron Shahrabani
11b9e5e2ce
Translated using Weblate (Hebrew) 
Currently translated at 49.4% (1628 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-10-11 04:33:02 +02:00
Maurício Meneghini Fauth
a849e8e2fe Add ChangeLog entry for #14447 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-10 23:32:21 -03:00
yeezy69
c6ae2ec385 Update Table.php (#14461) 
Fix #14447 - Error while copying database (pma__column_info)

Signed-off-by: Daniel <yeezy69@babau.mywire.org>
(cherry picked from commit aed0fede4d)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-10 23:30:58 -03:00
Hosted Weblate
f42b0a0fba
Merge branch 'origin/master' into Weblate 2018-10-11 04:22:05 +02:00
Yaron Shahrabani
3b3917b3fc
Translated using Weblate (Hebrew) 
Currently translated at 49.3% (1627 of 3298 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-10-11 04:22:03 +02:00
yeezy69
aed0fede4d Update Table.php (#14461) 
Fix #14447 - Error while copying database (pma__column_info)

Signed-off-by: Daniel <yeezy69@babau.mywire.org>
 2018-10-10 23:21:49 -03:00
tmtisfree
46503465ca
Translated using Weblate (French) 
Currently translated at 100.0% (3294 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/fr/
Signed-off-by: tmtisfree <tmtisfree@free.fr>
 2018-10-10 22:26:58 +02:00
tmtisfree
a92278d4ef
Translated using Weblate (French) 
Currently translated at 100.0% (3298 of 3298 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/fr/
Signed-off-by: tmtisfree <tmtisfree@free.fr>
 2018-10-10 22:26:58 +02:00
Maurício Meneghini Fauth
8a7d18df9c Upgrade pragmarx/google2fa to v4 
Add pragmarx/google2fa-qrcode v1

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-10 15:11:15 -03:00
Hosted Weblate
f7dfc74b75
Merge branch 'origin/master' into Weblate 2018-10-08 18:32:37 +02:00
popcorner
985e0ba62e
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3298 of 3298 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/zh_Hans/
Signed-off-by: popcorner <memoword@163.com>
 2018-10-08 18:32:36 +02:00
Maurício Meneghini Fauth
ae9b0b1862 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-08 13:32:13 -03:00
Hosted Weblate
2ab6a4e64a
Merge branch 'origin/QA_4_8' into Weblate 2018-10-08 18:28:29 +02:00
popcorner
f6a61cc7bc
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3294 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hans/
Signed-off-by: popcorner <memoword@163.com>
 2018-10-08 18:28:26 +02:00
Maurício Meneghini Fauth
28accc8f98 DatabaseInterface->getDefinition() can return false 
Related to https://github.com/phpmyadmin/website/issues/81

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-08 13:26:43 -03:00
Maurício Meneghini Fauth
4d94b1bda9 Add ChangeLog entry for #14330 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-06 13:06:43 -03:00
Lakshay arora
19cbb34bc0 New features for csv import plugin (#14330) 
Following new features have been added in the csv import plugin:
1. For a new import, user can now directly enter the table or database name at the time of import
2. Partial import. User can enter how many rows they want to import.

Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
 2018-10-06 12:43:14 -03:00
Kirill Nikolaev
69fd06f4f5
Translated using Weblate (Russian) 
Currently translated at 97.9% (3227 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ru/
Signed-off-by: Kirill Nikolaev <kf@exchange12rocks.org>
 2018-10-05 12:36:23 +02:00
Hosted Weblate
279d510173
Merge branch 'origin/master' into Weblate 2018-10-02 18:39:44 +02:00