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

116660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Desportes
e93005fd58
Merge #15744, #15743 - Fix - #15717 
Pull-request: #15744
Closes: #15743
Fixes: #15717
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-12 18:53:11 +01:00
Jayati Shrivastava
f14d675308
revert change introduced by pr #15718 and fix #15718 
Signed-off-by: Jayati Shrivastava <gaurijove@gmail.com>
 2020-01-12 18:46:23 +01:00
William Desportes
4512ada9eb
Fix php error when creating a relation between a table and a view in Designer 
Yes, that does not make sense but it should not throw and error
"Uncaught TypeError: mb_strtoupper() expects parameter 1 to be string"

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-12 18:29:34 +01:00
William Desportes
7ad2b9461f
Add ChangeLog entry for #15773 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-12 18:03:47 +01:00
William Desportes
502ded328e
Merge #15778 - Fix - #15773 a view named 'views' adds an expand button 
Pull-request: #15778
Fixes: #15773
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-12 17:55:50 +01:00
Yash Bothra
6cac79b867 #15773 fixed unexpected grouping 
Signed-off-by: Yash Bothra <yashrajbothra786@gmail.com>
 2020-01-12 13:13:41 +05:30
William Desportes
0606c9c0b9
Add ChangeLog entry for #15741 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-11 16:27:52 +01:00
William Desportes
30a0bfdc31
Merge #15766 - Fix #15741 - Fatal javascript error on clicking "Pick from Central Columns" 
Pull-request: #15766
Fixes: #15741
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-11 16:26:10 +01:00
Yash Bothra
07226e1160
Fix #15741 - Fatal javascript error on clicking "Pick from Central Columns" 
Signed-off-by: Yash Bothra <yashrajbothra786@gmail.com>
 2020-01-11 16:03:10 +01:00
William Desportes
33c6a1c17a
Add ChangeLog entry for cc58506d14 
Ref: cc58506d14
Fixed a typo in 99e70491b7
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-11 15:45:57 +01:00
William Desportes
cc58506d14
Fix php error "Trying to access array offset on value of type null" 
When using column distinct feature

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-11 15:44:04 +01:00
William Desportes
99e70491b7
Add ChangeLog entry for #15772 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-10 21:42:09 +01:00
William Desportes
6981910c8c
Fix #15772 - Error code 500 during pagination in table overview 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-10 21:40:03 +01:00
William Desportes
acac4b14e6
Add ChangeLog entry for #15767 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-10 12:40:25 +01:00
William Desportes
3f801391ce
Merge #15771 - fix #15767 cannot copy user account on 5.0 - error # 1133 
Pull-request: #15771
Fixes: #15767
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-10 12:33:54 +01:00
Yash Bothra
7c862e5c30 #15767 fixed by changing === to !== 
Signed-off-by: Yash Bothra <yashrajbothra786@gmail.com>
 2020-01-10 15:34:41 +05:30
William Desportes
62197351db
Fix warning on php 8.0 "ob_end_clean(): failed to delete buffer. No buffer to delete" 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-09 23:10:05 +01:00
William Desportes
d806c17a3d
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-09 20:11:43 +01:00
William Desportes
2ab95fc47c
Fix CI after sql-parser version 4.5.0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-09 20:04:39 +01:00
William Desportes
90f7e9068b
Add ChangeLog entry for e68d0d6aab 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-09 19:43:34 +01:00
William Desportes
e68d0d6aab
Fix deprecation warning on export page "implode(): Passing glue string after array is deprecated. Swap the parameters" 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-09 19:39:11 +01:00
Isaac Bennetch
f8412ea633 Prepare for version 5.0.2-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-01-07 21:46:55 -05:00
Isaac Bennetch
8c2b30bd1f Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-01-07 21:07:21 -05:00
Isaac Bennetch
645989e87a Adding composer lock for 5.0.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-01-07 21:03:54 -05:00
Isaac Bennetch
6c12159a0b Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-01-07 21:01:27 -05:00
Isaac Bennetch
b732639282 Adding composer lock for 4.9.4 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-01-07 20:58:59 -05:00
Isaac Bennetch
dc1e81e6b2 Fix merge conflicts from QA_4_9 and prepare for 5.0.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-01-07 20:56:25 -05:00
William Desportes
e16ccbdbc7
Add ChangeLog entry for #15351 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-07 21:12:30 +01:00
William Desportes
21c1bb81b0
Merge #15749 - Fix #15351 - retain 2FA setting 
Pull-request: #15749
Fixes: #15351
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-07 21:11:09 +01:00
Jayati Shrivastava
7e007f8b7c
Fix #15351 - retain 2FA setting 
Signed-off-by: Jayati Shrivastava <gaurijove@gmail.com>
 2020-01-07 21:06:22 +01:00
