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

10878 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
676986aa4e Merge branch 'QA_4_8' 2018-07-04 20:45:32 -03:00
Maurício Meneghini Fauth
865f16a7f6 Add ChangeLog entries for #14390 and #14382 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-04 20:44:01 -03:00
Maurício Meneghini Fauth
da21c50f87 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-04 19:56:41 -03:00
William Desportes
71ae2b2e68 Fix for #14171 - 2FA QR PHPGD 
Closes: #14171
Signed-off-by: William Desportes <williamdes@wdes.fr>
(cherry picked from commit 49fae81505)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-04 19:54:54 -03:00
Maurício Meneghini Fauth
b44e1c4fc6 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-04 19:12:26 -03:00
Maurício Meneghini Fauth
22a432eaac Add ChangeLog entry for #14377 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-04 19:09:01 -03:00
Maurício Meneghini Fauth
6da0700116 Merge branch 'QA_4_8' 2018-07-03 22:17:56 -03:00
Maurício Meneghini Fauth
8a7b631bf8 Add ChangeLog entry for #14327 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 22:16:44 -03:00
Maurício Meneghini Fauth
8343e67759 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 21:22:11 -03:00
Maurício Meneghini Fauth
9bbc4c3441 Add ChangeLog entry for #14045 
Fix trailing whitespace in js/functions.js

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 21:18:39 -03:00
Maurício Meneghini Fauth
a827bec4aa Add ChangeLog entry for #14229 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 20:52:49 -03:00
Maurício Meneghini Fauth
1f291fc709 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 20:18:23 -03:00
Maurício Meneghini Fauth
4ac8139540 Add ChangeLog entry for #14333 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-07-03 20:15:09 -03:00
Isaac Bennetch
e4a76a1d12 Merge branch 'QA_4_8' 2018-06-29 10:58:50 -04:00
Isaac Bennetch
fc5586fb6a ChangeLog entry for pull request #14398, fixing bug #14314 
This change was cherry-picked to commit
b0ec6b69e9

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-29 10:55:47 -04:00
Isaac Bennetch
d1360f46ce Merge branch 'QA_4_8' 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 13:54:08 -04:00
Isaac Bennetch
42f36cce39 Prepare for version 4.8.3-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 13:41:45 -04:00
Isaac Bennetch
d363fa02c6 Prepare for version 4.8.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 11:50:09 -04:00
Isaac Bennetch
2867a95523 Update Changelog for RCE/file inclusion security issue 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 11:44:16 -04:00
Isaac Bennetch
ead0d0d985 ChangeLog entry for PMASA-2016-03, XSS in Designer. 
This is commit 6943fff873, cherry-picked
from master.

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-19 11:55:41 -04:00
Maurício Meneghini Fauth
482c7bc3ca Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-15 15:38:02 -03:00
Maurício Meneghini Fauth
167f6a7223 Add ChangeLog entry for #14225 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-15 15:31:09 -03:00
Maurício Meneghini Fauth
4083e30909 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-13 21:41:53 -03:00
Maurício Meneghini Fauth
d96b740284 Add ChangeLog entry for #14370 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-13 21:37:25 -03:00
Isaac Bennetch
0944c44bef Merge branch 'QA_4_8' 2018-05-24 23:35:00 -04:00
Isaac Bennetch
5d85c6d768 Prepare for 4.8.2-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-05-24 23:31:18 -04:00
Isaac Bennetch
a349504b0e Prepare for 4.8.1 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-05-24 22:37:57 -04:00
Maurício Meneghini Fauth
447f7ae3d1 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-19 16:33:10 -03:00
Maurício Meneghini Fauth
e7ee749650 Add ChangeLog entry for #14309 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-19 15:01:25 -03:00
Maurício Meneghini Fauth
f5c787e526 Add ChangeLog entry for #13893 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 19:34:58 -03:00
Maurício Meneghini Fauth
fef5966c3d Merge branch 'QA_4_8' 2018-05-16 15:01:04 -03:00
Maurício Meneghini Fauth
fcd0ee9945 Add ChangeLog entry for #14066 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 14:57:32 -03:00
Maurício Meneghini Fauth
d8c16bce6b Add ChangeLog entry for #14296 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 01:09:16 -03:00
Maurício Meneghini Fauth
db708a4da6 Merge branch 'QA_4_8' 2018-05-15 03:59:42 -03:00
Maurício Meneghini Fauth
fefcac214d Add ChangeLog entry for #14278 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-15 03:57:50 -03:00
Madhura Jayaratne
80f93d6f02 Resolved merge conflict 2018-05-15 05:38:55 +10:00
Madhura Jayaratne
38c800c972 Fix #14289 Fix multi-column sorting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-05-15 05:25:45 +10:00
Maurício Meneghini Fauth
f262824d45 Merge branch 'QA_4_8' 2018-05-12 04:59:59 -03:00
Maurício Meneghini Fauth
fd7ec14fc2 Add ChangeLog entry for #14189 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-12 04:57:13 -03:00
Maurício Meneghini Fauth
287383f3bd Merge branch 'QA_4_8' 2018-05-12 03:58:32 -03:00
Maurício Meneghini Fauth
4abc2334cc Add ChangeLog entry for #14125 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-12 03:56:13 -03:00
Maurício Meneghini Fauth
d813e920ba Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-08 23:21:00 -03:00
Maurício Meneghini Fauth
3d632e2931 Add ChangeLog entry for #14249 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-08 23:17:39 -03:00
Maurício Meneghini Fauth
dc72341b75 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-08 07:44:19 -03:00
Maurício Meneghini Fauth
de250fbae3 Fix MariaDB 10.2 current_timestamp() 
Fixes #13968 and fixes #13999. Closes #14177.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-08 07:39:53 -03:00
Madhura Jayaratne
d564bf275f Merge branch 'QA_4_8' 2018-05-08 07:11:44 +10:00
Madhura Jayaratne
e6cc4fbbbc Fix #14264 Linking for 'Distinct values' broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-05-08 07:10:06 +10:00
Maurício Meneghini Fauth
12e24ee4db Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-06 21:20:01 -03:00
Maurício Meneghini Fauth
4ee541a000 Add ChangeLog entry for #14260 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-06 21:17:50 -03:00
Madhura Jayaratne
bb9fc5d6e9 Merge branch 'QA_4_8' 2018-05-06 09:00:52 +10:00