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

113691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gemorroj
bc8fe79e77 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2018-08-12 16:09:11 +03:00
Maurício Meneghini Fauth
af5d08318f
Merge pull request #14557 from laps15/refactor_util_extension 
Remove get_div_for_slider_effect twig extension
 2018-08-11 05:51:05 -03:00
popcorner
50da965493
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 94.5% (3111 of 3291 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/zh_Hant/
Signed-off-by: popcorner <memoword@163.com>
 2018-08-09 20:35:57 +02:00
Leonardo Strozzi
fc9ccff218 Remove get_div_for_slider_effect twig extension 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-08-08 22:15:00 -03:00
Isaac Bennetch
1d39152af2 Merge branch 'QA_4_8' 2018-08-07 13:13:39 -04:00
Isaac Bennetch
af98a94b34 Fix merge conflicts from QA_4_8 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-07 13:12:45 -04:00
Isaac Bennetch
0294bcc5f2 Fix #14554 Icon missing for creating a new routine, trigger, and event 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-07 13:05:37 -04:00
Jack Cherng
d0233a047a Fix PHP 7.3 warning: "continue" in "switch" is equal to "break" 
Signed-off-by: Jack Cherng <jfcherng@gmail.com>
(cherry picked from commit 9a7a1e35b0)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-06 20:55:07 -03:00
Maurício Meneghini Fauth
da51bdf56b
Merge pull request #14521 from jfcherng/jfcherng-patch-1 
Fix PHP 7.3 warning: "continue" in "switch" is equal to "break"
 2018-08-06 20:49:11 -03:00
Isaac Bennetch
1d1ab00381 Merge branch 'QA_4_8' 2018-08-06 13:54:18 -04:00
Isaac Bennetch
8bcbb950dd Add ChangeLog for issue #14552 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-06 13:54:14 -04:00
Isaac Bennetch
6e9c8f8b33 Merge branch 'QA_4_8' 2018-08-06 13:52:34 -04:00
Andy Baugh
c55755d0ca Fix merge conflicts in QA_4_8 from this pull request 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>

Fix bad callers to getError where null was being passed.

Fixes #14552: Considering how function signatures work in PHP, this should
be a reltatively 'safe' change, as the mysqli lib currently would still
do a check for cases where the passed in $link was either null or false.
Otherwise the bug's source appears to be a common mistake in PHP:
null != undefined

Signed-off-by: Andy Baugh <thomas.baugh@cpanel.net>
 2018-08-06 13:45:45 -04:00
Andy Baugh
793b062d57 Fix bad callers to getError where null was being passed. 
Fixes #14552: Considering how function signatures work in PHP, this should
be a reltatively 'safe' change, as the mysqli lib currently would still
do a check for cases where the passed in $link was either null or false.
Otherwise the bug's source appears to be a common mistake in PHP:
null != undefined

Signed-off-by: Andy Baugh <thomas.baugh@cpanel.net>
 2018-08-06 09:57:37 -05:00
Isaac Bennetch
6b902c298c Changelog for pull request #14443 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-05 21:51:41 -04:00
Isaac Bennetch
35b9ecba1d Slightly improve phrasing and grammar 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-05 21:49:46 -04:00
Isaac Bennetch
994f8bd8ed
Merge pull request #14443 from nulll-pointer/enh_7 
Show warning for default control user/pass usage
 2018-08-05 21:47:05 -04:00
Isaac Bennetch
417c7fc3fa Fixup for documentation about URL query string parameters. 
We still have two different FAQ entries about this, but at least they
cross-reference each other now.

Fixes: #14477

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-05 21:36:25 -04:00
Isaac Bennetch
66ccbe8796 ChangeLog for pull request #14379 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-05 21:19:16 -04:00
Jack Cherng
9a7a1e35b0
Fix PHP 7.3 warning: "continue" in "switch" is equal to "break" 
Signed-off-by: Jack Cherng <jfcherng@gmail.com>
 2018-08-06 02:47:26 +08:00
Gemorroj
617dc5c677 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2018-08-04 08:44:50 +03:00
Maurício Meneghini Fauth
b046246ab0
Merge pull request #14541 from laps15/refactor_extensions 
Refactor extensions
 2018-08-04 01:12:47 -03:00
Maurício Meneghini Fauth
2201e26083 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-03 17:37:27 -03:00
Lakshay arora
b3017796b7 Fixes ERR_BLOCKED_BY_XSS_AUDITOR on export table 
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
(cherry picked from commit 91fa051918)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-03 17:35:08 -03:00
Maurício Meneghini Fauth
57a0a42b16
Merge pull request #14387 from nulll-pointer/xss_issue 
Fixes ERR_BLOCKED_BY_XSS_AUDITOR on export table, #14375
 2018-08-03 17:25:42 -03:00
Lakshay arora
bdecea68df Increase input field width for varchar (#14379) 
* Increase input field width for varchar
* Changed test cases for insertEdit

Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
 2018-08-03 17:17:42 -03:00
Leonardo Strozzi
7aaaafca56 Addapt for master merge 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-08-03 17:15:40 -03:00
Leonardo Strozzi
ad3334ccc3 Refactor Sanitize Twig extensions 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-08-03 17:11:32 -03:00
Leonardo Strozzi
1037b1d626 Refactor Util Twig extensions 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-08-03 17:11:32 -03:00
Leonardo Strozzi
b65ede42ee Refactor Url Twig extensions 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-08-03 17:11:05 -03:00
Leonardo Strozzi
ed8aadd71b Rename Transformation Twig extensions 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-08-03 17:03:05 -03:00
Leonardo Strozzi
0ba17c69ed Rename tracker Twig extension 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-08-03 17:03:05 -03:00
Leonardo Strozzi
e7d36c2ff6 Rename table Twig extension 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-08-03 17:03:05 -03:00
Leonardo Strozzi
eddbbebdfc Rename StorageEngine Twig extensions 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-08-03 17:03:05 -03:00
Leonardo Strozzi
d13a6363e5 Rename ServerPrivileges Twig extension 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-08-03 17:03:05 -03:00
Leonardo Strozzi
78c1d9e949 Rename relations Twig extensions 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-08-03 17:00:30 -03:00
Leonardo Strozzi
9464cbc94a Rename plugins Twig extensions 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-08-03 17:00:30 -03:00
Leonardo Strozzi
76ad22cb8a Remove partition Twig extensions 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-08-03 17:00:30 -03:00
Leonardo Strozzi
00aea8821a Rename message Twig extensions 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-08-03 17:00:30 -03:00
Leonardo Strozzi
aee045f960 Remove index Twig extensions 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-08-03 17:00:30 -03:00
Leonardo Strozzi
04890c3ad8 Rename core Twig's extension 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-08-03 17:00:30 -03:00
Leonardo Strozzi
8333a994b7 Rename charsets Twig extensions 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-08-03 17:00:30 -03:00
Maurício Meneghini Fauth
bfc4dab5de
Merge pull request #14528 from laps15/refactor_server 
Refactor server privileges templates
 2018-08-02 20:04:59 -03:00
H Zeng
b1d34e18fb
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hans/
Signed-off-by: H Zeng <zhx@cnzhx.net>
 2018-08-02 09:35:43 +02:00
popcorner
abcb301752
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3288 of 3288 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-08-02 09:35:37 +02:00
Hosted Weblate
96daea238b
Merge branch 'origin/master' into Weblate 2018-08-02 00:48:58 +02:00
popcorner
3bdc9f18af
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3291 of 3291 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-08-02 00:48:55 +02:00
Maurício Meneghini Fauth
6416623cb8
Merge pull request #14531 from Piyush3079/PMA_14530 
Add method getHtmlForColumnDropdown in CentralColumns.php
 2018-08-01 19:48:45 -03:00
popcorner
7209ef9ee3
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3291 of 3291 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-08-01 09:04:57 +02:00
H Zeng
1059ecb80b
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hans/
Signed-off-by: H Zeng <zhx@cnzhx.net>
 2018-08-01 09:00:25 +02:00