Isaac Bennetch
fa53b374ad Prepare for version 4.9.4 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-01-07 14:10:45 -05:00
Isaac Bennetch
ce10567b74 Merge remote-tracking branch 'security/fix/293-sql-injection' into QA_4_9 2020-01-07 14:07:17 -05:00
William Desportes
af100abddf
Add more tests for testCookieDecrypt 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-07 19:07:27 +01:00
bepsvpt
fd553a45d5
Update and revert "Remove a test that can not be predictible" 
This reverts commit a6155da6a9.

Co-authored-by: bepsvpt <og7lsrszah6y3lz@infinitefa.email>

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-07 21:02:04 +08:00
Timothy Aditya Sutantyo
b74ed2f98e
Translated using Weblate (Indonesian) 
Currently translated at 79.4% (2644 of 3332 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/id/
Signed-off-by: Timothy Aditya Sutantyo <timisutantyo@gmail.com>
 2020-01-07 02:21:20 +01:00
William Desportes
a6155da6a9
Remove a test that can not be predictible 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-07 00:28:35 +01:00
William Desportes
5e6ca74b1f
Add ChangeLog entry for #14299 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-07 00:13:34 +01:00
William Desportes
12270a49cf
Merge #15747 - fix #14299 - PMA_makegrid is not defined 
Pull-request: #15747
Fixes: #14299
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-07 00:11:09 +01:00
William Desportes
874c5afd59
Add ChangeLog entry for #14875 2020-01-06 23:41:29 +01:00
William Desportes
a5ec07f0e9
Merge #15753 - fix #14875 shp import tests where failing 
Pull-request: #15753
Fixes: #14875
Closes: #15753
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 23:40:56 +01:00
William Desportes
551b2262bc
Remove allow failure for dbase on build matrix and check it is active 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 23:14:52 +01:00
William Desportes
3c701066c3
Add ChangeLog entry for #15742 
Ref: 4450bcec55
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 23:14:14 +01:00
William Desportes
4450bcec55
Merge #15742 - remove double slash on TempDir 
Pull-request: #15742
Closes: #15742
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 23:04:43 +01:00
bepsvpt
879b7fe681
fix #14875 - fix shp filename sanitization and update test 
Co-authored-by: bepsvpt <og7lsrszah6y3lz@infinitefa.email>

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 23:00:55 +01:00
William Desportes
4129e16edc
Fix #15752 - use DIRECTORY_SEPARATOR instead of slash 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 21:45:49 +01:00
William Desportes
21c2bcdbb3
Add Unit tests 
Closes #15752

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 21:45:49 +01:00
bepsvpt
07066775c9
remove duplicate slash for tempdir path 
Co-authored-by: bepsvpt <og7lsrszah6y3lz@infinitefa.email>

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 21:45:49 +01:00
William Desportes
bd808c8d4f
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 15:23:34 +01:00
William Desportes
156231d5bf
Fix not isset $GLOBALS['dblist'] 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 15:22:35 +01:00
William Desportes
d01dab811c
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 14:25:25 +01:00