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

113997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hosted Weblate
cca345804a
Merge branch 'origin/master' into Weblate 2018-10-27 04:33:21 +02:00
Isaac Bennetch
d8014705b2 Merge branch 'QA_4_8' 2018-10-26 22:32:53 -04:00
Isaac Bennetch
999c711adc Documentation: 'Users' tab is now 'User accounts' so fix an incorrect reference 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-10-26 22:32:35 -04:00
Hosted Weblate
74a295bc71
Merge branch 'origin/master' into Weblate 2018-10-27 04:31:51 +02:00
Yaron Shahrabani
ac1e929dae
Translated using Weblate (Hebrew) 
Currently translated at 49.5% (1634 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-27 04:31:47 +02:00
Isaac Bennetch
7f5eaa9a53 Merge branch 'QA_4_8' 2018-10-26 22:30:41 -04:00
Isaac Bennetch
61b9eb1191 Merge commit 'cbd23dd8f3' 2018-10-26 22:30:12 -04:00
Isaac Bennetch
ae387a3918 Merge commit '5d4bc20ed1' 2018-10-26 22:30:02 -04:00
Natanel
4e75a93633
Translated using Weblate (Hebrew) 
Currently translated at 49.6% (1636 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Natanel <natanelgemert@gmail.com>
 2018-10-26 12:08:50 +02:00
Yaron Shahrabani
5e785ce855
Translated using Weblate (Hebrew) 
Currently translated at 49.6% (1636 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-26 12:08:44 +02:00
Yaron Shahrabani
972baeba9d
Translated using Weblate (Hebrew) 
Currently translated at 49.5% (1633 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-26 12:00:03 +02:00
Natanel
d90a4be051
Translated using Weblate (Hebrew) 
Currently translated at 49.5% (1633 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Natanel <natanelgemert@gmail.com>
 2018-10-26 11:59:57 +02:00
Yaron Shahrabani
edb9838ba6
Translated using Weblate (Hebrew) 
Currently translated at 49.3% (1628 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-26 11:55:48 +02:00
Yaron Shahrabani
65acb56026
Translated using Weblate (Hebrew) 
Currently translated at 49.4% (1630 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-26 11:55:10 +02:00
Natanel
f793d6b1b6
Translated using Weblate (Hebrew) 
Currently translated at 49.4% (1630 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Natanel <natanelgemert@gmail.com>
 2018-10-26 11:54:30 +02:00
Yaron Shahrabani
993d89e1d9
Translated using Weblate (Hebrew) 
Currently translated at 49.4% (1630 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-26 11:54:25 +02:00
Natanel
74bb42888b
Translated using Weblate (Hebrew) 
Currently translated at 49.4% (1629 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Natanel <natanelgemert@gmail.com>
 2018-10-26 11:53:13 +02:00
Yaron Shahrabani
0c946a8d08
Translated using Weblate (Hebrew) 
Currently translated at 49.4% (1629 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-26 11:53:06 +02:00
Yaron Shahrabani
96972ea79c
Translated using Weblate (Hebrew) 
Currently translated at 49.4% (1629 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-26 11:51:50 +02:00
Natanel
f916fbda75
Translated using Weblate (Hebrew) 
Currently translated at 49.4% (1629 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Natanel <natanelgemert@gmail.com>
 2018-10-26 11:51:43 +02:00
Natanel
82dd6d8374
Translated using Weblate (Hebrew) 
Currently translated at 49.4% (1629 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Natanel <natanelgemert@gmail.com>
 2018-10-26 11:50:03 +02:00
William Desportes
cbd23dd8f3
Add ChangeLog entry for #14636 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-10-25 23:16:44 +02:00
Vincent Horváth
3cda8e6093
Fix for #14636 - Move operation causes SELECT * FROM undefined 
- fixed params name in operation js file
- set value in global field table to new table name
- fixed refresh page after submit move table
- fixed back quote in message result

Signed-off-by: Vincent Horváth <win9400@gmail.com>
(cherry picked from commit 52024f1d2b)
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-10-25 23:14:21 +02:00
William Desportes
ff349c7e5c
Merge pull request #14656 from wincdev/FIX/issue-14636 
Fixes: #14636 - Move operation causes SELECT * FROM `undefined`
 2018-10-25 23:06:13 +02:00
William Desportes
4cddc66553
Add ChangeLog entry for #14571 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-10-25 22:54:34 +02:00
Vincent Horváth
54f78660e0
Fix for #14571 - "No database selected" - DROP a view 
Signed-off-by: Vincent Horváth <win9400@gmail.com>
(cherry picked from commit 36ae547c63)
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-10-25 22:51:39 +02:00
William Desportes
9f27dc0688
Merge pull request #14659 from wincdev/FIX/issue-14571 
Fixes: #14571 - "No database selected" - DROP a view
 2018-10-25 22:34:12 +02:00
Robert Antoni Buj Gelonch
5d4bc20ed1
Translated using Weblate (Catalan) 
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/ca/
Signed-off-by: Robert Antoni Buj Gelonch <robert.buj@gmail.com>
 2018-10-25 18:24:19 +02:00
Maurício Meneghini Fauth
222bf67795 Fix uncaught TypeError in Header class 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-25 01:27:24 -03:00
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