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

104652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
d6df4fe290 Merge branch 'QA_4_5' 2016-01-19 09:00:27 +01:00
Michal Čihař
7db4672aeb Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-19 08:59:56 +01:00
Michal Čihař
59036e1562 Simplify test to avoid need fo multiline regexp 
Cherry picked from master to avoid test suite failures on PHP 7.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 08:59:14 +01:00
Weblate
8beee54526 Merge remote-tracking branch 'origin/master' 2016-01-18 23:56:13 +01:00
BlackyPanther
f35c670ab4 Translated using Weblate (German) 
Currently translated at 99.8% (3213 of 3219 strings)

[CI skip]
 2016-01-18 23:56:10 +01:00
Marc Delisle
7aed59efd2 Substitute these not not operators with their real meaning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-18 17:55:56 -05:00
Marc Delisle
3c919fd63d Fix #11866 Direct calling of functions.js #11866 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-18 07:31:29 -05:00
Weblate
ef3bcd4793 Merge remote-tracking branch 'origin/master' 2016-01-18 08:02:35 +01:00
Xosé Calvo
4799920c3f Translated using Weblate (Galician) 
Currently translated at 85.3% (2748 of 3219 strings)

[CI skip]
 2016-01-18 08:02:33 +01:00
Atul Pratap Singh
1f2f963c4b Merge pull request #11861 from zixtor/template 
Templates: passing data incrementally and passing functions: Issue #11857
 2016-01-18 12:32:28 +05:30
Atul Pratap Singh
e1a8fc758a Change some function names 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-18 11:25:41 +05:30
Michal Čihař
1e6e296185 Merge remote-tracking branch 'origin/QA_4_5' 2016-01-17 18:45:38 +01:00
Weblate
e6a0694cb0 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-17 18:44:29 +01:00
Marc Delisle
b621d15adf Translated using Weblate (French) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-17 18:44:27 +01:00
Michal Čihař
2d658ccad0 Translated using Weblate (Czech) 
Currently translated at 95.7% (3075 of 3210 strings)

[CI skip]
 2016-01-17 18:44:26 +01:00
Michal Čihař
f141cb1463 Merge branch 'QA_4_5' 2016-01-17 18:44:09 +01:00
Michal Čihař
bfaa77ef21 Fix password change on MariaDB 10.1 and newer 
Use SET PASSWORD which seems again do the correct thing there.

Fixes #11855

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-17 18:43:32 +01:00
Michal Čihař
20a508358b Fix comment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-17 18:35:42 +01:00
Atul Pratap Singh
4e35951b70 Provide for optional parameters while instantiating and rendering template 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-17 22:15:29 +05:30
Michal Čihař
b231ed9dc7 Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-17 16:42:00 +01:00
Marc Delisle
a96fc8d224 Translated using Weblate (French) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-01-17 13:37:51 +01:00
Weblate
a703c49a79 Merge remote-tracking branch 'origin/master' 2016-01-17 09:25:51 +01:00
Massimiliano Caniparoli
a42470eb7f Translated using Weblate (Italian) 
Currently translated at 99.9% (3217 of 3219 strings)

[CI skip]
 2016-01-17 09:25:50 +01:00
Michal Čihař
0429a10426 Improve composer meta information 
- Add link to documentation
- Mark non feature branches

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-17 09:25:17 +01:00
Marc Delisle
2f3360993f Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-16 08:30:37 -05:00
Marc Delisle
6d399342ce Merge commit '19085e7' 2016-01-16 08:28:43 -05:00
Marc Delisle
7d4c570b76 Undefined index: is_ajax_request 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-16 08:27:11 -05:00
Weblate
c12d6fc25c Merge remote-tracking branch 'origin/master' 2016-01-16 13:16:53 +01:00
Domen
1307a4db30 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-01-16 13:16:52 +01:00
Marc Delisle
8152201fb9 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-16 07:16:41 -05:00
Atul Pratap Singh
8bdcd7d3c0 Fix template test case 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-16 17:00:32 +05:30
Domen
19085e7f77 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-16 01:16:53 +01:00
Marc Delisle
8d117ac3fa 4.5.5-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-15 16:53:26 -05:00
Marc Delisle
206a52136e Merge commit '0f7927e' 2016-01-15 16:52:56 -05:00
Weblate
7dfaeead42 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-15 22:52:39 +01:00
Burak Yavuz
732274b34c Translated using Weblate (Turkish) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-15 22:52:38 +01:00
Xosé Calvo
a8d866a746 Translated using Weblate (Galician) 
Currently translated at 86.2% (2769 of 3210 strings)

[CI skip]
 2016-01-15 22:52:37 +01:00
Marc Delisle
0f7927e16f 4.5.5-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-15 16:52:26 -05:00
Weblate
03882ea74b Merge remote-tracking branch 'origin/master' 2016-01-15 22:40:47 +01:00
Burak Yavuz
793e224eef Translated using Weblate (Turkish) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-01-15 22:40:46 +01:00
Xosé Calvo
7ab0251393 Translated using Weblate (Galician) 
Currently translated at 85.3% (2747 of 3219 strings)

[CI skip]
 2016-01-15 22:40:43 +01:00
Isaac Bennetch
8db478c403 ChangeLog entry for new ssl_verify directive 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-01-15 16:38:33 -05:00
Joel Hutchinson
ff014ac34d Added the new SSL check disable flag 
MySQL 5.6 or later requests peer_name validation of the SSL. This causes most self signed certificates to fail validation.
In PMA, you only get a vague 2002 connection error as a result.
As of PHP 5.6.16, a new flag exists to disable the check and allows the
connection to proceed.
See https://bugs.php.net/bug.php?id=68344 and #11838

Signed-off-by: Joel Hutchinson joel.hutchinson@onlinecommercegroup.com
 2016-01-15 16:32:40 -05:00
dingo thirteen
169c6ce49b Translated using Weblate (Dutch) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-01-15 19:19:43 +01:00
Erwin Bronkhorst
dbb267308d Translated using Weblate (Dutch) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-15 18:35:14 +01:00
Marc Delisle
0ff1c00d77 Functions used before being defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-15 07:54:24 -05:00
Weblate
af4151e12e Merge remote-tracking branch 'origin/master' 2016-01-15 11:22:13 +01:00
Burak Yavuz
fd37879f29 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-01-15 11:22:13 +01:00
Giovanni Sora
ab33869a8e Translated using Weblate (Interlingua) 
Currently translated at 72.6% (2338 of 3216 strings)

[CI skip]
 2016-01-15 11:22:12 +01:00
Deven Bansod
62c4bb451d Merge pull request #11858 from devenbansod/add_check_priv_tests 
Refactor check_user_privileges.lib.php and add test cases for 2 functions
 2016-01-15 15:52:05 +05:30