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

112776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Weblate
fc978c1e40 Merge remote-tracking branch 'origin/master' 2018-03-12 23:26:07 +01:00
Yaron Shahrabani
d2aa2f3173 Translated using Weblate (Hebrew) 
Currently translated at 18.8% (619 of 3288 strings)

[CI skip]
 2018-03-12 23:25:55 +01:00
Maurício Meneghini Fauth
741a50a905 Merge branch 'QA_4_7' 2018-03-12 19:24:44 -03:00
Weblate
f90fdf2fc2 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2018-03-12 23:17:42 +01:00
Yaron Shahrabani
84c66eead9 Translated using Weblate (Hebrew) 
Currently translated at 19.5% (627 of 3208 strings)

[CI skip]
 2018-03-12 23:17:35 +01:00
Alexander Kamp
dc75d407c0 Fixes for issue 14059: (#14075) 
Missing '=' after fk_checks (value was appended onto field name)
sql_query variable not set due to GET-POST method change in tbl_structure.php 'add_key' situation

Fix #14059

Signed-off-by: Alexander Kamp <git@akamp.nl>
 2018-03-12 19:16:57 -03:00
Weblate
d6c2c41833 Merge remote-tracking branch 'origin/master' 2018-03-11 13:00:51 +01:00
Akom Chotiphantawanon
cea0e81b59 Translated using Weblate (Thai) 
Currently translated at 27.8% (916 of 3288 strings)

[CI skip]
 2018-03-11 13:00:48 +01:00
Weblate
d25f36570e Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2018-03-11 13:00:46 +01:00
Akom Chotiphantawanon
23fb9e6715 Translated using Weblate (Thai) 
Currently translated at 29.0% (932 of 3208 strings)

[CI skip]
 2018-03-11 13:00:44 +01:00
Michal Čihař
9050b2a519 Merge branch 'QA_4_7' 2018-03-11 12:59:46 +01:00
Michal Čihař
c09e2b55ff Ignore site with expired SSL cert for now 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-03-11 12:59:32 +01:00
Isaac Bennetch
a9f5d51f2d Merge remote-tracking branch 'origin/QA_4_7' 2018-03-09 17:02:49 -05:00
Isaac Bennetch
c039e3a646 Add a note about VARIABLE text being case-sensitive; see #14062 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-09 17:00:55 -05:00
Maurício Meneghini Fauth
a01a2ee8be Upgrade JavaScript dependencies 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-06 13:03:35 -03:00
Isaac Bennetch
2be772e5a8 Improve and update build instructions 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-05 19:01:32 -05:00
Isaac Bennetch
ff86a1b0f8 Fix merge conflicts from 4.7.9 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-05 13:18:10 -05:00
Isaac Bennetch
9c11715e75 Prepare for 4.7.10-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-05 13:14:46 -05:00
Isaac Bennetch
8775f7a3b0 Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-05 10:43:28 -05:00
Isaac Bennetch
80914e327e Adding composer lock for 4.7.9 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-05 10:37:10 -05:00
Isaac Bennetch
b3b170da62 Prepare for version 4.7.9 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-05 10:35:48 -05:00
Isaac Bennetch
c9513bb7bb Improvements to the phrasing of the documentation. 
Mostly taken from suggestions by anjalisasi in
https://github.com/phpmyadmin/phpmyadmin/pull/13901
https://github.com/phpmyadmin/phpmyadmin/pull/13902
https://github.com/phpmyadmin/phpmyadmin/pull/13903

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-05 10:15:44 -05:00
Michal Čihař
b315e1cac5 Move changelog entry for #13940 2018-03-05 15:48:12 +01:00
Michal Čihař
92b8c16c25 Merge branch 'QA_4_7' 2018-03-05 15:47:36 +01:00
Michal Čihař
3034a23fed Revert "Honor arg_separator in AJAX requests" 
This reverts commit 984c6a0054.

See #13940

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-03-05 15:46:32 +01:00
Michal Čihař
16c6c114fa Revert "Fix missing addition operator on string concatenation" 
This reverts commit a0024aa041.
 2018-03-05 15:45:54 +01:00
Yaron Shahrabani
539bea6db8 Translated using Weblate (Hebrew) 
Currently translated at 15.9% (524 of 3288 strings)

[CI skip]
 2018-03-05 14:36:58 +01:00
Yaron Shahrabani
93da5b0af8 Translated using Weblate (Hebrew) 
Currently translated at 16.5% (532 of 3208 strings)

[CI skip]
 2018-03-05 14:36:51 +01:00
Maurício Meneghini Fauth
821d33704c
Merge pull request #14040 from mauriciofauth/issue-13918 
Add Yarn install to create-release script
 2018-03-03 15:27:36 -03:00
Saksham Gupta
0eaf1b108c Add cookie restore and empty save error 
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
 2018-03-02 11:50:13 +05:30
Isaac Bennetch
466e11f882 Merge remote-tracking branch 'origin/master' 2018-03-01 23:33:42 -05:00