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

116919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Bennetch
4520c9d172 Adding composer lock for 5.0.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-03-21 00:17:30 -04:00
Isaac Bennetch
6f698b87b3 Fix tests for phpunit 9 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-03-20 23:02:44 -04:00
Isaac Bennetch
8c847c55ca Merge branch 'QA_4_9' into QA_5_0 2020-03-20 23:01:53 -04:00
Isaac Bennetch
3133be3e82 Prepare for 5.0.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-03-20 23:01:37 -04:00
Isaac Bennetch
2ee7e9840f Fix transformation test 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-03-20 23:00:57 -04:00
Isaac Bennetch
f98618a77c Merge branch 'QA_4_9' into QA_5_0 2020-03-20 22:12:50 -04:00
Isaac Bennetch
28a79c9d09 Prepare for version 4.9.5 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-03-20 22:02:51 -04:00
Isaac Bennetch
0d4c7c66a5 Merge branch 'QA_4_9' into QA_5_0 2020-03-20 22:01:14 -04:00
Isaac Bennetch
0f9fff3846 Merge remote-tracking branch 'origin/QA_4_9' into QA_5_0 2020-03-20 21:50:45 -04:00
Isaac Bennetch
10c9709f7d Merge branch 'QA_4_9-security' into QA_4_9 2020-03-20 20:31:11 -04:00
Isaac Bennetch
d193fdc31b ChangeLog for 4.9.5 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-03-20 20:27:36 -04:00
Isaac Bennetch
1aee403733
Merge pull request #307 from phpmyadmin/security/302 
Fix External Transformation RCE
 2020-03-20 19:07:35 -04:00
Isaac Bennetch
163f05cac1 Improve warning message for external transformation 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-03-20 18:58:15 -04:00
Isaac Bennetch
155f3b2b41
Merge pull request #297 from phpmyadmin/security/296 
SQL Injection in SearchController
 2020-03-20 18:21:05 -04:00
Isaac Bennetch
9ce61ea0e5
Merge pull request #306 from phpmyadmin/security/295 
Fix SQL Injection and Data Extraction with XS-Search
 2020-03-19 22:38:27 -04:00
Isaac Bennetch
1a1f00bad4 Corrected documentation for External Transformation 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-03-19 22:34:35 -04:00
William Desportes
307717bc49
Add ChangeLog entry for #15224 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-20 00:17:30 +01:00
William Desportes
646f83cbfd
Merge #16026 - Fixes #15224 - Don't fire keyboard shortcuts while SQL query area is focused 
Pull-request: #16026
Fixes #15224

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-20 00:16:03 +01:00
William Desportes
bc982466f0
Add ChangeLog entry for #15898 
Ref: e1f5dfcd16
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-19 23:21:58 +01:00
William Desportes
e1f5dfcd16
Merge #16004 - Fix #15898 - escape tbl_storage_engine argument 
Pull-request: #16004
Fixes: #15898
Security: ca42395ee4
Ref: https://github.com/phpmyadmin/phpmyadmin/pull/16004
Ref: https://github.com/phpmyadmin/phpmyadmin/issues/15898
For now I do not have a CVE code for this one.
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-19 23:21:33 +01:00
William Desportes
abcf875ae2
Merge #16034 - Fix #16033 Remove composer bin files 
Pull-request: #16034
Fixes: #16033
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-19 23:17:16 +01:00
William Desportes
ab43e7a4a1
Add ChangeLog entry for #16033 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-19 21:59:54 +01:00
William Desportes
166938b318
Fix #16033 - remove bin files from non source version of phpMyAdmin 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-19 21:58:38 +01:00
Isaac Bennetch
51d54d62bb
Merge pull request #310 from phpmyadmin/298 
Another instance to escape username and password when changing password
 2020-03-19 09:58:40 -04:00
