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

112807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olivier Humbert
fa0b12fe0e Translated using Weblate (French) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]
 2018-03-29 14:36:10 +02:00
Michal Čihař
28f2996652 Update BrowserStack key 
Fixes #14138

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-03-28 09:28:58 +02:00
Maurício Meneghini Fauth
20407323dd Merge branch 'QA_4_7' into QA_4_8 2018-03-28 01:03:31 -03:00
Maurício Meneghini Fauth
294a22c1d4 Update copyright years 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-28 01:01:24 -03:00
Maurício Meneghini Fauth
ca7fd2b2c7 Fix case where 'query' is always considered defined 
Related to #14079

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-27 18:44:28 -03:00
Lakshay arora
2aecbf41e1 Fixes error in foreign key sql generation + drop foreign key contraint (#14031) 
* Fixes error in foreign key sql genration, issue #14030
Changed:
	templates/table/relation/foreign_key_row.twig
The destination_column_names were getting passed as a 1d array, the names when extracted gave a string. Passing it as a 2d array (see templates/table/relation/foreign_key_row.twig lines 123,133) fixes the issue.

Sign-Off-By: Lakshay arora (b16060@students.iitmandi.ac.in)

* Fixes error in foreign key sql generation + drop foreign key contraint, issue #14030
Changed:
	templates/table/relation/foreign_key_row.twig

Fix #13941
Fix #14009
Close #14037
Close #14010

Signed-off-by: Lakshay arora <b16060@students.iitmandi.ac.in>
(cherry picked from commit 00b59624e3)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-27 16:02:33 -03:00
Isaac Bennetch
046bc0f009 Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-27 00:40:41 -04:00
Isaac Bennetch
b2ad84ea40 Adding composer lock for 4.8.0-rc1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-27 00:31:51 -04:00
Isaac Bennetch
682a94947f Prepare for 4.8.0-rc1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-27 00:06:44 -04:00
Maurício Meneghini Fauth
8b04a2b2a7 Remove redundant else 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-26 13:27:51 -03:00
Piyush Vijay
ad86eab974 Cannot read property sql_query of undefined: #14104 issue fix (#14105) 
Fix #14101
Fix #14104

* Cannot read property sql_query of undefined: #14104 issue fix
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* Cannot read property sql_query of undefined: #14104 issue fix
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>
 2018-03-26 13:25:33 -03:00
Maurício Meneghini Fauth
d98658187a Replace PhpMyAdmin\Relation static calls 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-25 19:32:13 -03:00
Maurício Meneghini Fauth
e4c897f400 Move changelog entries #14060 and #14096 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-23 03:03:13 -03:00
Weblate
cd03e646b8 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2018-03-23 06:58:33 +01:00
Marino
861486754e Translated using Weblate (Croatian) 
Currently translated at 27.7% (890 of 3208 strings)

[CI skip]
 2018-03-23 06:58:26 +01:00
Maurício Meneghini Fauth
6fc885c964
Merge pull request #14108 from ibennetch/ie_compatibility 
Fixes JavaScript error when editing rows with Internet Explorer
 2018-03-23 02:58:05 -03:00
Domen
c7366f0b18 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2018-03-21 19:41:07 +01:00
Isaac Bennetch
4d7ca8fe04 Fixes JavaScript error when editing rows with Internet Explorer 
Fixes #14060
Fixes #14096

Internet Explorer does not support StartsWith()

See the comments by
tm8544 at https://github.com/phpmyadmin/phpmyadmin/issues/14096#issue-306243721
and qcybb at https://github.com/phpmyadmin/phpmyadmin/issues/14060#issuecomment-374730276

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-21 10:50:13 -04:00
Yaron Shahrabani
9a75bdc04c Translated using Weblate (Hebrew) 
Currently translated at 20.1% (648 of 3208 strings)

[CI skip]
 2018-03-20 10:37:40 +01:00
M. M
86a64e7532 Translated using Weblate (Albanian) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2018-03-20 00:34:31 +01:00
Nabin Ghimire
fa30d1aa11 Translated using Weblate (Nepali) 
Currently translated at 1.9% (62 of 3208 strings)

[CI skip]
 2018-03-19 22:41:04 +01:00
Maurício Meneghini Fauth
46ceeea14f Replace static methods with instance methods 
Replace PhpMyAdmin\Relation static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-19 09:23:23 -03:00
Anu4ruby
65e3074722 Remove inline styles in ReplicationGui.php (#13981) 
* removed inline styles from AuthenticationConfig.php file-issue 12262

* removed inline styles from AuthenticationConfig.php- file-issue 12262-Signed-off-by: Anupama.V <sadicarnot@gmail.com>

* Remove inline styles from ReplicationGui.php #12262.

Signed-off by: Anupama.V <sadicarnot@gmail.com>
 2018-03-24 13:57:29 -03:00
Saksham Gupta
1f70ea3834 Fixes Import Fail (#14085) 
* Fixes Import Fail
Fixes: https://github.com/phpmyadmin/phpmyadmin/issues/14072

Signed-off-by: Saksham Gupta <shucon01@gmail.com>

* Fix Import Fail

Signed-off-by: Saksham Gupta <shucon01@gmail.com>
 2018-03-23 20:16:28 -03:00
Maurício Meneghini Fauth
b8e7e9fa3b Merge branch 'QA_4_7' 2018-03-23 03:11:14 -03:00
Weblate
66b1123a58 Merge remote-tracking branch 'origin/master' 2018-03-23 06:44:12 +01:00
Marino
073f3534c1 Translated using Weblate (Croatian) 
Currently translated at 26.7% (879 of 3288 strings)

[CI skip]
 2018-03-23 06:43:54 +01:00
Maurício Meneghini Fauth
f0b6e41e9b
Merge pull request #14116 from laps15/master 
Addapt getHtmlForTableNavigation to twig template
 2018-03-23 02:43:28 -03:00
Leonardo Strozzi
eb6e40f053 Addapt getHtmlForTableNavigation to twig template 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-03-23 00:34:26 -03:00
Maurício Meneghini Fauth
1e134bb7e4
Merge pull request #14098 from meteorlxy/patch-tmp 
Fix improperly escaped HTML code in database structure page; issue #14071

Fix #14071
 2018-03-22 02:24:40 -03:00
Maurício Meneghini Fauth
8d53693071 Fix error report button 
Fix #14011

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-22 01:20:51 -03:00
Maurício Meneghini Fauth
b11b7c149f
Merge pull request #14107 from laps15/master 
Addapt getHtmlForAddColumn to use twig template
 2018-03-22 00:40:20 -03:00
Leonardo Strozzi
2c7f3613ee Addapt getHtmlForAddColumn to use twig template 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-03-21 21:50:24 -03:00
Isaac Bennetch
aa903ee98d
Merge pull request #14051 from ibennetch/gsoc-doc 
Add GSoC 2017 to credits
 2018-03-21 10:10:41 -04:00
Weblate
c9e2540b50 Merge remote-tracking branch 'origin/master' 2018-03-21 15:10:12 +01:00
Domen
28dd604336 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]
 2018-03-21 15:10:07 +01:00
Isaac Bennetch
7a233127eb
Merge pull request #14058 from ibennetch/doc-pr 
Improvements to the phrasing of the documentation.
 2018-03-21 10:09:30 -04:00
Yaron Shahrabani
bc3ff4ece6 Translated using Weblate (Hebrew) 
Currently translated at 19.4% (640 of 3288 strings)

[CI skip]
 2018-03-20 10:37:48 +01:00
M. M
6addf992fa Translated using Weblate (Albanian) 
Currently translated at 97.7% (3215 of 3288 strings)

[CI skip]
 2018-03-20 00:34:40 +01:00
Nabin Ghimire
8973f40fa7 Translated using Weblate (Nepali) 
Currently translated at 1.8% (62 of 3288 strings)

[CI skip]
 2018-03-19 22:41:12 +01:00
Xinyu Liu
7391d872a9 Fix improperly escaped HTML code in database structure page #14071 
Signed-off-by: Xinyu Liu <meteor.lxy@foxmail.com>
 2018-03-19 08:06:33 +00:00
Nuno Marques
3e9f2f9f93 Translated using Weblate (Portuguese) 
Currently translated at 56.6% (1862 of 3288 strings)

[CI skip]
 2018-03-18 16:40:03 +01:00
Nuno Marques
bcb856ef72 Translated using Weblate (Portuguese) 
Currently translated at 58.6% (1882 of 3208 strings)

[CI skip]
 2018-03-18 16:39:55 +01:00
Yaron Shahrabani
da92800dc3 Translated using Weblate (Hebrew) 
Currently translated at 20.1% (645 of 3208 strings)

[CI skip]
 2018-03-17 10:37:01 +01:00
Michal Čihař
5a1ceef67d
Merge pull request #14046 from shucon/login 
Restore SQL query after session expire
 2018-03-16 13:07:20 +01:00
Weblate
063f380639 Merge remote-tracking branch 'origin/master' 2018-03-16 10:53:40 +01:00
Yaron Shahrabani
e7018fca9e Translated using Weblate (Hebrew) 
Currently translated at 19.3% (637 of 3288 strings)

[CI skip]
 2018-03-16 10:53:31 +01:00
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
Maurício Meneghini Fauth
0c21321803 Remove default function parameters in functions.js 
Replace ES2015 default function parameters in js/functions.js with a check in the function body.

Fix #14061

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-15 15:20:58 -03:00
Maurício Meneghini Fauth
26a6581380 Replace static methods with instance methods 
Replace PhpMyAdmin\CheckUserPrivileges static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-15 13:56:08 -03:00