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

104675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
0df7eeecc1 Merge branch 'QA_4_5' 2016-01-19 17:39:12 +01:00
Michal Čihař
91bfa27ee2 Do not cache data if releases attribute is missing 
Issue #11874

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 17:38:22 +01:00
Marc Delisle
147fbcd508 Translated using Weblate (French) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-01-19 13:42:51 +01:00
Michal Čihař
c036b92b8b Merge branch 'QA_4_5' 2016-01-19 11:59:52 +01:00
Michal Čihař
a11475efe3 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-19 11:59:45 +01:00
Michal Čihař
1431625d68 Fixes possible error when query is empty/not analyzed 
Fixes #11873

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:45:52 +01:00
Michal Čihař
f0e4b242ea Merge branch 'QA_4_5' 2016-01-19 11:40:06 +01:00
Michal Čihař
fbb3529fa8 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-19 11:39:32 +01:00
Michal Čihař
a5affed07a Validate database before starting designer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:38:50 +01:00
Michal Čihař
0f119bb329 Merge branch 'QA_4_5' 2016-01-19 11:31:41 +01:00
Michal Čihař
76e003a8cb Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-19 11:27:26 +01:00
Michal Čihař
5359d9a968 Check for parameter before using it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:26:59 +01:00
Michal Čihař
a6ae24741e Validate parameters before use 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:23:36 +01:00
Michal Čihař
897a844581 Check for parameter before using it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:23:36 +01:00
Michal Čihař
1523c4b364 Gracefully handle calling sql.php without SQL query 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:23:36 +01:00
Michal Čihař
0490d20408 Check for parameter before using it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 10:48:32 +01:00
Michal Čihař
8e99da9685 Merge branch 'QA_4_5' 2016-01-19 10:45:06 +01:00
Michal Čihař
32c7a54076 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-19 10:44:58 +01:00
Michal Čihař
dcdeee28eb Gracefully handle errors in regex based javascript search 
User can write any invalid regex and we should handle this gracefully.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 10:44:03 +01:00
Michal Čihař
9947f17c3c Merge branch 'QA_4_5' 2016-01-19 09:01:13 +01:00
Michal Čihař
d6df4fe290 Merge branch 'QA_4_5' 2016-01-19 09:00:27 +01:00
Weblate
62f3c7e3cf Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-19 09:00:15 +01:00
BlackyPanther
0ef9cfc300 Translated using Weblate (German) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-19 09:00:13 +01:00
Xosé Calvo
8d006f1a23 Translated using Weblate (Galician) 
Currently translated at 86.2% (2770 of 3210 strings)

[CI skip]
 2016-01-19 09:00:13 +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