yagoub fadel
2cd86fa308
Translated using Weblate (Arabic) 
Currently translated at 49.3% (1643 of 3332 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/ar/
Signed-off-by: yagoub fadel <yagoub76@gmail.com>
 2020-03-19 12:36:43 +01:00
William Desportes
7035cb978a
Translated using Weblate (Arabic) 
Currently translated at 49.3% (1643 of 3332 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/ar/
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-19 12:36:43 +01:00
yagoub fadel
f8035a7c62
Translated using Weblate (Arabic) 
Currently translated at 49.5% (1639 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/ar/
Signed-off-by: yagoub fadel <yagoub76@gmail.com>
 2020-03-19 12:36:27 +01:00
William Desportes
748864742b
Translated using Weblate (Arabic) 
Currently translated at 49.5% (1639 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/ar/
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-19 12:36:27 +01:00
Isaac Bennetch
3258978c38 More escaping of username and password. 
Improves upon 89fbcd7c39

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-03-18 22:16:53 -04:00
William Desportes
0bd0e72908
Translated using Weblate (Arabic) 
Currently translated at 49.5% (1638 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/ar/
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-18 10:57:09 +01:00
yagoub fadel
596e1841d2
Translated using Weblate (Arabic) 
Currently translated at 49.2% (1642 of 3332 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/ar/
Signed-off-by: yagoub fadel <yagoub76@gmail.com>
 2020-03-18 05:36:47 +01:00
yagoub fadel
2bd75fb4cb
Translated using Weblate (Arabic) 
Currently translated at 49.5% (1638 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/ar/
Signed-off-by: yagoub fadel <yagoub76@gmail.com>
 2020-03-18 05:36:27 +01:00
Maurรญcio Meneghini Fauth
799ce5e3a6 Add warning for external transformations option usage 
Signed-off-by: Maurรญcio Meneghini Fauth <mauricio@fauth.dev>
 2020-03-17 19:46:20 -03:00
Maurรญcio Meneghini Fauth
13e6a01838 Add support for E_USER_DEPRECATED in the error handler 
Signed-off-by: Maurรญcio Meneghini Fauth <mauricio@fauth.dev>
 2020-03-17 19:37:31 -03:00
Isaac Bennetch
0184c2884e
Merge pull request #308 from phpmyadmin/security/303 
Fix SQL Injection in getCurrentUserAndHost
 2020-03-15 20:42:26 -04:00
yagoub fadel
439bcd344b
Translated using Weblate (Arabic) 
Currently translated at 48.3% (1612 of 3332 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/ar/
Signed-off-by: yagoub fadel <yagoub76@gmail.com>
 2020-03-15 09:38:18 +01:00
Burak Yavuz
736446e952
Translated using Weblate (Turkish) 
Currently translated at 100.0% (3332 of 3332 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/tr/
Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
 2020-03-15 09:38:16 +01:00
yagoub fadel
5d98877e91
Translated using Weblate (Arabic) 
Currently translated at 48.7% (1613 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/ar/
Signed-off-by: yagoub fadel <yagoub76@gmail.com>
 2020-03-15 09:36:56 +01:00
Burak Yavuz
2a28877670
Translated using Weblate (Turkish) 
Currently translated at 100.0% (3307 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/tr/
Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
 2020-03-15 09:36:50 +01:00
William Desportes
3588531671
Merge QA_4_9 into QA_5_0 
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-14 00:24:00 +01:00
JayEn84
1c5ebf7de7
No keyboard shortcuts with focused SQL query area 
Fixes a bug where the keyboard shortcuts functions fire while typing in the SQL query area. Problem is that the SQL query area is not (always) a `<textarea>` but a `<div contenteditable="true">`

Signed-off-by: Jan Nitsche <noreply@jan-nitsche.de>
Signed-off-by: JayEn84 <4518738+JayEn84@users.noreply.github.com>
 2020-03-12 14:08:28 +01:00
William Desportes
f12364b8fd
Fix update-po command (sed) on MacOSX 
[ci skip]
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-12 13:54:46 +01:00
William Desportes
f0c4c96211
Update po files 
[CI skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-12 13:10:27 +01:00
William Desportes
e9e7696962
Improve update-po script and add match-twig-cache script 
- Make update-po script return the same order on all workstations
- Make it work on MacOSX
- Remove .phtml extension
- Exclude node_modules folder
- match-twig-cache is made to replace templates by the real file and --reverse way
- this change is made so the order is kept between po files updates

I want to stop unreadable diffs between po files updates. 

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-12 13:10:27 +01:00
William Desportes
7618fbf886
Translated using Weblate (Arabic) 
Currently translated at 48.2% (1607 of 3332 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/ar/
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-11 09:19:14 +01:00
William Desportes
efa811e932
Translated using Weblate (Arabic) 
Currently translated at 48.3% (1599 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/ar/
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-11 09:19:12 +01:00
yagoub fadel
bd7e517f51
Translated using Weblate (Arabic) 
Currently translated at 48.2% (1607 of 3332 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/ar/
Signed-off-by: yagoub fadel <yagoub76@gmail.com>
 2020-03-10 23:33:16 +01:00
yagoub fadel
7396ef4515
Translated using Weblate (Arabic) 
Currently translated at 48.3% (1599 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/ar/
Signed-off-by: yagoub fadel <yagoub76@gmail.com>
 2020-03-10 23:33:00 +01:00
William Desportes
5275a8ccc1
Add ChangeLog entry for 963f669634 
Pull-request: #16023

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-09 22:47:24 +01:00
William Desportes
963f669634
Merge #16023 - Fix failure if relational display field value is NULL - "Display column for relationships" 
Pull-request: #16023
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-09 22:46:17 +01:00