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

116868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Desportes
4e4670e9c2
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-23 00:08:27 +01:00
William Desportes
293d273632
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-23 00:06:39 +01:00
William Desportes
3f9ac1dc98
Fix engine can be null 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-23 00:05:55 +01:00
William Desportes
718db2af83
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-22 23:52:08 +01:00
William Desportes
4bde7fb6af
Fix a merge issue reported by Scrutinizer 
- isRemoteBranch was undefined

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-22 23:50:37 +01:00
William Desportes
bfe1afb542
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-22 13:24:33 +01:00
Isaac Bennetch
f5b4fe69da Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-11-22 03:10:51 -05:00
Isaac Bennetch
aaf114f8e3 Adding composer lock for 5.0.0-rc1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-11-22 03:07:12 -05:00
Isaac Bennetch
2a1ab3016d Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-11-22 03:06:04 -05:00
Isaac Bennetch
4e615cc5e5 Adding composer lock for 4.9.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-11-22 03:03:42 -05:00
Isaac Bennetch
3cf66e239a Prepare for version 5.0.0-rc1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-11-21 22:04:04 -05:00
Isaac Bennetch
478a75dce5 Merge branch 'QA_4_9' into QA_5_0 2019-11-21 22:02:22 -05:00
Isaac Bennetch
00f72f1171 Prepare for version 4.9.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-11-21 22:00:53 -05:00
Isaac Bennetch
c1e1816af7 Fix merge conflicts in ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-11-21 21:57:12 -05:00
Isaac Bennetch
b6e78406f3 Changelog for 4.9.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-11-21 21:56:11 -05:00
William Desportes
66192e31f5
Merge branch 'QA_4_9-security' into QA_5_0-security 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-22 01:44:24 +01:00
William Desportes
ef9aa68bb5
Merge branch 'QA_4_9' into QA_4_9-security 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-22 01:42:52 +01:00
William Desportes
a84b1e5daf
Update po files 
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-22 01:33:35 +01:00
William Desportes
f1dc9fface
Merge branch 'QA_5_0-security' into master-security 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-22 01:32:56 +01:00
William Desportes
106eea5968
Update po files 
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-22 01:31:43 +01:00
William Desportes
c7075fb450
Merge branch 'QA_4_9-security' into QA_5_0-security 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-22 01:30:53 +01:00
William Desportes
ad3c3ffd74
Update po files 
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-22 01:29:26 +01:00
William Desportes
718ceadeb6
Merge branch 'QA_5_0-security' into master-security 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-22 01:23:51 +01:00
William Desportes
28bdc02c3c
Merge branch 'QA_4_9-security' into QA_5_0-security 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-22 01:19:16 +01:00
William Desportes
348904fc12
Add ChangeLog entry for #15327 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-22 00:31:58 +01:00
William Desportes
70d5ba995c
Merge #15579 - Fix checkbox selection 
Pull-request: #15579
Fixes: #15578
Fixes: #15327

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-22 00:30:19 +01:00
William Desportes
51acbf5356
Merge designer security fix 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-22 00:25:33 +01:00
Hugues Peccatte
3255e4ad7b Split Util class regarding the responsabilities (#15567) 
PhpMyAdmin\Util is a very huge class with a lot of responsabilities.

There is a lot of work to split it, but this may be just a small start, waiting for a more normalized code.

* Split Util class regarding the responsabilities
* Split the buttonOrImage function

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-11-21 20:20:05 -03:00
Maurício Meneghini Fauth
3b0eff7035 Encapsulate checkboxesSel global into Functions object 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-11-21 18:53:11 -03:00
Olivier Humbert
5d62097329
Translated using Weblate (French) 
Currently translated at 100.0% (3333 of 3333 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
 2019-11-21 15:33:31 +01:00
Kongfa Warorot
e7f1f2be68
Translated using Weblate (Thai) 
Currently translated at 39.9% (1329 of 3333 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/th/
Signed-off-by: Kongfa Warorot <gongpha@hotmail.com>
 2019-11-21 15:33:30 +01:00
Burak Yavuz
cd13839b65
Translated using Weblate (Turkish) 
Currently translated at 100.0% (3333 of 3333 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/tr/
Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
 2019-11-21 15:33:28 +01:00
Olivier Humbert
fbdd44cc79
Translated using Weblate (French) 
Currently translated at 100.0% (3330 of 3330 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
 2019-11-21 15:33:26 +01:00
Kongfa Warorot
992a79d318
Translated using Weblate (Thai) 
Currently translated at 32.6% (1085 of 3330 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/th/
Signed-off-by: Kongfa Warorot <gongpha@hotmail.com>
 2019-11-21 15:33:25 +01:00
Burak Yavuz
30411bcc54
Translated using Weblate (Turkish) 
Currently translated at 100.0% (3330 of 3330 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>
 2019-11-21 15:33:23 +01:00
Olivier Humbert
3052f725e1
Translated using Weblate (French) 
Currently translated at 100.0% (3305 of 3305 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
 2019-11-21 15:33:21 +01:00
Kongfa Warorot
f1c8a4163c
Translated using Weblate (Thai) 
Currently translated at 40.5% (1337 of 3305 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/th/
Signed-off-by: Kongfa Warorot <gongpha@hotmail.com>
 2019-11-21 15:33:17 +01:00
Burak Yavuz
19cdf4f165
Translated using Weblate (Turkish) 
Currently translated at 100.0% (3305 of 3305 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>
 2019-11-21 15:33:05 +01:00
William Desportes
ff541af95d
Security patch for Designer and Designer visual mode 
Closes: phpmyadmin-security#286
Ref: CVE-2019-18622
Ref: PMASA-2019-5

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-21 07:55:50 +01:00
Isaac Bennetch
16959bfa8c
Merge pull request #285 from phpmyadmin/security/284 
Escape Git information on the index page
 2019-11-21 00:29:57 -05:00
Isaac Bennetch
81af472123
Merge pull request #289 from phpmyadmin/QA_4_9+designer-changes 
Designer changes and fixes for 4.9
 2019-11-21 00:26:01 -05:00
Maurício Meneghini Fauth
c8bb2fef80 Merge branch 'QA_5_0' 2019-11-20 20:19:19 -03:00
Maurício Meneghini Fauth
ffb9b91153 Add Metro theme optional color schemes 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-11-20 20:17:42 -03:00
Maurício Meneghini Fauth
239a930271 Extract Metro's font-face rule to _font.scss file 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-11-20 19:49:01 -03:00
Saulo Soares de Toledo
988ae066a8 Fix table select range with Shift key 
Signed-off-by: Saulo Soares de Toledo <saulotoledo@gmail.com>
 2019-11-20 23:29:16 +01:00
Maurício Meneghini Fauth
c5bf75bbb0 Add _reboot.scss file and extract some rules to it 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-11-20 19:24:26 -03:00
Maurício Meneghini Fauth
418e4dbb2d Replace the obsolete tt HTML tag with samp tag 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-11-20 16:56:02 -03:00
William Desportes
2adf0ba1ac
Remove some hacks and strange things from designer 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-20 13:00:32 +01:00
William Desportes
4b6f04c142
Improve select all checkbox process on designer and fix a bug 
The bug is:
- select a column name checkbox
- select all columns checkbox
- deselect all columns checkbox
- build query
- the first checked column is added and can not be removed now (this is the bug)

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-20 13:00:32 +01:00
William Desportes
39a98a7fdf
Improve storing columns on designer and add a translation 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-20 13:00:32 +01:00